12 files changed, 78 insertions, 55 deletions
diff --git a/installer/INSTALL.es.txt b/installer/INSTALL.es.txt
index b9533063..b0712a45 100644
--- a/installer/INSTALL.es.txt
+++ b/installer/INSTALL.es.txt
@@ -1,5 +1,5 @@
-Instalación y Actualización de OpenGnsys 1.1.0
-==============================================
+Instalación y Actualización de OpenGnsys 1.1.0a
+===============================================
 
 
 Instalación inicial
@@ -8,17 +8,17 @@ Instalación inicial
 1. Obtener el instalador.
 
 Descargar una versión completa y desccomprimir el fichero "opengnsys-version.tar.gz":
-        tar xvzf opengnsys-version.tar.gz
-        cd opengnsys/installer
+	tar xvzf opengnsys-version.tar.gz
+	cd opengnsys/installer
 
 O bien, descargar el instalador desde la última reversión del repositorio:
-        svn export https://opengnsys.es/svn/trunk/installer/opengnsys_installer.sh
+	wget https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/installer/opengnsys_installer.sh
 
 Opcionalmente, puede descargarse la imagen del cliente; si no se realiza este paso, el instalador la descargará automáticamente.
 	wget https://opengnsys.es/downloads/ogLive-versioncliente.iso
 
 2. Ejecutar el instalador como root:
-        sudo bash opengnsys_installer.sh 
+	sudo bash opengnsys_installer.sh 
 
 Dicho script solicitará por teclado la siguiente información para configurar el acceso al servicio (si no se indica un parámetro, toma el valor por defecto):
     * Clave del usuario root de MySQL.
diff --git a/installer/ogagent-devel-installer.sh b/installer/ogagent-devel-installer.sh
index 4b619c03..a07de1d2 100755
--- a/installer/ogagent-devel-installer.sh
+++ b/installer/ogagent-devel-installer.sh
@@ -11,8 +11,9 @@
 
 
 # Variables.
-PROGDIR=$PWD/ogagent
-SVNURL=https://opengnsys.es/svn/trunk/admin/Sources/Clients/ogagent
+PROGDIR="$PWD/ogagent"
+BRANCH="branches/master"
+SVNURL="https://github.com/opengnsys/OpenGnsys/$BRANCH/admin/Sources/Clients/ogagent"
 
 # Show prerequisites needed to build the environment.
 mkdir -p $PROGDIR || exit 1
@@ -22,20 +23,21 @@ OGAgent devoloping environment installation
 
 Prerequisites:
 - Install packages, if needed:
+  - Subversion
   - Wine for 32-bit (Winetricks may be required)
   - Python 2.7 with pyqt4-dev-tools
   - realpath
   - dpkg-dev
   - rpmbuild
   - xar
-- Open a web browser and download Microsoft Visual C++ 2010 Redistributable Package (x86) from: http://www.microsoft.com/en-us/download/details.aspx?id=5555
-- Copy or move "vcredist_x86.exe" file to $PROGDIR directory.
 Press [Enter] key when ready to continue.
 EOT
 read
 
 # Importing OGAgent source code.
 svn export --force $SVNURL $PROGDIR || exit 1
+# Downloading Visual C++ Redistributable.
+wget --unlink https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe
 
 # Update PyQt components.
 pushd ogagent/src >/dev/null
diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh
index e3a04c17..3352a344 100755
--- a/installer/opengnsys_import.sh
+++ b/installer/opengnsys_import.sh
@@ -33,7 +33,8 @@ MYSQLFILE="$TMPDIR/$CATALOG.sql"
 MYSQLBCK="$OPENGNSYS/doc/$CATALOG.sql-$DATE"
 
 LOG_FILE=$OPENGNSYS/log/${PROG%.sh}.log
-OPENGNSYS_SERVER="opengnsys.es"
+BRANCH="branches/master"
+SVN_URL="https://github.com/opengnsys/OpenGnsys/$BRANCH/admin/Database"
 DEFAULT_MYSQL_ROOT_PASSWORD="passwordroot"      # Clave por defecto root de MySQL
 
 # Si se solicita, mostrar ayuda.
@@ -231,7 +232,6 @@ if [ $OLDVERSION != $NEWVERSION ] ; then
         exit 0
     fi
     # Nos bajamos los archivos de actualización de la base de datos
