mirror of https://git.48k.eu/ogserver
#986 rename to ogserver
parent
83937b85f2
commit
333abbe160
18
Makefile.am
18
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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'])
|
||||
|
|
Loading…
Reference in New Issue