From 1f1c5d30d1a3ce309eb9cd36402955eb8d3fdfce Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 10 Jun 2017 21:37:50 +0100 Subject: [PATCH] Try to keep systemd happy --- src/freedombone-app-cryptpad | 1 + src/freedombone-app-etherpad | 1 + src/freedombone-app-ghost | 1 + src/freedombone-app-gogs | 2 ++ src/freedombone-app-ipfs | 1 + src/freedombone-app-koel | 1 + src/freedombone-app-librevault | 1 + src/freedombone-app-mailpile | 1 + src/freedombone-app-matrix | 1 + src/freedombone-app-mediagoblin | 1 + src/freedombone-app-movim | 1 + src/freedombone-app-radicale | 1 + src/freedombone-app-scuttlebot | 1 + src/freedombone-app-searx | 2 ++ src/freedombone-app-syncthing | 3 ++- src/freedombone-app-turtl | 2 ++ src/freedombone-utils-turn | 2 ++ 17 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/freedombone-app-cryptpad b/src/freedombone-app-cryptpad index fbd95178..2e4a7fbd 100755 --- a/src/freedombone-app-cryptpad +++ b/src/freedombone-app-cryptpad @@ -157,6 +157,7 @@ function remove_cryptpad { if [ -f /etc/systemd/system/cryptpad.service ]; then rm /etc/systemd/system/cryptpad.service fi + systemctl daemon-reload function_check remove_nodejs remove_nodejs cryptpad diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad index 7fc97d46..58806da0 100755 --- a/src/freedombone-app-etherpad +++ b/src/freedombone-app-etherpad @@ -415,6 +415,7 @@ function remove_etherpad { systemctl disable etherpad rm /etc/systemd/system/etherpad.service fi + systemctl daemon-reload nginx_dissite $ETHERPAD_DOMAIN_NAME remove_certs $ETHERPAD_DOMAIN_NAME if [ -d /var/www/$ETHERPAD_DOMAIN_NAME ]; then diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost index 118dd4f0..8e76445a 100755 --- a/src/freedombone-app-ghost +++ b/src/freedombone-app-ghost @@ -286,6 +286,7 @@ function remove_ghost { systemctl stop ghost systemctl disable ghost rm /etc/systemd/system/ghost.service + systemctl daemon-reload function_check remove_nodejs remove_nodejs ghost diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs index 24ad210c..a640aad3 100755 --- a/src/freedombone-app-gogs +++ b/src/freedombone-app-gogs @@ -355,6 +355,7 @@ function remove_gogs { fi systemctl stop gogs systemctl disable gogs + nginx_dissite ${GIT_DOMAIN_NAME} remove_certs ${GIT_DOMAIN_NAME} if [ -d /var/www/${GIT_DOMAIN_NAME} ]; then @@ -366,6 +367,7 @@ function remove_gogs { function_check drop_database drop_database gogs rm /etc/systemd/system/gogs.service + systemctl daemon-reload rm -rf /home/${GOGS_USERNAME}/* remove_onion_service gogs ${GIT_ONION_PORT} 9418 remove_completion_param "install_gogs" diff --git a/src/freedombone-app-ipfs b/src/freedombone-app-ipfs index bfeebc3c..23ebf3cb 100755 --- a/src/freedombone-app-ipfs +++ b/src/freedombone-app-ipfs @@ -155,6 +155,7 @@ function remove_ipfs_go { systemctl disable ipfs systemctl daemon-reload rm /etc/systemd/system/ipfs.service + systemctl daemon-reload rm -rf $GOPATH/src/github.com/ipfs firewall_remove $IPFS_PORT tcp remove_completion_param install_ipfs diff --git a/src/freedombone-app-koel b/src/freedombone-app-koel index a43f6324..aa7794e1 100755 --- a/src/freedombone-app-koel +++ b/src/freedombone-app-koel @@ -426,6 +426,7 @@ function remove_koel { if [ -f /etc/systemd/system/koel.service ]; then rm /etc/systemd/system/koel.service fi + systemctl daemon-reload function_check remove_nodejs remove_nodejs koel diff --git a/src/freedombone-app-librevault b/src/freedombone-app-librevault index fbc41146..437b0aa5 100755 --- a/src/freedombone-app-librevault +++ b/src/freedombone-app-librevault @@ -108,6 +108,7 @@ function remove_librevault { systemctl stop librevault systemctl disable librevault rm /etc/systemd/system/librevault.service + systemctl daemon-reload remove_completion_param install_librevault remove_completion_param configure_firewall_for_librevault } diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile index 2e5c2001..9112f5f9 100755 --- a/src/freedombone-app-mailpile +++ b/src/freedombone-app-mailpile @@ -226,6 +226,7 @@ function remove_mailpile { systemctl stop mailpile systemctl disable mailpile rm /etc/systemd/system/mailpile.service + systemctl daemon-reload read_config_param "MAILPILE_DOMAIN_NAME" nginx_dissite $MAILPILE_DOMAIN_NAME diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix index 09989256..5d4561d1 100755 --- a/src/freedombone-app-matrix +++ b/src/freedombone-app-matrix @@ -478,6 +478,7 @@ function remove_matrix { if [ -f /etc/systemd/system/matrix.service ]; then rm /etc/systemd/system/matrix.service fi + systemctl daemon-reload apt-get -y remove --purge coturn cd /etc/matrix pip uninstall . diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin index 7f647307..d6c20416 100755 --- a/src/freedombone-app-mediagoblin +++ b/src/freedombone-app-mediagoblin @@ -235,6 +235,7 @@ function remove_mediagoblin { systemctl stop mediagoblin systemctl disable mediagoblin rm /etc/systemd/system/mediagoblin.service + systemctl daemon-reload function_check remove_onion_service remove_onion_service mediagoblin ${MEDIAGOBLIN_ONION_PORT} diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim index b29550b0..7874d7c9 100755 --- a/src/freedombone-app-movim +++ b/src/freedombone-app-movim @@ -270,6 +270,7 @@ function remove_movim { systemctl stop movim systemctl disable movim rm /etc/systemd/system/movim.service + systemctl daemon-reload read_config_param "MY_USERNAME" echo "Removing $MOVIM_DOMAIN_NAME" diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale index d7b7db7a..9544f3e8 100755 --- a/src/freedombone-app-radicale +++ b/src/freedombone-app-radicale @@ -274,6 +274,7 @@ function remove_radicale { if [ -f /etc/systemd/system/radicale.service ]; then rm /etc/systemd/system/radicale.service fi + systemctl daemon-reload if [ -f /etc/nginx/sites-available/radicale ]; then rm /etc/nginx/sites-available/radicale fi diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot index a1f2e997..0515c590 100755 --- a/src/freedombone-app-scuttlebot +++ b/src/freedombone-app-scuttlebot @@ -167,6 +167,7 @@ function remove_scuttlebot { systemctl stop scuttlebot systemctl disable scuttlebot rm /etc/systemd/system/scuttlebot.service + systemctl daemon-reload userdel -r scuttlebot diff --git a/src/freedombone-app-searx b/src/freedombone-app-searx index 97566869..b62dfd7f 100755 --- a/src/freedombone-app-searx +++ b/src/freedombone-app-searx @@ -789,6 +789,8 @@ function remove_searx { systemctl stop searx systemctl disable searx rm /etc/systemd/system/searx.service + systemctl daemon-reload + function_check remove_onion_service remove_onion_service searx ${SEARX_ONION_PORT} userdel -r searx diff --git a/src/freedombone-app-syncthing b/src/freedombone-app-syncthing index 7a2b1169..d63aee1e 100755 --- a/src/freedombone-app-syncthing +++ b/src/freedombone-app-syncthing @@ -458,8 +458,9 @@ function remove_syncthing { firewall_remove ${SYNCTHING_PORT} systemctl stop syncthing systemctl disable syncthing - apt-get -yq remove --purge syncthing rm /etc/systemd/system/syncthing.service + systemctl daemon-reload + apt-get -yq remove --purge syncthing sed -i "/${PROJECT_NAME}-syncthing/d" /etc/crontab remove_completion_param install_syncthing remove_completion_param configure_firewall_for_syncthing diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl index e84dcffc..8760f021 100755 --- a/src/freedombone-app-turtl +++ b/src/freedombone-app-turtl @@ -351,6 +351,8 @@ function remove_turtl { systemctl stop turtl systemctl disable turtl rm /etc/systemd/system/turtl.service + systemctl daemon-reload + remove_rethinkdb remove_app turtl remove_completion_param install_turtl diff --git a/src/freedombone-utils-turn b/src/freedombone-utils-turn index 8bb3150f..9e80ee75 100755 --- a/src/freedombone-utils-turn +++ b/src/freedombone-utils-turn @@ -53,6 +53,8 @@ function remove_turn { if [ -f /etc/systemd/system/turn.service ]; then rm /etc/systemd/system/turn.service fi + systemctl daemon-reload + apt-get -y remove coturn rm -rf /var/lib/turn sed -i "/# TURN Server/,/# End of TURN Server/d" /etc/nginx/sites-available/${DEFAULT_DOMAIN_NAME}