-    SVN_URL="https://$OPENGNSYS_SERVER/svn/tags/opengnsys-$NEWVERSION/admin/Database"
     [[ "$NEWVERSION" =~ pre ]] && SVN_URL="https://$OPENGNSYS_SERVER/svn/branches/version${NEWVERSION%.*}/admin/Database"
     svn checkout "$SVN_URL" $TMPDIR/Database
     [ $? -ne 0 ] && errorAndLog "$PROG: Error getting code from $SVN_URL" && exit 6
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 3316e4ff..9502d704 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -95,17 +95,19 @@ done
 
 echo -e "\\n=============================="
 
-# Comprobar si se ha descargado el paquete comprimido (USESVN=0) o sólo el instalador (USESVN=1).
+# Comprobar si se ha descargado el paquete comprimido (REMOTE=0) o sólo el instalador (REMOTE=1).
 PROGRAMDIR=$(readlink -e "$(dirname "$0")")
 PROGRAMNAME=$(basename "$0")
 OPENGNSYS_SERVER="opengnsys.es"
 DOWNLOADURL="https://$OPENGNSYS_SERVER/trac/downloads"
 if [ -d "$PROGRAMDIR/../installer" ]; then
-	USESVN=0
+	REMOTE=0
 else
-	USESVN=1
+	REMOTE=1
 fi
-SVN_URL="https://$OPENGNSYS_SERVER/svn/trunk/"
+BRANCH="devel"
+CODE_URL="https://codeload.github.com/opengnsys/OpenGnsys/zip/$BRANCH"
+API_URL="https://api.github.com/repos/opengnsys/OpenGnsys/branches/$BRANCH"
 
 WORKDIR=/tmp/opengnsys_installer
 mkdir -p $WORKDIR
@@ -788,11 +790,11 @@ EOF
 
 
 #####################################################################
-####### Funciones para el manejo de Subversion
+####### Funciones para la descarga de código
 #####################################################################
 
