From c2bd1e963b35f70eb76a1b3cb28bf61b4429d317 Mon Sep 17 00:00:00 2001
From: Irina Gómez <irinagomez@us.es>
Date: Mon, 9 Nov 2020 09:59:06 +0100
Subject: #988 Fix opengnsys startup script.

The port value for 'faucet' is fixed, it does not depend on the ogserver configuration. Required for multicast transfer.
---
 admin/Sources/Services/opengnsys.init | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'admin')

diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init
index e382df23..b14fde2e 100755
--- a/admin/Sources/Services/opengnsys.init
+++ b/admin/Sources/Services/opengnsys.init
@@ -18,20 +18,13 @@ OPENGNSYSUSER="opengnsys"
 IMAGEDIR=$BASEDIR/images
 CLIENTLOGDIR=$BASEDIR/log/clients
 
-#
-# Servidor de OpenGnsys
-#
-SERVERNAME=ogserver
-SERVERCFG=$BASEDIR/etc/$SERVERNAME.cfg
-
 #
 # Servidor de Repositorio
 #
 ############## ADV
 REPOAUXNAME=ogAdmRepoAux
 REPOAUXDAEMON=$BASEDIR/sbin/$REPOAUXNAME
-REPOAUXPORT=$(awk -F= '/PUERTO/ {print $2+1}' $SERVERCFG 2>/dev/null)
-############# IRINA
+REPOAUXPORT=2009
 
 #
 # Opciones Bittorrent
@@ -142,14 +135,22 @@ para_demonios() {
   if [ -e $BTSEEDERPID ]; then
     $ACTIONMSG "Parando demonio: $BTSEEDER"
     $SEEDERSTOP
-    [ $? = 0 ] && $SUCCESSMSG || $FAILMSG
-    rm -f $BTSEEDERPID
+    if [ $? = 0 ]; then
+	   $SUCCESSMSG
+	   rm -f $BTSEEDERPID
+    else
+	   $FAILMSG
+    fi
   fi
   if [ -e $BTTRACKPID ]; then
     $ACTIONMSG "Parando demonio: $BTTRACK"
     $TRACKERSTOP
-    [ $? = 0 ] && $SUCCESSMSG || $FAILMSG
-    rm -f $BTTRACKPID
+    if [ $? = 0 ]; then
+	    $SUCCESSMSG
+            rm -f $BTTRACKPID
+    else
+	    $FAILMSG
+    fi
   fi 
   $ACTIONMSG "Parando demonio: $REPOAUXNAME"
   pkill faucet
-- 
cgit v1.2.3-18-g5258