diff options
Diffstat (limited to 'installer/vagrant')
| -rw-r--r-- | installer/vagrant/Vagrantfile-1.0.6b-vbox | 2 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-browser-vbox | 23 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-devel-vbox | 34 | ||||
| -rw-r--r-- | installer/vagrant/Vagrantfile-prod-vbox | 2 |
4 files changed, 25 insertions, 36 deletions
diff --git a/installer/vagrant/Vagrantfile-1.0.6b-vbox b/installer/vagrant/Vagrantfile-1.0.6b-vbox index 2db25e1c..4317c654 100644 --- a/installer/vagrant/Vagrantfile-1.0.6b-vbox +++ b/installer/vagrant/Vagrantfile-1.0.6b-vbox @@ -42,7 +42,7 @@ fi # Install OpenGnsys and change server address. wget -q https://opengnsys.es/svn/tags/opengnsys-1.0.6b/installer/opengnsys_installer.sh -O - | bash || exit $? mv /opt/opengnsys/log/bash.log /opt/opengnsys/log/opengnsys_installer.log -echo y | /opt/opengnsys/bin/setserveraddr eth1 +echo y | /opt/opengnsys/bin/setserveraddr $(ip -o link show | tail -1 | cut -d: -f2) # Insert DHCP data. for ((i=#{NCLIENTS+10}; i>10; i--)); do sed -i "/^}$/ i host pc${i} { hardware ethernet #{MACPREFIX}:${i}; fixed-address #{NETPREFIX}.${i}; }" /etc/dhcp/dhcpd.conf diff --git a/installer/vagrant/Vagrantfile-browser-vbox b/installer/vagrant/Vagrantfile-browser-vbox index 60db8297..8e3abebf 100644 --- a/installer/vagrant/Vagrantfile-browser-vbox +++ b/installer/vagrant/Vagrantfile-browser-vbox @@ -21,27 +21,37 @@ dpkg-reconfigure -fnoninteractive console-setup # Install main dependencies. apt-get update apt-get install -y build-essential gettext libssl-dev libucommon-dev libxtst-dev subversion -# Compile Qt-Embedded 4.8 (aceptar la licencia Open Source). -wget http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz +# Compile Qt-Embedded 4.8 (accept Open Source license). +wget http://download.qt.io/archive/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz tar xvzf qt-everywhere-opensource-src-4.8.7.tar.gz cd qt-everywhere-opensource-src-4.8.7 echo "yes" | ./configure -opensource -embedded x86 -webkit -openssl -qt-gfx-vnc -qvfb -prefix /usr/local/ -nomake demos -nomake examples make make install -# Compile Browser. -svn export https://github.com/opengnsys/OpenGnsys/branches/devel/client/browser ../browser -cd browser +# Compile the Browser. +BRANCH="devel" +svn export "https://github.com/opengnsys/OpenGnsys/branches/$BRANCH/client/browser" ../browser +cd ../browser qmake browser.pro make strip browser +# Update locale string files. +xgettext -C --qt --from-code=UTF-8 -o browser.pot src/*.cpp +msgmerge -U po/en.po browser.pot +msgmerge -U po/ca.po browser.pot +rm -f browser.pot # Instructions. echo "Browser's code is in /home/vagrant/browser directory." echo "To compile a new Browser, run as root user:" echo " cd /home/vagrant/browser && qmake browser.pro && make" -echo "Do not forget to copy all Browser's files to OpenGnsys Server:" +echo "To compile new locale files (note that \"xx\" is a locale code, like \"en\" or \"ca\"):" +echo " - Translate strings by editing each po/xx.po file." +echo " - Compile each locale file by running as root: msgfmt -o xx.mo po/xx.po" +echo "Do not forget to copy all Browser's files to the OpenGnsys Server:" echo " - Browser binary to /opt/opengnsys/client/bin directory on server." echo " - Qt linked libraries to /opt/opengnsys/client/lib/qtlibs directory." echo " - 64-bit-based ogLive only: libssl and libcrypto to /opt/opengnsys/client/lib/qtlibs directory." +echo " - Compiled Locale files, if needed: xx.mo as /opt/opengnsys/client/lib/locale/xx/LC_MESSAGES/browser.mo (\"xx\" is a locale code)." EOT Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| @@ -54,7 +64,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.name = "ogBrowser" vb.memory = VMMEM vb.cpus = VMCPUS - vb.gui = true end # VM base and host name. br.vm.box = "ubuntu/trusty32" diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox index 7aac2c56..c558227a 100644 --- a/installer/vagrant/Vagrantfile-devel-vbox +++ b/installer/vagrant/Vagrantfile-devel-vbox @@ -43,9 +43,10 @@ if which curl &>/dev/null; then elif which wget &>/dev/null; then DOWNLOAD="wget -q -O -" fi -$DOWNLOAD -s https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh | bash || exit $? +BRANCH="devel" +$DOWNLOAD "https://raw.githubusercontent.com/opengnsys/OpenGnsys/$BRANCH/installer/opengnsys_installer.sh" | bash || exit $? mv /opt/opengnsys/log/bash.log /opt/opengnsys/log/opengnsys_installer.log -echo y | /opt/opengnsys/bin/setserveraddr enp0s8 +echo y | /opt/opengnsys/bin/setserveraddr $(ip -o link show | tail -1 | cut -d: -f2) # Insert DHCP data. for ((i=#{NCLIENTS+10}; i>10; i--)); do sed -i "/^}$/ i host pc${i} { hardware ethernet #{MACPREFIX}:${i}; fixed-address #{NETPREFIX}.${i}; }" /etc/dhcp/dhcpd.conf @@ -68,34 +69,13 @@ dpkg-reconfigure -fnoninteractive console-setup #for ((i=12; i<=#{NCLIENTS+10}; i++)); do # /opt/opengnsys/bin/setclientmode ogLive pc$i PERM #done -# Comment out next lines to install new Angular-based web application (on early development). -#apt-get install -y git nodejs npm -#ln -fs nodejs /usr/bin/node -#npm install bower -g -#svn export https://opengnsys.es/svn/branches/version1.1-tickets/ogWebAdmin-ticket761/admin/WebConsole/angular /opt/opengnsys/www/angular -#cd /opt/opengnsys/www/angular -#chown -R vagrant.vagrant . -#su vagrant -c "bower install -F" -#sed -i 's!BASE_URL = .*$!BASE_URL = "https://localhost:#{LOCALWEBPORT}/opengnsys";!' ogWebAdmin/assets/js/config.constants.js -#### TEMPORAL PATCHES -#su vagrant -c "bower install angular-sanitize -F" -#su vagrant -c "bower install angular-translate-loader-static-files -F" -#su vagrant -c "bower install angular-ui-select -F" -#su vagrant -c "bower install bootstrap -F" -#su vagrant -c "bower install isteven-angular-multiselect -F" -#ln -s globunet-util.min.css ogWebAdmin/lib/globunet/dist/css/globunet-util.css -#cp -a ogWebAdmin/assets/i18n/es.json ogWebAdmin/assets/i18n/en.json -#sed -i 's/jm.bardallo/usuog/' ogWebAdmin/assets/js/controllers/login.controller.js -#sed -i "s/DirectoryIndex index.php/DirectoryIndex index.php index.html/" /etc/apache2/sites-enabled/opengnsys.conf -#service apache2 reload echo "Notes:" echo "- OpenGnsys Server URL: https://localhost:#{LOCALWEBPORT}/opengnsys/" -[ -d /opt/opengnsys/www/angular ] && echo "- Angular-based web URL: https://localhost:#{LOCALWEBPORT}/opengnsys/angular/ogWebAdmin/" exit 0 EOT # Client 1 OS provisioning script. -OGAGENTPKG = "ogagent_1.1.0_all.deb" +OGAGENTPKG = "ogagent_1.1.1_all.deb" MODELSCRIPT = <<EOT # Comment out next lines to install and configure OGAgent for Ubuntu. #apt-get update -y @@ -109,7 +89,7 @@ MODELSCRIPT = <<EOT # echo "Warning: cannot install OGAgent package #{OGAGENTPKG}" #fi # Remove network configuration added by Vagrant. -sed -i "/enp0s3/ d" /etc/network/interfaces +sed -i "/eth1/ d" /etc/network/interfaces echo "Notes:" echo "- After now, use VirtualBox GUI to disable network interface 1 and restart this VM." # Leave VM halted. @@ -143,7 +123,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| vb.customize ['storageattach', :id, '--storagectl', 'SATA Controller', '--port', 1, '--device', 0, '--type', 'hdd', '--medium', second_disk] end # VM base and host name. - og.vm.box = "bento/ubuntu-16.04" + og.vm.box = "bento/ubuntu-18.04" og.vm.hostname = "ogAdministrator" # Network configuration: forward web port and attach new interface to VMs private network. og.vm.network "forwarded_port", guest: 443, host: LOCALWEBPORT, host_ip: "127.0.0.1" @@ -156,7 +136,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Client 1 VM definition. config.vm.define "pc11", autostart: false do |v1| - v1.vm.box = "bento/ubuntu-16.04" + v1.vm.box = "bento/ubuntu-18.04" v1.vm.hostname = "pc11" v1.vm.network "private_network", mac: "#{MACPREFIX}11".tr(":",""), type: "dhcp", virtualbox__intnet: true v1.vm.provider "virtualbox" do |vb| diff --git a/installer/vagrant/Vagrantfile-prod-vbox b/installer/vagrant/Vagrantfile-prod-vbox index adeccce7..5cfc94d5 100644 --- a/installer/vagrant/Vagrantfile-prod-vbox +++ b/installer/vagrant/Vagrantfile-prod-vbox @@ -45,7 +45,7 @@ elif which wget &>/dev/null; then fi $DOWNLOAD -s https://raw.githubusercontent.com/opengnsys/OpenGnsys/master/installer/opengnsys_installer.sh | bash || exit $? mv /opt/opengnsys/log/bash.log /opt/opengnsys/log/opengnsys_installer.log -echo y | /opt/opengnsys/bin/setserveraddr enp0s8 +echo y | /opt/opengnsys/bin/setserveraddr $(ip -o link show | tail -1 | cut -d: -f2) # Insert DHCP data. for ((i=#{NCLIENTS+10}; i>10; i--)); do sed -i "/^}$/ i host pc${i} { hardware ethernet #{MACPREFIX}:${i}; fixed-address #{NETPREFIX}.${i}; }" /etc/dhcp/dhcpd.conf |