-# Obtiene el código fuente del proyecto desde el servidor SVN.
-function svnExportCode()
+# Obtiene el código fuente del proyecto desde el repositorio de GitHub.
+function downloadCode()
 {
 	if [ $# -ne 1 ]; then
 		errorAndLog "${FUNCNAME}(): invalid number of parameters"
@@ -801,14 +803,15 @@ function svnExportCode()
 
 	local url="$1"
 
-	echoAndLog "${FUNCNAME}(): downloading subversion code..."
+	echoAndLog "${FUNCNAME}(): downloading code..."
 
-	svn export --force "$url" opengnsys
+	curl "${url}" -o opengnsys.zip && unzip opengnsys.zip && mv "OpenGnsys-$BRANCH" opengnsys
 	if [ $? -ne 0 ]; then
 		errorAndLog "${FUNCNAME}(): error getting OpenGnsys code from $url"
 		return 1
 	fi
-	echoAndLog "${FUNCNAME}(): subversion code downloaded"
+	rm -f opengnsys.zip
+	echoAndLog "${FUNCNAME}(): code was downloaded"
 	return 0
 }
 
@@ -1076,7 +1079,6 @@ function installWebFiles()
 		errorAndLog "${FUNCNAME}(): Error copying web files."
 		exit 1
 	fi
-        find $INSTALL_TARGET/www -name .svn -type d -exec rm -fr {} \; 2>/dev/null
 
 	# Descomprimir librerías: XAJAX, Slim y Swagger-UI.
 	unzip -o $WORKDIR/opengnsys/admin/$XAJAXFILE -d $INSTALL_TARGET/www/xajax
@@ -1102,6 +1104,7 @@ function installWebFiles()
 # Copiar ficheros en la zona de descargas de OpenGnsys Web Console.
 function installDownloadableFiles()
 {
+	INSTVERSION=1.1.0       ###  Temporal.
 	local FILENAME=ogagentpkgs-$INSTVERSION.tar.gz
 	local TARGETFILE=$WORKDIR/$FILENAME
  
@@ -1205,7 +1208,7 @@ function createDirs()
 	echoAndLog "${FUNCNAME}(): creating directory paths in $path_opengnsys_base"
 	mkdir -p $path_opengnsys_base
 	mkdir -p $path_opengnsys_base/bin
-	mkdir -p $path_opengnsys_base/client
+	mkdir -p $path_opengnsys_base/client/{cache,images,log}
 	mkdir -p $path_opengnsys_base/doc
 	mkdir -p $path_opengnsys_base/etc
 	mkdir -p $path_opengnsys_base/lib
@@ -1303,7 +1306,7 @@ function copyServerFiles ()
 		elif [ -d "${SOURCES[$i]}" ]; then
 			echoAndLog "Copying content of ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}"
 			cp -a "${SOURCES[$i]}"/* "${path_opengnsys_base}/${TARGETS[$i]}"
-        else
+		else
 			warningAndLog "Unable to copy ${SOURCES[$i]} to $path_opengnsys_base/${TARGETS[$i]}"
 		fi
 	done
@@ -1396,7 +1399,6 @@ function copyClientFiles()
 		errorAndLog "${FUNCNAME}(): error while copying client estructure"
 		errstatus=1
 	fi
-	find $INSTALL_TARGET/client -name .svn -type d -exec rm -fr {} \; 2>/dev/null
 	
 	echoAndLog "${FUNCNAME}(): Copying OpenGnsys Cloning Engine files."
 	mkdir -p $INSTALL_TARGET/client/lib/engine/bin
@@ -1551,14 +1553,17 @@ EOT
 
 function installationSummary()
 {
+	local VERSIONFILE REVISION
+
 	# Crear fichero de versión y revisión, si no existe.
-	local VERSIONFILE="$INSTALL_TARGET/doc/VERSION.txt"
+	VERSIONFILE="$INSTALL_TARGET/doc/VERSION.txt"
 	[ -f $VERSIONFILE ] || echo "OpenGnsys Server" >$VERSIONFILE
 	# Incluir datos de revisión, si se está instaladno desde el repositorio
 	# de código o si no está incluida en el fichero de versión.
-	if [ $USESVN -eq 1 ] || [ -z "$(awk '$3~/r[0-9]*/ {print}' $VERSIONFILE)" ]; then
-		local REVISION=$(LANG=C svn info $SVN_URL|awk '/Rev:/ {print "r"$4}')
-		perl -pi -e "s/($| r[0-9]*)/ $REVISION/" $VERSIONFILE
+	if [ $REMOTE -eq 1 ] || [ -z "$(awk '$3~/r[0-9]*/ {print}' $VERSIONFILE)" ]; then
+		# Revisión: rAñoMesDía.Gitcommit (8 caracteres de fecha y 7 primeros de commit).
+ 		REVISION=$(curl -s "$API_URL" | jq -r '"r" + (.commit.commit.committer.date | gsub("-"; "")[:8]) + "." + (.commit.sha[:7])')
+ 		sed -ri "s/($| r[.0-9a-f]+)/ $REVISION/" $VERSIONFILE
 	fi
 
 	# Mostrar información.
@@ -1655,10 +1660,10 @@ if [ $? -ne 0 ]; then
 fi
 
 # Si es necesario, descarga el repositorio de código en directorio temporal
-if [ $USESVN -eq 1 ]; then
-	svnExportCode $SVN_URL
+if [ $REMOTE -eq 1 ]; then
+	downloadCode $CODE_URL
 	if [ $? -ne 0 ]; then
-		errorAndLog "Error while getting code from svn"
+		errorAndLog "Error while getting code from the repository"
 		exit 1
 	fi
 else
diff --git a/installer/opengnsys_makecompress.sh b/installer/opengnsys_makecompress.sh
index 5cedcde4..1ba9d7d1 100755
--- a/installer/opengnsys_makecompress.sh
+++ b/installer/opengnsys_makecompress.sh
@@ -7,28 +7,40 @@
 # Versión:	1.0 - Incluido en OpenGnSys 1.0.1
 # Autor:	Ramón Gómez, Universidad de Sevilla
 # Fecha:	10/05/2011
+# Versión:	1.1.1 - Descarga desde repositorio de GitHub
+# Autor:	Ramón Gómez, Universidad de Sevilla
+# Fecha:	27/05/2018
 
+# Comprobaciones.
+for PROG in jq unzip; do
+    if ! which $PROG &>/dev/null; then
+        echo "Please, install \"$PROG\" package."
+        exit 1
+    fi
+done
 
 # Variables
-SVNURL="https://opengnsys.es/svn/trunk/"
-SVNREV=$(LANG=C svn info $SVNURL | awk '/Last Changed Rev:/ {print "r"$4}')
+BRANCH="master"
+CODE_URL="https://codeload.github.com/opengnsys/OpenGnsys/zip/$BRANCH"
+API_URL="https://api.github.com/repos/opengnsys/OpenGnsys/branches/$BRANCH"
+REVISION=$(curl -s "$API_URL" | jq -r '"r" + (.commit.commit.committer.date | gsub("-"; "")[:8]) + "." + (.commit.sha[:7])')
 
 # Descargar repositorio SVN
 cd /tmp
 rm -fr opengnsys
-svn export $SVNURL opengnsys || exit 1
+curl "$CODE_URL" -o opengnsys.zip && unzip opengnsys.zip && mv "OpenGnsys-$BRANCH" opengnsys
 
 # Asisgnar propietario de los ficheros descargados.
 chown -R root.root opengnsys
 WARNING=$?
 
 # Parchear datos de revisión del código.
-perl -pi -e "s/$/ $SVNREV/" opengnsys/doc/VERSION.txt
+sed -ri "s/$/ $REVISION/" opengnsys/doc/VERSION.txt
 
 # Generar fichero comprimido.
 VERSION=$(awk '{print $2"-"$3}' opengnsys/doc/VERSION.txt)
 tar cvzf opengnsys-$VERSION.tar.gz opengnsys
-rm -fr opengnsys
+rm -fr opengnsys opengnsys.zip
 
 # Revisar salida.
 [ $WARNING != 0 ] && echo "*** WARNING: cannot change owner of files to \"root\" user before compressing."
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index aaff523f..263260e9 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -173,6 +173,7 @@ function checkAutoUpdate()
 	# Actaulizar el script si ha cambiado o no existe el original.
 	if [ $REMOTE -eq 1 ]; then
 		curl -s $RAW_URL/installer/$PROGRAMNAME -o $PROGRAMNAME
+		chmod +x $PROGRAMNAME
 		if ! diff -q $PROGRAMNAME $INSTALL_TARGET/lib/$PROGRAMNAME 2>/dev/null || ! test -f $INSTALL_TARGET/lib/$PROGRAMNAME; then
 			mv $PROGRAMNAME $INSTALL_TARGET/lib
 			update=1
@@ -198,7 +199,7 @@ function getDateTime()
 # Escribe a fichero y muestra por pantalla
 function echoAndLog()
 {
-	echo $1
+	echo "$1"
 	DATETIME=`getDateTime`
 	echo "$DATETIME;$SSH_CLIENT;$1" >> $LOG_FILE
 }
@@ -1011,11 +1012,12 @@ function updateSummary()
 {
 	# Actualizar fichero de versión y revisión.
 	local VERSIONFILE REVISION
-
 	VERSIONFILE="$INSTALL_TARGET/doc/VERSION.txt"
-	REVISION=$(curl -s "$API_URL" | jq -r ".commit.commit.committer.date" | awk '{gsub(/[^0-9]/,""); print}')
+	# Revisión: rAñoMesDía.Gitcommit (8 caracteres de fecha y 7 primeros de commit).
+ 	REVISION=$(curl -s "$API_URL" | jq -r '"r" + (.commit.commit.committer.date | gsub("-"; "")[:8]) + "." + (.commit.sha[:7])')
+
 	[ -f $VERSIONFILE ] || echo "OpenGnsys" >$VERSIONFILE
-	perl -pi -e "s/($| r[0-9]*)/ $REVISION/" $VERSIONFILE
+	sed -ri "s/($| r[.0-9a-f]+)/ $REVISION/" $VERSIONFILE
 
 	echo
 	echoAndLog "OpenGnsys Update Summary"
diff --git a/installer/vagrant/README.es.txt b/installer/vagrant/README.es.txt
index ce40f709..6f300afe 100644
--- a/installer/vagrant/README.es.txt
+++ b/installer/vagrant/README.es.txt
@@ -5,7 +5,7 @@ Preparar entorno virtual de desarrollo para OpenGnsys
 
 Ficheros de configuración disponibles:
 
- - Vagrantfile-trunk-vbox  Vagrantfile para OpenGnsys estable con proveedor VirtualBox.
+ - Vagrantfile-prod-vbox   Vagrantfile para OpenGnsys estable con proveedor VirtualBox.
  - Vagrantfile-devel-vbox  Vagrantfile para OpenGnsys en desarrollo con proveedor VirtualBox.
  - Vagrantfile-boottools-vbox  Vagrantfile para preparar el entorno de generación del cliente ogLive (recomendado solo para desarrolladores experimentados).
  - Vagrantfile-browser-vbox    Vagrantfile para preparar el entorno de desarrollo del Browser del cliente (recomendado solo para miembros del grupo de desarrollo).
@@ -25,7 +25,7 @@ El entorno de trabajo de OpenGnsys.
  - pc12 - ogclientN: MV clientes para restaurar con disco vacío.
 
 
-Ejecutar el entorno virtual (Vagrantfile-trunk-vbox y Vagrantfile-devel-vbox).
+Ejecutar el entorno virtual (Vagrantfile-prod-vbox y Vagrantfile-devel-vbox).
 
  - Crear un directorio de trabajo.
  - Copiar el fichero Vagrantfile-...-vbox correspondiente en dicho directorio como Vagrantfile.
diff --git a/installer/vagrant/Vagrantfile-boottools-vbox b/installer/vagrant/Vagrantfile-boottools-vbox
index e4f07837..a22e8850 100644
--- a/installer/vagrant/Vagrantfile-boottools-vbox
+++ b/installer/vagrant/Vagrantfile-boottools-vbox
@@ -19,12 +19,12 @@ sed -i "s/XKBLAYOUT=.*/XKBLAYOUT=\"${LANG%_*}\"/" /etc/default/keyboard
 dpkg-reconfigure -fnoninteractive console-setup
 # Install dependencies.
 apt-get update -y
-apt-get install -y subversion
+apt-get install -y jq subversion syslinux syslinux-efi syslinux-utils
 # Prepare environment.
 groupadd opengnsys
 mkdir -p /opt/opengnsys/client /tmp/opengnsys_installer/opengnsys
 ln -fs /var/lib/tftpboot /opt/opengnsys
-svn export https://opengnsys.es/svn/trunk/client /tmp/opengnsys_installer/opengnsys/client
+svn export https://github.com/opengnsys/OpenGnsys/branches/master/client /tmp/opengnsys_installer/opengnsys/client
 echo "Connect to this VM, launch boot-tools generation script and follow instructions:"
 echo "    sudo /tmp/opengnsys_installer/opengnsys/client/boot-tools/boottoolsgenerator.sh"
 echo "Warning: this process may take a long time."
diff --git a/installer/vagrant/Vagrantfile-browser-vbox b/installer/vagrant/Vagrantfile-browser-vbox
index 9cf3661c..a3b884a0 100644
--- a/installer/vagrant/Vagrantfile-browser-vbox
+++ b/installer/vagrant/Vagrantfile-browser-vbox
@@ -29,7 +29,7 @@ echo "yes" | ./configure -opensource -embedded x86 -webkit -openssl -qt-gfx-vnc
 make
 make install
 # Compile Browser.
-svn export https://opengnsys.es/svn/branches/version1.1/client/browser ../browser
+svn export https://github.com/opengnsys/OpenGnsys/branches/master/client/browser ../browser
 cd browser
 qmake browser.pro
 make
diff --git a/installer/vagrant/Vagrantfile-devel-vbox b/installer/vagrant/Vagrantfile-devel-vbox
index c8eb022f..4d41afd0 100644
--- a/installer/vagrant/Vagrantfile-devel-vbox
+++ b/installer/vagrant/Vagrantfile-devel-vbox
@@ -1,4 +1,4 @@
-# Vagrantfile to install OpenGnsys 1.1 virtual environment using VirtualBox provider.
+# Vagrantfile to install OpenGnsys virtual environment (development version) using VirtualBox provider.
 
 VAGRANTFILE_API_VERSION = "2"
 # VM provider: Oracle VM VirtualBox.
@@ -38,7 +38,7 @@ if [ -z "$(blkid /dev/mapper/og-images | grep ext4)" ]; then
     mount -a
 fi
 # Install OpenGnsys and change server address.
-wget -q https://opengnsys.es/svn/branches/version1.1/installer/opengnsys_installer.sh -O - | bash || exit $?
+curl -s https://raw.githubusercontent.com/opengnsys/OpenGnsys/devel/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
 # Insert DHCP data.
@@ -94,7 +94,7 @@ OGAGENTPKG = "ogagent_1.1.0_all.deb"
 MODELSCRIPT = <<EOT
 # Comment out next lines to install and configure OGAgent for Ubuntu.
 #apt-get update -y
-#wget -q --no-check-certificate https://#{SERVERIP}/opengnsys/descargas/#{OGAGENTPKG}
+#curl -ks https://#{SERVERIP}/opengnsys/descargas/#{OGAGENTPKG} -o #{OGAGENTPKG}
 #if [ -f #{OGAGENTPKG} ]; then
 #    dpkg -i #{OGAGENTPKG}
 #    apt-get install -fy || exit $?
diff --git a/installer/vagrant/Vagrantfile-ogagent-vbox b/installer/vagrant/Vagrantfile-ogagent-vbox
index d393977d..7b7753db 100644
--- a/installer/vagrant/Vagrantfile-ogagent-vbox
+++ b/installer/vagrant/Vagrantfile-ogagent-vbox
@@ -33,7 +33,9 @@ wget -q https://atom.io/download/rpm -O /tmp/atom.rpm && dnf install -y /tmp/ato
 # 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 https://opengnsys.es/svn/trunk/installer/ogagent-devel-installer.sh /home/vagrant
+BRANCH="master"
+wget -qc --unlink https://raw.githubusercontent.com/opengnsys/OpenGnsys/$BRANCH/installer/ogagent-devel-installer.sh -O /home/vagrant/ogagent-devel-installer.sh
+chmod +x /home/vagrant/ogagent-devel-installer.sh
 # Instructions.
 echo "Manual operations:"
 echo "- Reboot VM or launch desktop: startxfce4 &"
@@ -60,7 +62,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       vb.gui = true
     end
     # VM base and host name.
-    ag.vm.box = "fedora/25-cloud-base"
+    ag.vm.box = "fedora/27-cloud-base"
     ag.vm.hostname = "ogAgent"
     # Comment to disable synced folder.
     ag.vm.synced_folder ".", "/vagrant"
diff --git a/installer/vagrant/Vagrantfile-trunk-vbox b/installer/vagrant/Vagrantfile-prod-vbox
index 75dbcd11..813ee962 100644
--- a/installer/vagrant/Vagrantfile-trunk-vbox
+++ b/installer/vagrant/Vagrantfile-prod-vbox
@@ -1,4 +1,4 @@
-# Vagrantfile to install OpenGnsys Trunk (v1.1.0) virtual environment using VirtualBox provider.
+# Vagrantfile to install OpenGnsys virtual environment (production version) using VirtualBox provider.
 
 VAGRANTFILE_API_VERSION = "2"
 # VM provider: Oracle VM VirtualBox.
@@ -38,7 +38,7 @@ if [ -z "$(blkid /dev/mapper/og-images | grep ext4)" ]; then
     mount -a
 fi
 # Install OpenGnsys and change server address.
-wget -q https://opengnsys.es/svn/trunk/installer/opengnsys_installer.sh -O - | bash || exit $?
+curl -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
 # Insert DHCP data.
@@ -73,7 +73,7 @@ OGAGENTPKG = "ogagent_1.1.0_all.deb"
 MODELSCRIPT = <<EOT
 # Comment out next lines to install and configure OGAgent for Ubuntu.
 #apt-get update -y
-#wget -q --no-check-certificate https://#{SERVERIP}/opengnsys/descargas/#{OGAGENTPKG}
+#curl -ks https://#{SERVERIP}/opengnsys/descargas/#{OGAGENTPKG} -o #{OGAGENTPKG}
 #if [ -f #{OGAGENTPKG} ]; then
 #    dpkg -i #{OGAGENTPKG}
 #    apt-get install -fy || exit $?