diff options
| author | Javier Sánchez Parra <jsanchez@soleta.eu> | 2020-06-08 11:22:29 +0200 |
|---|---|---|
| committer | OpenGnSys Support Team <soporte-og@soleta.eu> | 2020-06-08 11:50:01 +0200 |
| commit | 80f62f2f849f68f7475e2865164bd824f2960e79 (patch) | |
| tree | 3c762592dd7e40b44db8b16f459353928f6c620e | |
| parent | affce1633174aeb017439b0f263027f0f4094e1c (diff) | |
#971 Remove ogAdmClient code from update script
ogAdmClient is deprecated, new versions of OpenGnsys use ogClient as
clients software.
| -rwxr-xr-x | installer/opengnsys_update.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 36b3b18c..b4159795 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -1003,12 +1003,6 @@ function updateServerFiles() done < $WORKDIR/opengnsys/admin/Sources/Services/opengnsys.default NEWFILES="$NEWFILES /etc/default/opengnsys" fi - if egrep -q "(UrlMsg=.*msgbrowser.php)|(UrlMenu=http://)" $INSTALL_TARGET/client/etc/ogAdmClient.cfg 2>/dev/null; then - echoAndLog "${FUNCNAME}(): updating new client config file" - backupFile $INSTALL_TARGET/client/etc/ogAdmClient.cfg - perl -pi -e 's!UrlMsg=.*msgbrowser\.php!UrlMsg=http://localhost/cgi-bin/httpd-log\.sh!g; s!UrlMenu=http://!UrlMenu=https://!g' $INSTALL_TARGET/client/etc/ogAdmClient.cfg - NEWFILES="$NEWFILES $INSTALL_TARGET/client/etc/ogAdmClient.cfg" - fi echoAndLog "${FUNCNAME}(): updating cron files" [ ! -f /etc/cron.d/torrentcreator ] && echo "* * * * * root [ -x $INSTALL_TARGET/bin/torrent-creator ] && $INSTALL_TARGET/bin/torrent-creator" > /etc/cron.d/torrentcreator @@ -1077,15 +1071,6 @@ function compileServices() [ -e $INSTALL_TARGET/sbin/ogAdmAgent ] && \ rm -f $INSTALL_TARGET/sbin/ogAdmAgent - # Compilar OpenGnsys Client - echoAndLog "${FUNCNAME}(): Recompiling OpenGnsys Client" - pushd $WORKDIR/opengnsys/admin/Sources/Clients/ogAdmClient - make && mv ogAdmClient $INSTALL_TARGET/client/bin - if [ $? -ne 0 ]; then - echoAndLog "${FUNCNAME}(): error while compiling OpenGnsys Client" - hayErrores=1 - fi - popd # Generar un API token de ogAdmServer si no existe en el fichero de configuración. grep -q "APITOKEN=" $INSTALL_TARGET/etc/ogAdmServer.cfg || \ $INSTALL_TARGET/bin/settoken -f |