Web Console ejecuta inventario hardware, apagar y reiniciar clientes.

git-svn-id: https://opengnsys.es/svn/trunk@524 a21b9725-9963-47de-94b9-378ad31fedc9

11 files changed, 14 insertions, 11 deletions

diff --git a/admin/Database/ogBDAdmin.sql b/admin/Database/ogBDAdmin.sql
index 1bfd2210..763d4a26 100644
--- a/admin/Database/ogBDAdmin.sql
+++ b/admin/Database/ogBDAdmin.sql
@@ -1023,7 +1023,7 @@ CREATE TABLE IF NOT EXISTS `tipohardwares` (
 
 INSERT INTO `tipohardwares` (`idtipohardware`, `descripcion`, `urlimg`, `nemonico`, `pci`) VALUES 
 (1, 'placas', '../images/iconos/placabase.gif', 'boa', 0),
-(2, 'Camaras web', '../images/iconos/camweb.gif', '', 0),
+(2, 'Dispositivos Multimedia', '../images/iconos/tsonido.gif', 'mul', 0),
 (3, 'Tarjetas de Red', '../images/iconos/nic.gif', 'net', 0),
 (4, 'Microprocesadores', '../images/iconos/micro.gif', 'cpu', 0),
 (5, 'Memorias', '../images/iconos/confihard.gif', 'mem', 0),
@@ -1032,7 +1032,11 @@ INSERT INTO `tipohardwares` (`idtipohardware`, `descripcion`, `urlimg`, `nemonic
 (9, 'Dispositivos de sonido', '../images/iconos/tsonido.gif', 'aud', 0),
 (10, 'Marca y modelo del equipo', '../images/iconos/confihard.gif', 'mod', 0),
 (11, 'Modelo y version de la bios', '../images/iconos/confihard.gif', 'bio', 0),
-(12, 'Modelo de grabadora o  grabadora de CD/DVD', '../images/iconos/confihard.gif', 'cdr', 0);
+(12, 'Modelo de grabadora o  grabadora de CD/DVD', '../images/iconos/confihard.gif', 'cdr', 0),
+(13, 'Controladores IDE', '../images/iconos/confihard.gif', 'ide', 0),
+(14, 'Controladores FireWire', '../images/iconos/confihard.gif', 'fir', 0),
+(15, 'Controladores USB', '../images/iconos/confihard.gif', 'usb', 0),
+(16, 'Bus del Sistema', '../images/iconos/confihard.gif', 'bus', 0);
 
 -- --------------------------------------------------------
 
diff --git a/admin/Services/ogAdmClient/ogAdmClient b/admin/Services/ogAdmClient/ogAdmClient
deleted file mode 100755
index 0490eea5..00000000
--- a/admin/Services/ogAdmClient/ogAdmClient
+++ /dev/null
diff --git a/admin/Services/ogAdmClient/ogAdmClient.cfg b/admin/Services/ogAdmClient/ogAdmClient.cfg
index c0917b85..9a122e63 100644
--- a/admin/Services/ogAdmClient/ogAdmClient.cfg
+++ b/admin/Services/ogAdmClient/ogAdmClient.cfg
@@ -5,4 +5,3 @@ hidraCHEIMAGENES=/opt/opengnsys/images
 hidraSRVIMAGENES=/opt/opengnsys/images
 hidraSRVCMD=/opt/opengnsys/admin/comandos
 
-
diff --git a/admin/Services/ogAdmClient/sources/ogAdmClient.c b/admin/Services/ogAdmClient/sources/ogAdmClient.c
index 09e61d55..21cad7aa 100644
--- a/admin/Services/ogAdmClient/sources/ogAdmClient.c
+++ b/admin/Services/ogAdmClient/sources/ogAdmClient.c
@@ -1285,7 +1285,7 @@ int Apagar(TRAMA *trama,TRAMA *nwtrama)
 
 	sprintf(nwtrama->parametros,"nfn=RESPUESTA_Apagar\r");					
 	res=RespuestaEjecucionComando(trama,nwtrama,true);	
-	strcpy(cmdshell,"shutdown -h now");
+	strcpy(cmdshell,"poweroff");
 	system(cmdshell);
 	return(res);
 }
@@ -1306,7 +1306,7 @@ int Reiniciar(TRAMA *trama,TRAMA *nwtrama)
 	
 	sprintf(nwtrama->parametros,"nfn=RESPUESTA_Reiniciar\r");					
 	res=RespuestaEjecucionComando(trama,nwtrama,true);	
-	strcpy(cmdshell,"shutdown -r now");
+	strcpy(cmdshell,"reboot");
 	system(cmdshell);
 	return(res);
 }
diff --git a/admin/Services/ogAdmRepo/ogAdmRepo.cfg b/admin/Services/ogAdmRepo/ogAdmRepo.cfg
index 0fc067de..a3a9e903 100644
--- a/admin/Services/ogAdmRepo/ogAdmRepo.cfg
+++ b/admin/Services/ogAdmRepo/ogAdmRepo.cfg
@@ -1,3 +1,3 @@
-IPlocal=10.1.15.4
-IPhidra=10.1.15.4
+IPlocal=SERVERIP
+IPhidra=SERVERIP
 Puerto=2008
diff --git a/admin/WebConsole/controlacceso.php b/admin/WebConsole/controlacceso.php
index daf6e38e..04eeb1a2 100644
--- a/admin/WebConsole/controlacceso.php
+++ b/admin/WebConsole/controlacceso.php
@@ -22,10 +22,10 @@ if (isset($_POST["pss"])) $pss=$_POST["pss"];
 //========================================================================================================

 // Variables de sessión de configuración de servidor y base de datos( Modificar aquípara cambio global) 

 $cnx="localhost;usuog;passusuog;ogBDAdmin;mysql"; // Cadena de conexión a la base de datos

-$ips="10.1.15.4"; // IP del servidor de Administración
+$ips="SERVERIP"; // IP del servidor de Administración
 $prt="2008"; // Puerto de comunicación con el servidor
-$wer="http://10.1.15.4/WebConsole/pagerror.php"; // Página de redireccionamiento de errores

-$wac="http://10.1.15.4/WebConsole/acceso.php"; // Página de login de la aplicación

+$wer="OPENGNSYSURL/pagerror.php"; // Página de redireccionamiento de errores

+$wac="OPENGNSYSURL/acceso.php"; // Página de login de la aplicación

 //========================================================================================================

 $cmd=CreaComando($cnx); // Crea objeto comando

 $resul=false;

diff --git a/admin/WebConsole/opengnsys-icon.jpg b/admin/WebConsole/opengnsys-icon.jpg
new file mode 100644
index 00000000..859844e3
--- /dev/null
+++ b/admin/WebConsole/opengnsys-icon.jpg
diff --git a/client/nfsexport/bin/ogAdmClient b/client/nfsexport/bin/ogAdmClient
new file mode 100755
index 00000000..440c2823
--- /dev/null
+++ b/client/nfsexport/bin/ogAdmClient
diff --git a/doc/opengnsys-icon.jpg b/doc/opengnsys-icon.jpg
new file mode 100644
index 00000000..859844e3
--- /dev/null
+++ b/doc/opengnsys-icon.jpg
diff --git a/doc/opengnsys-logo.png b/doc/opengnsys-logo.png
index e98a2dcd..23b68b47 100644
--- a/doc/opengnsys-logo.png
+++ b/doc/opengnsys-logo.png
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 2432d487..78f057af 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -714,7 +714,7 @@ function openGnsysClientCreate ()
 	echoAndLog "openGnsysClientCreate(): Copying OpenGNSys Client files."
         cp -ar $WORKDIR/opengnsys/client/nfsexport/* $INSTALL_TARGET/client
         find $INSTALL_TARGET/client -name .svn -type d -exec rm -fr {} \; 2>/dev/null
-        chmod u+x $INSTALL_TARGET/client/admin/scripts/*
+        chmod +x $INSTALL_TARGET/client/admin/scripts/*
 	echoAndLog "openGnsysClientCreate(): Copying OpenGNSys Cloning Engine files."
         mkdir -p $INSTALL_TARGET/client/lib/engine/bin
         cp -ar $WORKDIR/opengnsys/client/engine/*.lib $INSTALL_TARGET/client/lib/engine/bin