From b32e00fd2deb012eb5c859ad2b11259988f14cc6 Mon Sep 17 00:00:00 2001 From: ramon 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/README.es.txt | 2 +- installer/vagrant/Vagrantfile-boottools-vbox | 2 +- installer/vagrant/Vagrantfile-browser-vbox | 5 ++--- installer/vagrant/Vagrantfile-devel-vbox | 12 ++++++------ installer/vagrant/Vagrantfile-ogagent-vbox | 6 +++--- installer/vagrant/Vagrantfile-trunk-vbox | 15 ++++++++------- 6 files changed, 21 insertions(+), 21 deletions(-) (limited to 'installer/vagrant') 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 = <> /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 = <> /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 -- cgit v1.2.3-18-g5258