From 333abbe160c3218c8525026518b8cc635dde299f Mon Sep 17 00:00:00 2001
From: OpenGnSys Support Team <soporte-og@soleta.eu>
Date: Fri, 19 Jun 2020 11:19:09 +0200
Subject: #986 rename to ogserver

---
 Makefile.am                  | 18 +++++++++---------
 cfg/ogadmserver.service      |  4 ++--
 configure.ac                 |  2 +-
 sources/ogAdmLib.c           |  4 ++--
 tests/config/ogAdmServer.cfg |  8 --------
 tests/config/ogserver.cfg    |  8 ++++++++
 tests/run-tests.py           |  8 ++++----
 7 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 tests/config/ogAdmServer.cfg
 create mode 100644 tests/config/ogserver.cfg

diff --git a/Makefile.am b/Makefile.am
index 3ecc803..4f19eff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
-sbin_PROGRAMS = ogAdmServer
+sbin_PROGRAMS = ogserver
 
 AM_CFLAGS  =  ${LIBDBI_CFLAGS} ${LIBJANSSON_CFLAGS} ${LIBEVENT_CFLAGS} -g -Wall
 
-ogAdmServer_SOURCES= sources/ogAdmServer.c	\
-		     sources/dbi.c		\
-		     sources/schedule.c		\
-		     sources/utils.c		\
-		     sources/rest.c		\
-		     sources/client.c		\
-		     sources/json.c		\
-		     sources/ogAdmLib.c
+ogserver_SOURCES= sources/ogAdmServer.c	\
+		  sources/dbi.c		\
+		  sources/schedule.c	\
+		  sources/utils.c	\
+		  sources/rest.c	\
+		  sources/client.c	\
+		  sources/json.c	\
+		  sources/ogAdmLib.c
diff --git a/cfg/ogadmserver.service b/cfg/ogadmserver.service
index 92dac09..3dd96ed 100644
--- a/cfg/ogadmserver.service
+++ b/cfg/ogadmserver.service
@@ -1,4 +1,4 @@
-# ogAdmServer systemd service file
+# ogserver systemd service file
 
 [Unit]
 Documentation=https://opengnsys.es/trac/wiki/En%%3ADocumentacionUsuario
@@ -10,4 +10,4 @@ After=mysql.service
 WantedBy=multi-user.target
 
 [Service]
-ExecStart=/opt/opengnsys/sbin/ogAdmServer -f /opt/opengnsys/etc/ogAdmServer.cfg
+ExecStart=/opt/opengnsys/sbin/ogserver -f /opt/opengnsys/etc/ogserver.cfg
diff --git a/configure.ac b/configure.ac
index e7014b5..60f34e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(ogAdmServer, 1.1.1, opengnsys-devel@listas.unizar.es)
+AC_INIT(ogserver, 1.1.1, opengnsys-devel@listas.unizar.es)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_PREFIX_DEFAULT(/opt/opengnsys)
 
diff --git a/sources/ogAdmLib.c b/sources/ogAdmLib.c
index 5ad3996..75dbd51 100644
--- a/sources/ogAdmLib.c
+++ b/sources/ogAdmLib.c
@@ -41,8 +41,8 @@ BOOLEAN validacionParametros(int argc, char*argv[],int eje) {
 
 	switch(eje){
 		case 1: // Administrador
-			strcpy(szPathFileCfg, "ogAdmServer.cfg"); // Valores por defecto de archivos
-			strcpy(szPathFileLog, "ogAdmServer.log"); // de configuración y de logs
+			strcpy(szPathFileCfg, "ogserver.cfg"); // Valores por defecto de archivos
+			strcpy(szPathFileLog, "ogserver.log"); // de configuración y de logs
 			break;
 		case 2: // Repositorio
 			strcpy(szPathFileCfg, "ogAdmRepo.cfg"); // Valores por defecto de archivos
diff --git a/tests/config/ogAdmServer.cfg b/tests/config/ogAdmServer.cfg
deleted file mode 100644
index 41d812b..0000000
--- a/tests/config/ogAdmServer.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-ServidorAdm=localhost
-PUERTO=2008
-USUARIO=test-db
-PASSWORD=test-db
-datasource=localhost
-CATALOG=test-db
-INTERFACE=eth1
-APITOKEN=07b3bfe728954619b58f0107ad73acc1
diff --git a/tests/config/ogserver.cfg b/tests/config/ogserver.cfg
new file mode 100644
index 0000000..41d812b
--- /dev/null
+++ b/tests/config/ogserver.cfg
@@ -0,0 +1,8 @@
+ServidorAdm=localhost
+PUERTO=2008
+USUARIO=test-db
+PASSWORD=test-db
+datasource=localhost
+CATALOG=test-db
+INTERFACE=eth1
+APITOKEN=07b3bfe728954619b58f0107ad73acc1
diff --git a/tests/run-tests.py b/tests/run-tests.py
index 1a59a34..ba28acd 100755
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -26,16 +26,16 @@ if os.getuid() is not 0:
     print('You need to be root to run these tests :-)')
     exit()
 
-if os.path.isfile('../ogAdmServer') is not True:
-    print('You need to build the ogAdmServer binary to run these tests :-)')
+if os.path.isfile('../ogserver') is not True:
+    print('You need to build the ogserver binary to run these tests :-)')
     exit()
 
 start_mysql();
 
-subprocess.Popen(['../ogAdmServer', '-f', 'config/ogAdmServer.cfg'])
+subprocess.Popen(['../ogserver', '-f', 'config/ogserver.cfg'])
 
 subprocess.run('python3 -m unittest discover -s units -v', shell=True)
 
 stop_mysql();
 
-subprocess.run(['pkill', 'ogAdmServer'])
+subprocess.run(['pkill', 'ogserver'])
-- 
cgit v1.2.3-18-g5258