From b32e00fd2deb012eb5c859ad2b11259988f14cc6 Mon Sep 17 00:00:00 2001
From: ramon <ramongomez@us.es>
Date: Mon, 31 Oct 2016 09:12:05 +0000
Subject: #739: Corregir errata en instalación de servidor basado en rama
 {{{trunk}}} con versión 1.0.x; actualizar algunos mensajes.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5058 a21b9725-9963-47de-94b9-378ad31fedc9
---
 installer/vagrant/Vagrantfile-devel-vbox | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'installer/vagrant/Vagrantfile-devel-vbox')

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
-- 
cgit v1.2.3-18-g5258