Merge branch 'master' into 315_active

eclipseo · Nov 27, 2017 · b066b7f · b066b7f
2 parents 442ca66 + 83d295c
commit b066b7f
Show file tree

Hide file tree

Showing 85 changed files with 4,057 additions and 543 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,25 +3,8 @@
 
 **Implemented enhancements:**
 
-- Show information about downloading ISO [\#185]
-- Create new machine from ISO [\#138]
-- Add graphics options in VM settings [\#260]
-- Add a description associated with the machine [\#275]
-- Improve show clones in admin [\#279]
-- Running development release [\#281]
-- Add Windows' definitions for new machines [\#289]
-- Give feedback on rename machine [\#291]
-- Copy spice password to clipboard [\#300]
-- API for opening a Virtual Machine [\#306]
-- Disable running Base [\#327]
+- Review volatile desktops and Kiosk mode [\#320]
+- Manage user permissions [\#222]
 
 **Fixed bugs:**
 
-- KVM domains start when creating base [\#271]
-- Swap volume should not be mandatory [\#278]
-- Allow dot, underscore and dash in the username [\#311]
-- Check for duplicate machine name on copy [\#313]
-- Wait for prepare base before create vm [\#314]
-- rvd services start before mysql [\#321]
-- Download Debian stretch iso fails [\#326]
-- Xubuntu ISO files conflict [\#335]
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -50,6 +50,8 @@ everyone is a beginner at first :smile_cat:
 
 Follow this guide about running [Ravada in development mode](http://ravada.readthedocs.io/en/latest/devel-docs/run.html).
 
+If you change a translation or language file make sure you follow this small [guide](http://ravada.readthedocs.io/en/latest/devel-docs/translations.html?highlight=translate) and don't forget to add the issue number when committing.
+
 ### 6. Make a Pull Request
 
 At this point, you should switch back to your master branch and make sure it's

diff --git a/Makefile.PL b/Makefile.PL
@@ -6,7 +6,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
   VERSION   => '0.01',
   PREREQ_PM => {
-          'Mojolicious' => '7.14'
+          'Mojolicious' => '7.01'
      ,'DBIx::Connector' => 0
   ,'Authen::Passphrase' => 0
 	      ,'IPC::Run3'  => 0

diff --git a/bin/rvd_back.pl b/bin/rvd_back.pl
@@ -39,6 +39,8 @@
 my $START_DOMAIN;
 my $SHUTDOWN_DOMAIN;
 
+my $IMPORT_DOMAIN_OWNER;
+
 my $USAGE = "$0 "
         ." [--debug] [--config=$FILE_CONFIG_DEFAULT] [--add-user=name] [--add-user-ldap=name]"
         ." [--change-password] [--make-admin=username] [--import-vbox=image_file.vdi]"
@@ -48,6 +50,7 @@
         ." --add-user-ldap : adds a new LDAP user\n"
         ." --change-password : changes the password of an user\n"
         ." --import-domain : import a domain\n"
+        ." --import-domain-owner : owner of the domain to import\n"
         ." --make-admin : make user admin\n"
         ." --config : config file, defaults to $FILE_CONFIG_DEFAULT"
         ." -X : start in foreground\n"
@@ -87,6 +90,7 @@
       ,'add-user-ldap=s'=> \$ADD_USER_LDAP
       ,'import-domain=s' => \$IMPORT_DOMAIN
       ,'import-vbox=s' => \$IMPORT_VBOX
+,'import-domain-owner=s' => \$IMPORT_DOMAIN_OWNER
 ) or exit;
 
 $START = 1 if $DEBUG || $FILE_CONFIG || $NOFORK;
@@ -259,9 +263,12 @@ sub remove_admin {
 sub import_domain {
     my $name = shift;
     print "Virtual Manager: KVM\n";
-    print "User name that will own the domain in Ravada : ";
-    my $user = <STDIN>;
-    chomp $user;
+    my $user = $IMPORT_DOMAIN_OWNER;
+    if (!$user) {
+        print "User name that will own the domain in Ravada : ";
+        $user = <STDIN>;
+        chomp $user;
+    }
     my $ravada = Ravada->new( %CONFIG );
     $ravada->import_domain(name => $name, vm => 'KVM', user => $user);
 }

diff --git a/etc/xml/dsl-i386.xml b/etc/xml/dsl-i386.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='i686' machine='pc-i440fx-trusty'>hvm</type>
+    <type arch='i686' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -52,6 +52,10 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='yes' listen='10.1.36.68'>
@@ -74,4 +78,3 @@
     </memballoon>
   </devices>
 </domain>
-
diff --git a/etc/xml/jessie-amd64.xml b/etc/xml/jessie-amd64.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -52,6 +52,10 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='yes' listen='10.1.36.68'>

diff --git a/etc/xml/jessie-i386.xml b/etc/xml/jessie-i386.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='i686' machine='pc-i440fx-trusty'>hvm</type>
+    <type arch='i686' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -52,10 +52,19 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='10.1.36.68'>
-      <listen type='address' address='10.1.36.68'/>
+    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
     </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
@@ -69,4 +78,3 @@
     </memballoon>
   </devices>
 </domain>
-
diff --git a/etc/xml/trusty-amd64.xml b/etc/xml/trusty-amd64.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-trusty'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -52,10 +52,14 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='10.1.36.68'>
-      <listen type='address' address='10.1.36.68'/>
+    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
 	  <image compression='auto_glz'/>
       <jpeg compression='auto'/>
       <zlib compression='auto'/>
@@ -70,7 +74,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </video>
     <redirdev bus='usb' type='spicevmc'>
-    </redirdev>      
+    </redirdev>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>

diff --git a/etc/xml/trusty-i386.xml b/etc/xml/trusty-i386.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='i686' machine='pc-i440fx-trusty'>hvm</type>
+    <type arch='i686' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -52,10 +52,19 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <channel type='spicevmc'>
+      <target type='virtio' name='com.redhat.spice.0'/>
+      <address type='virtio-serial' controller='0' bus='0' port='1'/>
+    </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='10.1.36.68'>
-      <listen type='address' address='10.1.36.68'/>
+    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
     </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
@@ -69,4 +78,3 @@
     </memballoon>
   </devices>
 </domain>
-
diff --git a/etc/xml/win10.xml b/etc/xml/win10.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static' current='2'>4</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -87,8 +87,8 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='147.83.68.31'>
-      <listen type='address' address='147.83.68.31'/>
+    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
+      <listen type='address' address='127.0.0.1'/>
       <image compression='auto_glz'/>
       <jpeg compression='auto'/>
       <zlib compression='auto'/>
@@ -113,4 +113,3 @@
     </memballoon>
   </devices>
 </domain>
-
diff --git a/etc/xml/win7pro.xml b/etc/xml/win7pro.xml
@@ -12,7 +12,7 @@ or other application using the libvirt API.
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -104,7 +104,13 @@ or other application using the libvirt API.
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes'/>
+    <graphics type='spice' autoport='yes'>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
+    </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>

diff --git a/etc/xml/win8.1.xml b/etc/xml/win8.1.xml
@@ -12,7 +12,7 @@ or other application using the libvirt API.
   <currentMemory unit='KiB'>4194304</currentMemory>
   <vcpu placement='static'>2</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-xenial'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -104,7 +104,13 @@ or other application using the libvirt API.
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes'/>
+    <graphics type='spice' autoport='yes'>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
+    </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>

diff --git a/etc/xml/windows_10.xml b/etc/xml/windows_10.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-yakkety'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -82,7 +82,11 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='yes'>
       <listen type='address'/>
-      <image compression='off'/>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
     </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>

diff --git a/etc/xml/windows_12.xml b/etc/xml/windows_12.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-yakkety'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -91,7 +91,11 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='yes'>
       <listen type='address'/>
-      <image compression='off'/>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
     </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>

diff --git a/etc/xml/windows_7.xml b/etc/xml/windows_7.xml
@@ -5,7 +5,7 @@
   <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu placement='static'>1</vcpu>
   <os>
-    <type arch='x86_64' machine='pc-i440fx-yakkety'>hvm</type>
+    <type arch='x86_64' machine='pc'>hvm</type>
   </os>
   <features>
     <acpi/>
@@ -91,7 +91,11 @@
     <input type='keyboard' bus='ps2'/>
     <graphics type='spice' autoport='yes'>
       <listen type='address'/>
-      <image compression='off'/>
+      <image compression='auto_glz'/>
+      <jpeg compression='auto'/>
+      <zlib compression='auto'/>
+      <playback compression='on'/>
+      <streaming mode='filter'/>
     </graphics>
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>