#993 Remove ogAdmServerAux

This patch removes ogAdmServerAux which is no longer needed. This script
is replaced by the modifications performed on 'setclientmode' and a call
to the ogServer API POST /modes.

4 files changed, 0 insertions, 60 deletions

diff --git a/admin/Sources/Services/ogAdmServerAux b/admin/Sources/Services/ogAdmServerAux
deleted file mode 100755
index 65bea5cb..00000000
--- a/admin/Sources/Services/ogAdmServerAux
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-# Script para solicitar acciones al servidor de administración desde los clientes. 
-# Acciones permitidas: configurar modo de arranque.
-PARM=`cat`
-
-
-
-BASEDIR=/opt/opengnsys
-PATH=$PATH:$BASEDIR/bin
-SERVERNAME=ogAdmServer
-SERVERLOG=$BASEDIR/log/$SERVERNAME.log
-
-
-# Añade registro de incidencias.
-function echolog () {
-	date +"%Y%m%d-%H%M%S $*" >> $SERVERLOG
-}
-
-
-PARM1=$(echo $PARM | cut -f1 -d" ")
-PARM2=$(echo $PARM | cut -f2 -d" ")
-PARM3=$(echo $PARM | cut -f3 -d" ")
-PARM4=$(echo $PARM | cut -f4 -d" ")
-
-
-case "$PARM1" in
-	SET_CLIENTMODE)
-		#1 SET_CLIENTMODE
-		#2  template
-		#3 pc_name o group_pc
-#4 modo temporal o permanente
-
-		TEMPLATE="$PARM2"
-		PC="$PARM3"
-#incluyo parametro de MODO
-		MODO="$PARM4"
-		echolog "Ejecutar $(which setclientmode) $FILE $MCASTOPT"
-#incluyo parametro de MODO
-		setclientmode $TEMPLATE $PC $MODO &>> $SERVERLOG
-		exit $? 
-	;;
-	default)
-	    echolog "Solicitud con parametros  \"$PARM\"  no realizada, no registrada o con errores"
-	;;
-esac
-
diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init
index 537bddcf..e382df23 100755
--- a/admin/Sources/Services/opengnsys.init
+++ b/admin/Sources/Services/opengnsys.init
@@ -31,11 +31,6 @@ SERVERCFG=$BASEDIR/etc/$SERVERNAME.cfg
 REPOAUXNAME=ogAdmRepoAux
 REPOAUXDAEMON=$BASEDIR/sbin/$REPOAUXNAME
 REPOAUXPORT=$(awk -F= '/PUERTO/ {print $2+1}' $SERVERCFG 2>/dev/null)
-############## ADV
-############# IRINA # para setBootMode desde el cliente
-SERVERAUXNAME=ogAdmServerAux
-SERVERAUXDAEMON=$BASEDIR/sbin/$SERVERAUXNAME
-SERVERAUXPORT=2011  
 ############# IRINA
 
 #
@@ -125,12 +120,6 @@ arranca_demonios() {
      chgrp $OPENGNSYSUSER $CLIENTLOGDIR
   fi
   # Arrancar los servicios indicados.
-  if [ $RUN_OGADMSERVER = "yes" ]; then
-     # Para SetBootmode desde el cliente
-     $ACTIONMSG "Iniciando demonio: $SERVERAUXNAME"                    #
-     faucet $SERVERAUXPORT --daemon --in bash -c "$SERVERAUXDAEMON"    #   NUEVO
-     [ $? = 0 ] && $SUCCESSMSG || $FAILMSG 
-  fi
   if [ $RUN_OGADMREPO = "yes" ]; then
      $ACTIONMSG "Iniciando demonio: $REPOAUXNAME"
      faucet $REPOAUXPORT --daemon --in bash -c "$REPOAUXDAEMON"
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 1419a138..086d34e6 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -1275,7 +1275,6 @@ function copyServerFiles ()
 			server/bin \
 			repoman/bin \
 			server/lib \
-			admin/Sources/Services/ogAdmServerAux
 			admin/Sources/Services/ogAdmRepoAux
 			installer/opengnsys_uninstall.sh \
 			installer/opengnsys_update.sh \
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index 952d085c..502e2e9e 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -918,7 +918,6 @@ function updateServerFiles()
 	local SOURCES=(	repoman/bin \
 			server/bin \
 			server/lib \
-			admin/Sources/Services/ogAdmServerAux \
 			admin/Sources/Services/ogAdmRepoAux \
 			server/tftpboot \
 			/usr/lib/shim/shimx64.efi.signed \
@@ -930,7 +929,6 @@ function updateServerFiles()
 	local TARGETS=(	bin \
 			bin \
 			lib \
-			sbin/ogAdmServerAux \
 			sbin/ogAdmRepoAux \
 			tftpboot \
 			tftpboot/shimx64.efi.signed \