48k.eu-mirror
/
ogserver
mirror of https://git.48k.eu/ogserver
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#986 rename to ogserver

master
OpenGnSys Support Team 2020-06-19 11:19:09 +02:00
parent 83937b85f2
commit 333abbe160
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.am
View File

@ -1,12 +1,12 @@
sbin_PROGRAMS = ogAdmServer sbin_PROGRAMS = ogserver
AM_CFLAGS = ${LIBDBI_CFLAGS} ${LIBJANSSON_CFLAGS} ${LIBEVENT_CFLAGS} -g -Wall AM_CFLAGS = ${LIBDBI_CFLAGS} ${LIBJANSSON_CFLAGS} ${LIBEVENT_CFLAGS} -g -Wall
ogAdmServer_SOURCES= sources/ogAdmServer.c \ ogserver_SOURCES= sources/ogAdmServer.c \
sources/dbi.c \ sources/dbi.c \
sources/schedule.c \ sources/schedule.c \
sources/utils.c \ sources/utils.c \
sources/rest.c \ sources/rest.c \
sources/client.c \ sources/client.c \
sources/json.c \ sources/json.c \
sources/ogAdmLib.c sources/ogAdmLib.c

4
cfg/ogadmserver.service
View File

@ -1,4 +1,4 @@
# ogAdmServer systemd service file # ogserver systemd service file
[Unit] [Unit]
Documentation=https://opengnsys.es/trac/wiki/En%%3ADocumentacionUsuario Documentation=https://opengnsys.es/trac/wiki/En%%3ADocumentacionUsuario
@ -10,4 +10,4 @@ After=mysql.service
WantedBy=multi-user.target WantedBy=multi-user.target
[Service] [Service]
ExecStart=/opt/opengnsys/sbin/ogAdmServer -f /opt/opengnsys/etc/ogAdmServer.cfg ExecStart=/opt/opengnsys/sbin/ogserver -f /opt/opengnsys/etc/ogserver.cfg

2
configure.ac
View File

@ -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_CONFIG_AUX_DIR([build-aux])
AC_PREFIX_DEFAULT(/opt/opengnsys) AC_PREFIX_DEFAULT(/opt/opengnsys)

4
sources/ogAdmLib.c
View File

@ -41,8 +41,8 @@ BOOLEAN validacionParametros(int argc, char*argv[],int eje) {
switch(eje){ switch(eje){
case 1: // Administrador case 1: // Administrador
strcpy(szPathFileCfg, "ogAdmServer.cfg"); // Valores por defecto de archivos strcpy(szPathFileCfg, "ogserver.cfg"); // Valores por defecto de archivos
strcpy(szPathFileLog, "ogAdmServer.log"); // de configuración y de logs strcpy(szPathFileLog, "ogserver.log"); // de configuración y de logs
break; break;
case 2: // Repositorio case 2: // Repositorio
strcpy(szPathFileCfg, "ogAdmRepo.cfg"); // Valores por defecto de archivos strcpy(szPathFileCfg, "ogAdmRepo.cfg"); // Valores por defecto de archivos

0
tests/config/ogAdmServer.cfg → tests/config/ogserver.cfg
View File

8
tests/run-tests.py
View File

@ -26,16 +26,16 @@ if os.getuid() is not 0:
print('You need to be root to run these tests :-)') print('You need to be root to run these tests :-)')
exit() exit()
if os.path.isfile('../ogAdmServer') is not True: if os.path.isfile('../ogserver') is not True:
print('You need to build the ogAdmServer binary to run these tests :-)') print('You need to build the ogserver binary to run these tests :-)')
exit() exit()
start_mysql(); 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) subprocess.run('python3 -m unittest discover -s units -v', shell=True)
stop_mysql(); stop_mysql();
subprocess.run(['pkill', 'ogAdmServer']) subprocess.run(['pkill', 'ogserver'])