diff options
| -rw-r--r-- | admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql | 2 | ||||
| -rw-r--r-- | admin/WebConsole/rest/ogagent.php | 7 | ||||
| -rw-r--r-- | client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking | 1 | ||||
| -rwxr-xr-x | client/shared/etc/preinit/otherservices.sh | 2 | ||||
| -rwxr-xr-x | installer/opengnsys_installer.sh | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql b/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql index b292ec49..6b7ad95e 100644 --- a/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql +++ b/admin/Database/ogAdmBD-1.0.6b-1.1.0pre.sql @@ -132,7 +132,7 @@ CREATE TABLE IF NOT EXISTS ogagent_queue ( INSERT INTO comandos (idcomando, descripcion, pagina, gestor, funcion, urlimg, aplicambito, visuparametros, parametros, comentarios, activo, submenu) VALUES (16, 'Enviar mensaje', '../comandos/EnviarMensaje.php', '../comandos/gestores/gestor_Comandos.php', 'EnviarMensaje', '', - 31, '', '', '', 1, '' ); + 31, 'tit;msj', 'nfn;iph;tit;msj', '', 1, '' ); INSERT INTO parametros (idparametro, nemonico, descripcion, nomidentificador, nomtabla, nomliteral, tipopa, visual) VALUES (39, 'tit', 'Título', '', '', '', 0, 1), (40, 'msj', 'Contenido', '', '', '', 0, 1); diff --git a/admin/WebConsole/rest/ogagent.php b/admin/WebConsole/rest/ogagent.php index 8acbdd4f..65c6cf64 100644 --- a/admin/WebConsole/rest/ogagent.php +++ b/admin/WebConsole/rest/ogagent.php @@ -24,7 +24,7 @@ function writeLog($message = "") { * @note Route: /ogagent/started, Method: POST, Format: JSON * @param string ip IP address * @param string mac MAC (Ethernet) address - * @param string ostype OS type (Linux, Windows) + * @param string ostype OS type (Linux, Windows, macOS) * @param string osversion OS version * @param string secret random secret key to access client's REST API * @return Null string if OK, else error message. @@ -85,7 +85,7 @@ EOD; * @note Route: /ogagent/stopped, Method: POST, Format: JSON * @param string ip IP address * @param string mac MAC (Ethernet) address - * @param string ostype OS type (Linux, Windows) + * @param string ostype OS type (Linux, Windows, macOS) * @param string osversion OS version * @return Null string if OK, else error message. */ @@ -123,6 +123,9 @@ $app->post('/ogagent/stopped', * @note Route: /ogagent/loggedin, Method: POST, Format: JSON * @param string ip IP address * @param string user username + * @param string language session language + * @param string ostype OS type (Linux, Windows, macOS) + * @param string osversion OS version * @return Null string if OK, else error message. */ $app->post('/ogagent/loggedin', diff --git a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking index cf4072cc..42d44e85 100644 --- a/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking +++ b/client/boot-tools/includes/usr/bin/boot-tools/listpackages/sw.networking @@ -1,5 +1,6 @@ #sw.networking install netpipes +install curl install wget install tftp install dnsutils diff --git a/client/shared/etc/preinit/otherservices.sh b/client/shared/etc/preinit/otherservices.sh index ba12d1c9..8c7d4cef 100755 --- a/client/shared/etc/preinit/otherservices.sh +++ b/client/shared/etc/preinit/otherservices.sh @@ -28,7 +28,7 @@ cp -a $OPENGNSYS/etc/preinit/loadenviron.sh /etc/profile.d/ #setterm -blank 0 -powersave off -powerdown 0 < /dev/console > /dev/console 2>&1 # Activado WOL en la interfaz usada en arranque PXE. -#ethtool -s $DEVICE wol g 2>/dev/null +ethtool -s $DEVICE wol g 2>/dev/null # TODO Localizar correctamente el script de arranque. [ -f /opt/opengnsys/scripts/runhttplog.sh ] && /opt/opengnsys/scripts/runhttplog.sh 2>/dev/null diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index f710adc4..bf933220 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -306,7 +306,7 @@ case "$OSDISTRIB" in [ -z "$(apt-cache pkgnames libmysqlclient15)" ] && DEPENDENCIES=( ${DEPENDENCIES[@]//libmysqlclient15/libmysqlclient} ) ;; centos) # Postconfiguación personalizada para CentOS. - # Configuración para PHP 5 en Ubuntu 16.x+. + # Configuración para PHP 5. if ! yum list php5\*w &>/dev/null; then if [ $OSVERSION -ge 7 ]; then yum install -y https://mirror.webtatic.com/yum/el$OSVERSION/webtatic-release.rpm |