#739: Corregir errata en instalación de servidor basado en rama {{{trunk}}} con versión 1.0.x; actualizar algunos mensajes.

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5058 a21b9725-9963-47de-94b9-378ad31fedc9

6 files changed, 21 insertions, 21 deletions

diff --git a/installer/vagrant/README.es.txt b/installer/vagrant/README.es.txt
index f193ddb2..9bd86a64 100644
--- a/installer/vagrant/README.es.txt
+++ b/installer/vagrant/README.es.txt
@@ -33,7 +33,7 @@ Ejecutar el entorno virtual (Vagrantfile-trunk y Vagrantfile-devel).
    - LANGUAGE: idioma (se aceptan es_ES, ca_ES y en_GB).
    - NCLIENTS: nº de clientes a generar (de 2 a 9).
    - REPODISK, REPOSIZE: fichero y tamaño (en GB) del disco duro virtual para el repositorio de imágenes.
-   - SERVERMEM, CLIENTMEM: memoria virtual (en MB) para servidor y clientes.
+   - SERVERMEM, CLIENTMEM: memoria virtual (en MB) para servidor y clientes (mínimo 256 MB).
    - NETPREFIX: prefijo para las direcciones IP de la red virtual.
    - MACPREFIX: prefijo para las direcciones MAC de los clientes.
    - LOCALWEBPORT: puerto local para acceder al web de administración del servidor.
diff --git a/installer/vagrant/Vagrantfile-boottools-vbox b/installer/vagrant/Vagrantfile-boottools-vbox
index 37f6b93f..8c348a5d 100644
--- a/installer/vagrant/Vagrantfile-boottools-vbox
+++ b/installer/vagrant/Vagrantfile-boottools-vbox
@@ -6,7 +6,7 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = "virtualbox"
 # Language.
 LANGUAGE = "es_ES"
 ENV['LC_ALL'] = LANGUAGE + ".UTF-8"
-# Amount of memory VM.
+# Amount of virtual memory.
 VMMEM = 1024
 # OpenGnsys boot-tools environment provisioning script.
 SCRIPT = <<EOT
diff --git a/installer/vagrant/Vagrantfile-browser-vbox b/installer/vagrant/Vagrantfile-browser-vbox
index 32eb93d6..11b61d14 100644
--- a/installer/vagrant/Vagrantfile-browser-vbox
+++ b/installer/vagrant/Vagrantfile-browser-vbox
@@ -6,7 +6,7 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = "virtualbox"
 # Language.
 LANGUAGE = "es_ES"
 ENV['LC_ALL'] = LANGUAGE + ".UTF-8"
-# Amount of memory VM.
+# Amount of virtual memory and virtual CPUs.
 VMMEM = 2048
 VMCPUS = 2
 # OpenGnsys boot-tools environment provisioning script.
@@ -18,7 +18,6 @@ echo "LANG=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
 sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
 dpkg-reconfigure -fnoninteractive console-setup
-# Update repositories.
 # Install main dependencies.
 apt-get update
 apt-get install -y build-essential gettext libssl-dev libucommon-dev libxtst-dev subversion
@@ -59,7 +58,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # VM base and host name.
     br.vm.box = "ubuntu/trusty32"
     br.vm.hostname = "ogBrowser"
-    # Disable synced folder.
+    # Comment out to disable synced folder.
     #br.vm.synced_folder ".", "/vagrant", disabled: true
     # Launch provisioning script.
     br.vm.provision "shell", inline: SCRIPT
diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox
index a298c4b7..abb038df 100644
--- a/installer/vagrant/Vagrantfile-devel-vbox
+++ b/installer/vagrant/Vagrantfile-devel-vbox
@@ -12,8 +12,8 @@ NCLIENTS = 4
 REPODISK = "ogRepo.vdi"
 REPOSIZE = 50
 # Amount of memory for server and clients (MB)
-SERVERMEM = 1024
-CLIENTMEM = 512
+SERVERMEM = 1024	# Minimum: 512
+CLIENTMEM = 512		# Minimum: 256
 # Clients MAC address prefix.
 MACPREFIX = "08:00:27:0E:65:"
 NETPREFIX = "192.168.2."
