#986 Rename to ogserver

Step forward to rename all ogAdmServer references to ogServer

8 files changed, 15 insertions, 15 deletions

diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init
index 8917e2b5..537bddcf 100755
--- a/admin/Sources/Services/opengnsys.init
+++ b/admin/Sources/Services/opengnsys.init
@@ -21,7 +21,7 @@ CLIENTLOGDIR=$BASEDIR/log/clients
 #
 # Servidor de OpenGnsys
 #
-SERVERNAME=ogAdmServer
+SERVERNAME=ogserver
 SERVERCFG=$BASEDIR/etc/$SERVERNAME.cfg
 
 #
diff --git a/admin/WebConsole/includes/restfunctions.php b/admin/WebConsole/includes/restfunctions.php
index b1355e36..81821ff9 100644
--- a/admin/WebConsole/includes/restfunctions.php
+++ b/admin/WebConsole/includes/restfunctions.php
@@ -82,7 +82,7 @@ define('OG_SCHEDULE_COMMAND', 'command');
 define('OG_SCHEDULE_PROCEDURE', 'procedure');
 define('OG_SCHEDULE_TASK', 'task');
 
-$conf_file = parse_ini_file(__DIR__ . '/../../etc/ogAdmServer.cfg');
+$conf_file = parse_ini_file(__DIR__ . '/../../etc/ogserver.cfg');
 define('OG_REST_API_TOKEN', 'Authorization: ' . $conf_file['APITOKEN']);
 
 function common_request($command, $type, $data = null) {
diff --git a/client/shared/lib/engine/tests/crearTestDisk1 b/client/shared/lib/engine/tests/crearTestDisk1
index ab405221..7aaa5303 100755
--- a/client/shared/lib/engine/tests/crearTestDisk1
+++ b/client/shared/lib/engine/tests/crearTestDisk1
@@ -12,7 +12,7 @@
 # Variables.
 PROG=$(basename $0)
 OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"}
-SERVERCONF=$OPENGNSYS/etc/ogAdmServer.cfg
+SERVERCONF=$OPENGNSYS/etc/ogserver.cfg
 TESTDIR="$OPENGNSYS/client/lib/engine/tests/NoModify"
 TESTFILE="$TESTDIR/Disk1-$1.shtest "
 # Control básico de errores.
diff --git a/client/shared/lib/engine/tests/crearTestLock2 b/client/shared/lib/engine/tests/crearTestLock2
index c3ac2cde..1174410d 100755
--- a/client/shared/lib/engine/tests/crearTestLock2
+++ b/client/shared/lib/engine/tests/crearTestLock2
@@ -7,7 +7,7 @@
 # Variables.
 PROG=$(basename $0)
 OPENGNSYS=${OPENGNSYS:-"/opt/opengnsys"}
-SERVERCONF=$OPENGNSYS/etc/ogAdmServer.cfg
+SERVERCONF=$OPENGNSYS/etc/ogserver.cfg
 TESTDIR="$OPENGNSYS/client/lib/engine/tests/Modify"
 TESTFILE="$TESTDIR/Lock2-img$1.shtest "
 # Control básico de errores.
diff --git a/installer/opengnsys_export.sh b/installer/opengnsys_export.sh
index 3910b78d..e0f6959c 100755
--- a/installer/opengnsys_export.sh
+++ b/installer/opengnsys_export.sh
@@ -55,7 +55,7 @@ if ! which realpath &>/dev/null ; then
 fi
 
 # Comprobamos  acceso a ficheros de configuración
-if ! [ -r $OPENGNSYS/etc/ogAdmServer.cfg ]; then
+if ! [ -r $OPENGNSYS/etc/ogserver.cfg ]; then
     echo "$PROG: ERROR: Sin acceso a la configuración de OpenGnsys." | tee -a $FILESAL
     exit 3
 fi
@@ -72,7 +72,7 @@ done
 
 # Exportar la base de datos
 echo "Exportamos la información de la base de datos."
-source $OPENGNSYS/etc/ogAdmServer.cfg
+source $OPENGNSYS/etc/ogserver.cfg
 # Crear fichero temporal de acceso a la BD
 MYCNF=$(mktemp /tmp/.my.cnf.XXXXX)
 chmod 600 $MYCNF
diff --git a/installer/opengnsys_import.sh b/installer/opengnsys_import.sh
index 7dcaad3f..0962e34b 100755
--- a/installer/opengnsys_import.sh
+++ b/installer/opengnsys_import.sh
@@ -278,7 +278,7 @@ if ! [ -r $BACKUPFILE ]; then
 fi
 
 # Comprobamos  acceso a ficheros de configuración
-if ! [ -r $OPENGNSYS/etc/ogAdmServer.cfg ]; then
+if ! [ -r $OPENGNSYS/etc/ogserver.cfg ]; then
     echo "$PROG: ERROR: Sin acceso a la configuración de OpenGnsys." | tee -a $FILESAL
     exit 3
 fi
@@ -333,7 +333,7 @@ fi
 
 # MYSQL
 echo "   * Importamos informacion mysql."
-source $OPENGNSYS/etc/ogAdmServer.cfg
+source $OPENGNSYS/etc/ogserver.cfg
 # Crear fichero temporal de acceso a la BD
 if [ ! -r $MYCNF ]; then
     chmod 600 $MYCNF
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index ec0d3c74..8a9de630 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -1345,7 +1345,7 @@ function ogServerCompilation ()
 
 	echoAndLog "${FUNCNAME}(): Compiling OpenGnsys Server"
 	pushd "$WORKDIR/ogServer-$BRANCH"
-	autoreconf -fi && ./configure && make && mv ogAdmServer $INSTALL_TARGET/sbin
+	autoreconf -fi && ./configure && make && mv ogserver $INSTALL_TARGET/sbin
 	if [ $? -ne 0 ]; then
 		echoAndLog "${FUNCNAME}(): error while compiling OpenGnsys Server"
 		error=1
@@ -1508,7 +1508,7 @@ function openGnsysConfigure()
 			    -e "s/DBUSER/$OPENGNSYS_DB_USER/g" \
 			    -e "s/DBPASSWORD/$OPENGNSYS_DB_PASSWD/g" \
 			    -e "s/DATABASE/$OPENGNSYS_DATABASE/g" \
-				"$WORKDIR"/ogServer-"$BRANCH"/ogAdmServer.cfg > "$INSTALL_TARGET"/etc/ogAdmServer-"$dev".cfg
+				"$WORKDIR"/ogServer-"$BRANCH"/cfg/ogserver.cfg > "$INSTALL_TARGET"/etc/ogserver-"$dev".cfg
 			sed -e "s/SERVERIP/${SERVERIP[i]}/g" \
 				$WORKDIR/opengnsys/repoman/etc/ogAdmRepo.cfg.tmpl > $INSTALL_TARGET/etc/ogAdmRepo-$dev.cfg
 			CONSOLEURL="https://${SERVERIP[i]}/opengnsys"
@@ -1525,7 +1525,7 @@ function openGnsysConfigure()
 		fi
 		let i++
 	done
-	ln -f $INSTALL_TARGET/etc/ogAdmServer-$DEFAULTDEV.cfg $INSTALL_TARGET/etc/ogAdmServer.cfg
+	ln -f $INSTALL_TARGET/etc/ogserver-$DEFAULTDEV.cfg $INSTALL_TARGET/etc/ogserver.cfg
 	ln -f $INSTALL_TARGET/etc/ogAdmRepo-$DEFAULTDEV.cfg $INSTALL_TARGET/etc/ogAdmRepo.cfg
 	ln -f $INSTALL_TARGET/www/controlacceso-$DEFAULTDEV.php $INSTALL_TARGET/www/controlacceso.php
 
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index ffe262d8..904a1184 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -53,8 +53,8 @@ if [ ! -d $INSTALL_TARGET ]; then
         exit 1
 fi
 # Cargar configuración de acceso a la base de datos.
-if [ -r $INSTALL_TARGET/etc/ogAdmServer.cfg ]; then
-	source $INSTALL_TARGET/etc/ogAdmServer.cfg
+if [ -r $INSTALL_TARGET/etc/ogserver.cfg ]; then
+	source $INSTALL_TARGET/etc/ogserver.cfg
 fi
 OPENGNSYS_DATABASE=${OPENGNSYS_DATABASE:-"$CATALOG"}		# Base de datos
 OPENGNSYS_DBUSER=${OPENGNSYS_DBUSER:-"$USUARIO"}		# Usuario de acceso
@@ -1075,7 +1075,7 @@ function ogServerCompilation()
 
 	echoAndLog "${FUNCNAME}(): Recompiling OpenGnsys Admin Server"
 	pushd "$WORKDIR/ogServer-$BRANCH"
-	autoreconf -fi && ./configure && make && moveNewService ogAdmServer $INSTALL_TARGET/sbin
+	autoreconf -fi && ./configure && make && moveNewService ogserver $INSTALL_TARGET/sbin
 	if [ $? -ne 0 ]; then
 		echoAndLog "${FUNCNAME}(): error while compiling OpenGnsys Server"
 		error=1
@@ -1089,7 +1089,7 @@ function ogServerCompilation()
 		rm -f $INSTALL_TARGET/sbin/ogAdmAgent
 
 	# Generar un API token de ogAdmServer si no existe en el fichero de configuración.
-	grep -q "APITOKEN=" $INSTALL_TARGET/etc/ogAdmServer.cfg || \
+	grep -q "APITOKEN=" $INSTALL_TARGET/etc/ogserver.cfg || \
 		$INSTALL_TARGET/bin/settoken -f
 
 	if ! diff -q \