diff options
| author | Javier Sánchez Parra <jsanchez@soleta.eu> | 2020-04-21 13:42:21 +0200 |
|---|---|---|
| committer | OpenGnSys Support Team <soporte-og@soleta.eu> | 2020-06-02 12:32:36 +0200 |
| commit | 4816ea56b0dbdf230c0db685bb6924da157b2c56 (patch) | |
| tree | 6bf36280bcace52e49bf4ec2737a7af353834132 /admin | |
| parent | 646ef927780280c15ca91ec08d04fbfaa876c65f (diff) | |
#971 Remove ogAdmAgent initialization
All the functionalities of the ogAdmAgent are now in the ogAdmServer.
So, the it is not needed anymore.
This commit remove the installation and update of the ogAdmAgent, adds a
check to remove it if exists and removes it from the OpenGnsys init
script.
A future patch will remove all the code related to the ogAdmAgent.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/Sources/Services/opengnsys.default | 2 | ||||
| -rwxr-xr-x | admin/Sources/Services/opengnsys.init | 20 |
2 files changed, 0 insertions, 22 deletions
diff --git a/admin/Sources/Services/opengnsys.default b/admin/Sources/Services/opengnsys.default index d7376cf1..085d779f 100644 --- a/admin/Sources/Services/opengnsys.default +++ b/admin/Sources/Services/opengnsys.default @@ -1,6 +1,5 @@ # RUN_OGADMSERVER defined as OpenGnsys Admin Server # RUN_OGADMREPO defined as OpenGnsys Repository Manager -# RUN_OGADMAGENT run task scheduler service, only if Admin Server is enabled # RUN_BTTRACKER run Bittorrent Tracker, only if Repository is enabled # RUN_BTSEEDER start seeding of selected torrent files, only if Repository is enabled # BTSEEDER_PRIORITY nice priority to seed torrent files; recommended values: @@ -9,7 +8,6 @@ # -8 for Repo with Torrent RUN_OGADMSERVER="yes" RUN_OGADMREPO="yes" -RUN_OGADMAGENT="yes" RUN_BTTRACKER="yes" RUN_BTSEEDER="yes" BTSEEDER_PRIORITY=0 diff --git a/admin/Sources/Services/opengnsys.init b/admin/Sources/Services/opengnsys.init index ae27593b..ef5a5b8c 100755 --- a/admin/Sources/Services/opengnsys.init +++ b/admin/Sources/Services/opengnsys.init @@ -42,15 +42,6 @@ SERVERAUXPORT=2011 ############# IRINA # -# Servidor de tareas programadas -# -AGENTNAME=ogAdmAgent -AGENTDAEMON=$BASEDIR/sbin/$AGENTNAME -AGENTCFG=$BASEDIR/etc/$AGENTNAME.cfg -AGENTLOG=$BASEDIR/log/$AGENTNAME.log -AGENTDAEMON_OPTIONS="-f $AGENTCFG -l $AGENTLOG" - -# # Opciones Bittorrent # @@ -155,14 +146,6 @@ arranca_demonios() { faucet $REPOAUXPORT --daemon --in bash -c "$REPOAUXDAEMON" [ $? = 0 ] && $SUCCESSMSG || $FAILMSG fi - if [ $RUN_OGADMSERVER = "yes" ] && [ $RUN_OGADMAGENT = "yes" ]; then - sleep 5 # Damos tiempo a que ogAdmServer este funcionando - fi - if [ $RUN_OGADMAGENT = "yes" ]; then - $ACTIONMSG "Iniciando demonio: $AGENTNAME" - $DAEMONSTART $AGENTDAEMON $EXTRAOPTS $AGENTDAEMON_OPTIONS $ENDOPTS - [ $? = 0 ] && $SUCCESSMSG || $FAILMSG - fi if [ $RUN_BTTRACKER = "yes" ]; then $ACTIONMSG "Iniciando demonio: $BTTRACK" $TRACKERSTART $BTTRACK $EXTRAOPTS $BTTRACK_OPTIONS $ENDOPTS @@ -189,9 +172,6 @@ para_demonios() { [ $? = 0 ] && $SUCCESSMSG || $FAILMSG rm -f $BTTRACKPID fi - $ACTIONMSG "Parando demonio: $AGENTNAME" - $DAEMONSTOP $AGENTNAME - [ $? = 0 ] && $SUCCESSMSG || $FAILMSG $ACTIONMSG "Parando demonio: $REPOAUXNAME" pkill faucet [ $? -le 1 ] && $SUCCESSMSG || $FAILMSG |