@@ -44,7 +44,7 @@ echo "LANG=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
 sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
 dpkg-reconfigure -fnoninteractive console-setup
-# Unmcomment next lines for automatic data insertion.
+# Comment out next lines for automatic data insertion.
 #SQL="INSERT INTO aulas (nombreaula, idcentro, urlfoto, grupoid, ubicacion, puestos, modomul, ipmul, pormul, velmul, router, netmask, ntp, dns, proxy, modp2p, timep2p) VALUES  ('Aula virtual', 1, 'aula.jpg', 0, 'Despliegue virtual con Vagrant.', 5, 2, '239.194.2.11', 9000, 70, '#{NETPREFIX}1', '255.255.255.0', '', '', '', 'peer', 30); INSERT INTO ordenadores (nombreordenador, ip, mac, idaula, idrepositorio, idperfilhard, idmenu, idproautoexec, grupoid, router, mascara, arranque, netiface, netdriver, fotoord) VALUES"
 #for ((i=1; i<=#{NCLIENTS}; i++)); do
 #    SQL="$SQL ('ogClient0$i', '#{NETPREFIX}1$i', REPLACE('#{MACPREFIX}0$i',':',''), 1, 1, 0, 0, 0, 0, '#{NETPREFIX}1', '255.255.255.0', '00unknown', 'eth0', 'generic', 'fotoordenador.gif'),"
@@ -59,7 +59,7 @@ EOT
 
 # Client 1 OS provisioning script.
 MODELSCRIPT = <<EOT
-# Uncomment next lines to install and configure OGAgent for Ubuntu.
+# Comment out next lines to install and configure OGAgent for Ubuntu.
 #apt-get install -y libxss1 policykit-1 python python-requests python-qt4 python-six python-prctl
 #wget -q http://opengnsys.es/svn/branches/version1.1-tickets/OGAgent-ticket718/client/shared/lib/ogagent/ogagent_1.0.0_all.deb	# temporal
 #dpkg -i ogagent_1.0.0_all.deb
@@ -99,8 +99,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Network configuration: forward web port and attach new interface to VMs private network.
     og.vm.network "forwarded_port", guest: 443, host: 8443
     og.vm.network "private_network", ip: "#{NETPREFIX}10", virtualbox__intnet: true
-    # Disable synced folder.
-    og.vm.synced_folder ".", "/vagrant", disabled: true
+    # Comment out to disable synced folder.
+    #og.vm.synced_folder ".", "/vagrant", disabled: true
     # Launch provisioning script.
     og.vm.provision "shell", inline: OGSERVERSCRIPT
   end
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index 65a59a7b..f5cd690e 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -6,7 +6,7 @@ ENV['VAGRANT_DEFAULT_PROVIDER'] = "virtualbox"
 # Language.
 LANGUAGE = "es_ES"
 ENV['LC_ALL'] = LANGUAGE + ".UTF-8"
-# Amount of memory VM.
+# Amount of virtual memory and virtual CPUs.
 VMMEM = 4096
 VMCPUS = 4
 # OpenGnsys boot-tools environment provisioning script.
@@ -29,7 +29,7 @@ sed -i '$d' /usr/lib/udev/rules.d/60-vboxguest.rules
 akmods && systemctl restart systemd-modules-load.service
 # Install ATOM editor by default (less disk space).
 wget -q https://atom.io/download/rpm -O /tmp/atom.rpm && dnf install -y /tmp/atom.rpm && rm -f /tmp/atom.rpm
-# Comment out next line if you prefer to install Eclipse IDE for Python (it needs some disk space).
+# Comment out next line if you prefer to install Eclipse IDE for Python (it needs more disk space).
 #dnf install -y eclipse-pydev eclipse-nls-${LANG%_*}
 # Download OGAgent environment installer.
 svn export http://opengnsys.es/svn/branches/version1.1/installer/ogagent-devel-installer.sh /home/vagrant
