summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamón M. Gómez <ramongomez@us.es>2018-10-29 13:21:16 +0100
committerRamón M. Gómez <ramongomez@us.es>2018-10-29 13:21:16 +0100
commit5f4cfdc54fa6a4762942abfb24d1acca9535c805 (patch)
tree968156c6957696bf89d7d5cbbba947e42aececc6
parentec536c6b1df165eb490ceb32b89e403870e236db (diff)
#872: Update list of closed tickets; quotation correction in Vagrant files.
-rw-r--r--doc/CHANGELOG.es.txt4
-rw-r--r--installer/vagrant/Vagrantfile-boottools-vbox6
-rw-r--r--installer/vagrant/Vagrantfile-browser-vbox6
-rw-r--r--installer/vagrant/Vagrantfile-devel-vbox6
-rw-r--r--installer/vagrant/Vagrantfile-prod-vbox6
5 files changed, 16 insertions, 12 deletions
diff --git a/doc/CHANGELOG.es.txt b/doc/CHANGELOG.es.txt
index c3759f85..e7f7e018 100644
--- a/doc/CHANGELOG.es.txt
+++ b/doc/CHANGELOG.es.txt
@@ -23,6 +23,9 @@ Tickets resueltos en módulo OpenGnsys Web Admin Console:
#824 Iniciar sistema restaurado (no integrado)
#842 Internacionalización de la consola web
+Tickets resueltos en módulo OpenGnsys Installer:
+#784 Mejorar rendimiento de PHP sobre Apache
+
Tickets genéricos resueltos:
#843 Incluir nombre de versión
@@ -38,6 +41,7 @@ Tickets resueltos en módulo OpenGnsys Client:
#852 Apagado del cliente si tiempo de espera cambia de día (corrección)
Tickets resueltos en módulo OpenGnsys Server:
+#580 Caídas de ogAdmServer y ogAdmClient por desbordamiento de cadenas (no se resolverá)
#846 Configuración de logrotate para que incluya todos los servicios de OpenGnsys (corrección)
Tickets resueltos en módulo OpenGnsys Repository Server:
diff --git a/installer/vagrant/Vagrantfile-boottools-vbox b/installer/vagrant/Vagrantfile-boottools-vbox
index 341db637..14306402 100644
--- a/installer/vagrant/Vagrantfile-boottools-vbox
+++ b/installer/vagrant/Vagrantfile-boottools-vbox
@@ -12,10 +12,10 @@ VMMEM = 1024
SCRIPT = <<EOT
# Set language.
export LANG="#{LANGUAGE}.UTF-8"
-echo "LANG=\"$LANG\"" > /etc/default/locale
-echo "LANG=\"$LANG\"" >> /etc/environment
+echo "LANG=\\\"$LANG\\\"" > /etc/default/locale
+echo "LANG=\\\"$LANG\\\"" >> /etc/environment
locale-gen --lang #{LANGUAGE}
-sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
+sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\\\"${LANG%_*}\\\"/" /etc/default/keyboard
dpkg-reconfigure -fnoninteractive console-setup
# Install dependencies.
apt-get update -y
diff --git a/installer/vagrant/Vagrantfile-browser-vbox b/installer/vagrant/Vagrantfile-browser-vbox
index bc8d55d4..60db8297 100644
--- a/installer/vagrant/Vagrantfile-browser-vbox
+++ b/installer/vagrant/Vagrantfile-browser-vbox
@@ -13,10 +13,10 @@ VMCPUS = 2
SCRIPT = <<EOT
# Set language.
export LANG="#{LANGUAGE}.UTF-8"
-echo "LANG=\"$LANG\"" > /etc/default/locale
-echo "LANG=\"$LANG\"" >> /etc/environment
+echo "LANG=\\\"$LANG\\\"" > /etc/default/locale
+echo "LANG=\\\"$LANG\\\"" >> /etc/environment
locale-gen --lang #{LANGUAGE}
-sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
+sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\\\"${LANG%_*}\\\"/" /etc/default/keyboard
dpkg-reconfigure -fnoninteractive console-setup
# Install main dependencies.
apt-get update
diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox
index 49bc655e..7aac2c56 100644
--- a/installer/vagrant/Vagrantfile-devel-vbox
+++ b/installer/vagrant/Vagrantfile-devel-vbox
@@ -53,10 +53,10 @@ done
service isc-dhcp-server restart
# Set language.
export LANG="#{LANGUAGE}.UTF-8"
-echo "LANG=\"$LANG\"" > /etc/default/locale
-echo "LANG=\"$LANG\"" >> /etc/environment
+echo "LANG=\\\"$LANG\\\"" > /etc/default/locale
+echo "LANG=\\\"$LANG\\\"" >> /etc/environment
locale-gen --lang #{LANGUAGE}
-sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
+sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\\\"${LANG%_*}\\\"/" /etc/default/keyboard
dpkg-reconfigure -fnoninteractive console-setup
# 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"
diff --git a/installer/vagrant/Vagrantfile-prod-vbox b/installer/vagrant/Vagrantfile-prod-vbox
index fa6f6ded..adeccce7 100644
--- a/installer/vagrant/Vagrantfile-prod-vbox
+++ b/installer/vagrant/Vagrantfile-prod-vbox
@@ -53,10 +53,10 @@ done
service isc-dhcp-server restart
# Set language.
export LANG="#{LANGUAGE}.UTF-8"
-echo "LANG=\"$LANG\"" > /etc/default/locale
-echo "LANG=\"$LANG\"" >> /etc/environment
+echo "LANG=\\\"$LANG\\\"" > /etc/default/locale
+echo "LANG=\\\"$LANG\\\"" >> /etc/environment
locale-gen --lang #{LANGUAGE}
-sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
+sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\\\"${LANG%_*}\\\"/" /etc/default/keyboard
dpkg-reconfigure -fnoninteractive console-setup
# 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"