diff options
| author | Javier Sánchez Parra <jsanchez@soleta.eu> | 2020-06-16 10:57:41 +0200 |
|---|---|---|
| committer | OpenGnSys Support Team <soporte-og@soleta.eu> | 2020-06-19 15:06:45 +0200 |
| commit | f6e87d351413b9b2b3a09ffd54d71ebc4280222a (patch) | |
| tree | c411b0f639f0c572bc96b09dc5aa16286384d782 /installer | |
| parent | c070d3d734648dae98f719e1f27962b489b23e7a (diff) | |
#981 Use new ogServer systemd unit file
This commit adapts installer, updater and init scripts to work with new
ogServer systemd unit file.
Diffstat (limited to 'installer')
| -rwxr-xr-x | installer/opengnsys_installer.sh | 6 | ||||
| -rwxr-xr-x | installer/opengnsys_update.sh | 19 |
2 files changed, 25 insertions, 0 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index b95e6ad7..ec0d3c74 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1480,6 +1480,8 @@ function openGnsysConfigure() cp -a $WORKDIR/opengnsys/admin/Sources/Services/opengnsys.init /etc/init.d/opengnsys cp -a $WORKDIR/opengnsys/admin/Sources/Services/opengnsys.service \ /lib/systemd/system/opengnsys.service + cp -a $WORKDIR/ogServer-$BRANCH/cfg/ogserver.service \ + /lib/systemd/system/ogserver.service cp -a $WORKDIR/opengnsys/admin/Sources/Services/opengnsys.default /etc/default/opengnsys # Deshabilitar servicios de BitTorrent si no están instalados. if [ ! -e /usr/bin/bttrack ]; then @@ -1559,6 +1561,10 @@ EOT $STARTSERVICE fi + # Enable and start ogServer systemd service + service="ogserver" + $ENABLESERVICE; $STARTSERVICE + echoAndLog "${FUNCNAME}(): Creating ogClient config files." sed -i -e "s/127\.0\.0\.1/$OPENGNSYS_SERVERIP/g" \ $INSTALL_TARGET/client/ogClient/cfg/ogclient.json diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 29cdb910..ffe262d8 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -1092,6 +1092,25 @@ function ogServerCompilation() grep -q "APITOKEN=" $INSTALL_TARGET/etc/ogAdmServer.cfg || \ $INSTALL_TARGET/bin/settoken -f + if ! diff -q \ + "$WORKDIR"/ogServer-"$BRANCH"/cfg/ogserver.service \ + /lib/systemd/system/ogserver.service 2>/dev/null; then + service="opengnsys" + $STOPSERVICE + echoAndLog "${FUNCNAME}(): updating new service file" + backupFile /lib/systemd/system/ogserver.service + service="ogadmserver" + $STOPSERVICE + cp -a \ + "$WORKDIR"/ogServer-"$BRANCH"/cfg/ogserver.service \ + /lib/systemd/system/ogserver.service + systemctl daemon-reload + $STARTSERVICE + service="opengnsys" + $STARTSERVICE + NEWFILES="$NEWFILES /lib/systemd/system/ogserver.service" + fi + return $error } |