@@ -61,7 +61,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # VM base and host name.
     ag.vm.box = "fedora/24-cloud-base"
     ag.vm.hostname = "ogAgent"
-    # Comment out if you want to disable synced folder.
+    # Comment out to disable synced folder.
     #ag.vm.synced_folder ".", "/vagrant", disabled: true
     # Launch provisioning script.
     ag.vm.provision "shell", inline: SCRIPT
diff --git a/installer/vagrant/Vagrantfile-trunk-vbox b/installer/vagrant/Vagrantfile-trunk-vbox
index 109d3be0..d081804f 100644
--- a/installer/vagrant/Vagrantfile-trunk-vbox
+++ b/installer/vagrant/Vagrantfile-trunk-vbox
@@ -12,8 +12,8 @@ NCLIENTS = 4
 REPODISK = "ogRepo.vdi"
 REPOSIZE = 50
 # Amount of memory for server and clients (MB)
-SERVERMEM = 1024
-CLIENTMEM = 512
+SERVERMEM = 1024	# Minimum: 512
+CLIENTMEM = 512		# Minimum: 256
 # Clients MAC address prefix.
 MACPREFIX = "08:00:27:0E:65:"
 NETPREFIX = "192.168.2."
@@ -44,15 +44,16 @@ echo "LANG=\"$LANG\"" >> /etc/environment
 locale-gen --lang #{LANGUAGE}
 sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
 dpkg-reconfigure -fnoninteractive console-setup
-# Unmcomment next lines for automatic data insertion.
+# Comment out next lines for automatic data insertion.
 #SQL="INSERT INTO aulas (nombreaula, idcentro, urlfoto, grupoid, ubicacion, puestos, modomul, ipmul, pormul, velmul, router, netmask, dns, proxy, modp2p, timep2p) VALUES  ('Aula virtual', 1, 'aula.jpg', 0, 'Despliegue virtual con Vagrant.', 5, 2, '239.194.2.11', 9000, 70, '#{NETPREFIX}1', '255.255.255.0', '', '', 'peer', 30); INSERT INTO ordenadores (nombreordenador, ip, mac, idaula, idrepositorio, idperfilhard, idmenu, idproautoexec, grupoid, router, mascara, arranque, netiface, netdriver, fotoord) VALUES"
 #for ((i=1; i<=#{NCLIENTS}; i++)); do
 #    SQL="$SQL ('ogClient0$i', '#{NETPREFIX}1$i', REPLACE('#{MACPREFIX}0$i',':',''), 1, 1, 0, 0, 0, 0, '#{NETPREFIX}1', '255.255.255.0', '00unknown', 'eth0', 'generic', 'fotoordenador.gif'),"
 #done
 #mysql -u usuog -ppassusuog -D ogAdmBD -e "${SQL%,}"
-#/opt/opengnsys/bin/setclientmode ogAdmin ogClient01 1
+#if ! grep -q "1\.0" /opt/opengnsys/doc/VERSION.txt; then AUX=1; fi
+#/opt/opengnsys/bin/setclientmode ogAdmin ogClient01 $AUX
 #for ((i=2; i<=#{NCLIENTS}; i++)); do
-#    /opt/opengnsys/bin/setclientmode ogClient ogClient0$i
+#    /opt/opengnsys/bin/setclientmode ogClient ogClient0$i $AUX
 #done
 echo "New OpenGnsys local URL: https://localhost:#{LOCALWEBPORT}/opengnsys/"
 EOT
@@ -94,8 +95,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # Network configuration: forward web port and attach new interface to VMs private network.
     og.vm.network "forwarded_port", guest: 443, host: 8443
     og.vm.network "private_network", ip: "#{NETPREFIX}10", virtualbox__intnet: true
-    # Disable synced folder.
-    og.vm.synced_folder ".", "/vagrant", disabled: true
+    # Comment out to disable synced folder.
+    #og.vm.synced_folder ".", "/vagrant", disabled: true
     # Launch provisioning script.
     og.vm.provision "shell", inline: OGSERVERSCRIPT
   end