diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | cfg/ogadmserver.service | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | sources/ogAdmLib.c | 4 | ||||
| -rw-r--r-- | tests/config/ogserver.cfg (renamed from tests/config/ogAdmServer.cfg) | 0 | ||||
| -rwxr-xr-x | tests/run-tests.py | 8 |
6 files changed, 18 insertions, 18 deletions
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/ogserver.cfg index 41d812b..41d812b 100644 --- a/tests/config/ogAdmServer.cfg +++ b/tests/config/ogserver.cfg 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']) |