From 1a3c0cd31c3fc5771d4f0f8ab777e697b72d0c2a Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Wed, 17 Mar 2021 21:43:10 -0400 Subject: [PATCH 01/10] docker daemon --- scripts/conf/docker-daemon.json | 3 +++ scripts/subinstallers/docker.sh | 6 ++++++ 2 files changed, 9 insertions(+) create mode 100644 scripts/conf/docker-daemon.json diff --git a/scripts/conf/docker-daemon.json b/scripts/conf/docker-daemon.json new file mode 100644 index 0000000..ef746cb --- /dev/null +++ b/scripts/conf/docker-daemon.json @@ -0,0 +1,3 @@ +{ + "shutdown-timeout": 60 +} diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh index a4206ab..e03cffc 100755 --- a/scripts/subinstallers/docker.sh +++ b/scripts/subinstallers/docker.sh @@ -18,3 +18,9 @@ fi if [ ! -f /usr/local/bin/docker-compose ]; then sudo -E ln -s $(which docker-compose) /usr/local/bin/docker-compose fi + +# daemon.json +if [ ! -f /etc/docker/daemon.json ]; then + sudo -E cp ./script/conf/docker-daemon.json /etc/docker/daemon.json + sudo -E systemctl restart docker +fi From cd0eddcbc33722c207a34aa537139dbab00fec12 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Wed, 17 Mar 2021 21:47:23 -0400 Subject: [PATCH 02/10] update --- scripts/subinstallers/docker.sh | 5 +---- scripts/subinstallers/docker_daemon.sh | 7 +++++++ scripts/update.sh | 10 ++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100755 scripts/subinstallers/docker_daemon.sh diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh index e03cffc..01990a2 100755 --- a/scripts/subinstallers/docker.sh +++ b/scripts/subinstallers/docker.sh @@ -20,7 +20,4 @@ if [ ! -f /usr/local/bin/docker-compose ]; then fi # daemon.json -if [ ! -f /etc/docker/daemon.json ]; then - sudo -E cp ./script/conf/docker-daemon.json /etc/docker/daemon.json - sudo -E systemctl restart docker -fi +source ./scripts/subinstallers/docker_daemon.sh diff --git a/scripts/subinstallers/docker_daemon.sh b/scripts/subinstallers/docker_daemon.sh new file mode 100755 index 0000000..3fc03bb --- /dev/null +++ b/scripts/subinstallers/docker_daemon.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# daemon.json +if [ ! -f /etc/docker/daemon.json ]; then + sudo -E cp ./script/conf/docker-daemon.json /etc/docker/daemon.json + sudo -E systemctl restart docker +fi diff --git a/scripts/update.sh b/scripts/update.sh index 8026316..8605aa6 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -18,6 +18,16 @@ sudo mistborn-cli pullbuild sudo docker container prune -f sudo docker image prune -f +# docker daemon +source ./scripts/subinstallers/docker_daemon.sh + +# RESTART + sudo systemctl stop Mistborn-base + +# docker +sudo systemctl stop docker +sudo systemctl restart docker + sudo systemctl restart Mistborn-setup sudo systemctl restart Mistborn-base From e0ebad730a23aeb705f32c85410f07ff1171c111 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Wed, 17 Mar 2021 21:49:33 -0400 Subject: [PATCH 03/10] rearranging --- scripts/update.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/update.sh b/scripts/update.sh index 8605aa6..f8c35f9 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -18,16 +18,13 @@ sudo mistborn-cli pullbuild sudo docker container prune -f sudo docker image prune -f -# docker daemon -source ./scripts/subinstallers/docker_daemon.sh # RESTART sudo systemctl stop Mistborn-base -# docker -sudo systemctl stop docker -sudo systemctl restart docker +# docker daemon +source ./scripts/subinstallers/docker_daemon.sh sudo systemctl restart Mistborn-setup sudo systemctl restart Mistborn-base From 54402d30759f9e0f02a8339ac3fd9c6de14f429a Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Wed, 17 Mar 2021 21:57:04 -0400 Subject: [PATCH 04/10] typo --- scripts/subinstallers/docker_daemon.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/subinstallers/docker_daemon.sh b/scripts/subinstallers/docker_daemon.sh index 3fc03bb..92f6edc 100755 --- a/scripts/subinstallers/docker_daemon.sh +++ b/scripts/subinstallers/docker_daemon.sh @@ -2,6 +2,6 @@ # daemon.json if [ ! -f /etc/docker/daemon.json ]; then - sudo -E cp ./script/conf/docker-daemon.json /etc/docker/daemon.json + sudo -E cp ./scripts/conf/docker-daemon.json /etc/docker/daemon.json sudo -E systemctl restart docker fi From f91a8f41d66c334df8e35bed873078e0f92fc548 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Wed, 17 Mar 2021 22:49:26 -0400 Subject: [PATCH 05/10] timeout --- scripts/services/Mistborn-bitwarden.service | 2 +- scripts/services/Mistborn-guacamole.service | 2 +- scripts/services/Mistborn-homeassistant.service | 2 +- scripts/services/Mistborn-jellyfin.service | 2 +- scripts/services/Mistborn-jitsi.service | 2 +- scripts/services/Mistborn-nextcloud.service | 2 +- scripts/services/Mistborn-onlyoffice.service | 2 +- scripts/services/Mistborn-rocketchat.service | 2 +- scripts/services/Mistborn-syncthing.service | 2 +- scripts/services/Mistborn-tor.service | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/services/Mistborn-bitwarden.service b/scripts/services/Mistborn-bitwarden.service index 4fed369..00ad114 100644 --- a/scripts/services/Mistborn-bitwarden.service +++ b/scripts/services/Mistborn-bitwarden.service @@ -16,7 +16,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 3012 -j M # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml stop -t 60 # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP diff --git a/scripts/services/Mistborn-guacamole.service b/scripts/services/Mistborn-guacamole.service index a688edd..b2fe6e7 100644 --- a/scripts/services/Mistborn-guacamole.service +++ b/scripts/services/Mistborn-guacamole.service @@ -15,7 +15,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker- # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml stop -t 60 # Post stop [Install] diff --git a/scripts/services/Mistborn-homeassistant.service b/scripts/services/Mistborn-homeassistant.service index a36b7c0..e3c6463 100644 --- a/scripts/services/Mistborn-homeassistant.service +++ b/scripts/services/Mistborn-homeassistant.service @@ -15,7 +15,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant doc # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml stop -t 60 # Post stop [Install] diff --git a/scripts/services/Mistborn-jellyfin.service b/scripts/services/Mistborn-jellyfin.service index 7c27676..1787271 100644 --- a/scripts/services/Mistborn-jellyfin.service +++ b/scripts/services/Mistborn-jellyfin.service @@ -15,7 +15,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-c # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml stop -t 60 # Post stop [Install] diff --git a/scripts/services/Mistborn-jitsi.service b/scripts/services/Mistborn-jitsi.service index c6bcd5c..2698f3d 100644 --- a/scripts/services/Mistborn-jitsi.service +++ b/scripts/services/Mistborn-jitsi.service @@ -18,7 +18,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistbo ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml stop -t 60 # Post stop ExecStopPost=-/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_down.sh diff --git a/scripts/services/Mistborn-nextcloud.service b/scripts/services/Mistborn-nextcloud.service index f46c2b7..46b13f9 100644 --- a/scripts/services/Mistborn-nextcloud.service +++ b/scripts/services/Mistborn-nextcloud.service @@ -15,7 +15,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker- # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml stop -t 60 # Post stop [Install] diff --git a/scripts/services/Mistborn-onlyoffice.service b/scripts/services/Mistborn-onlyoffice.service index 72b31d8..52eb61b 100644 --- a/scripts/services/Mistborn-onlyoffice.service +++ b/scripts/services/Mistborn-onlyoffice.service @@ -15,7 +15,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml stop -t 60 # Post stop [Install] diff --git a/scripts/services/Mistborn-rocketchat.service b/scripts/services/Mistborn-rocketchat.service index 37bb83f..f38518a 100644 --- a/scripts/services/Mistborn-rocketchat.service +++ b/scripts/services/Mistborn-rocketchat.service @@ -16,7 +16,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 3001 -j M # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml stop -t 60 # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP diff --git a/scripts/services/Mistborn-syncthing.service b/scripts/services/Mistborn-syncthing.service index 273be71..ed4a766 100644 --- a/scripts/services/Mistborn-syncthing.service +++ b/scripts/services/Mistborn-syncthing.service @@ -17,7 +17,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 22000 -j # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml stop -t 60 # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p udp --dport 21027 -j MISTBORN_LOG_DROP ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP diff --git a/scripts/services/Mistborn-tor.service b/scripts/services/Mistborn-tor.service index ed47323..bfb6c72 100644 --- a/scripts/services/Mistborn-tor.service +++ b/scripts/services/Mistborn-tor.service @@ -16,7 +16,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 9150 -j M # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml down +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml stop -t 60 # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP From 1e9026b77d3c4417e1e5943ccd5d717c9348ec00 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sat, 20 Mar 2021 20:42:17 -0400 Subject: [PATCH 06/10] wait for port up --- scripts/subinstallers/docker.sh | 2 +- scripts/update.sh | 2 +- scripts/wrappers/mistborn_docker.sh | 12 +++++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh index 01990a2..cdc83fa 100755 --- a/scripts/subinstallers/docker.sh +++ b/scripts/subinstallers/docker.sh @@ -20,4 +20,4 @@ if [ ! -f /usr/local/bin/docker-compose ]; then fi # daemon.json -source ./scripts/subinstallers/docker_daemon.sh +#source ./scripts/subinstallers/docker_daemon.sh diff --git a/scripts/update.sh b/scripts/update.sh index f8c35f9..dbf0845 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -24,7 +24,7 @@ sudo docker image prune -f sudo systemctl stop Mistborn-base # docker daemon -source ./scripts/subinstallers/docker_daemon.sh +#source ./scripts/subinstallers/docker_daemon.sh sudo systemctl restart Mistborn-setup sudo systemctl restart Mistborn-base diff --git a/scripts/wrappers/mistborn_docker.sh b/scripts/wrappers/mistborn_docker.sh index 781eaa6..ffe35ab 100755 --- a/scripts/wrappers/mistborn_docker.sh +++ b/scripts/wrappers/mistborn_docker.sh @@ -32,4 +32,14 @@ else echo "No init script. Proceeding." fi -exec "$@" \ No newline at end of file +# ensure base is up and listening +echo "Waiting for Mistborn-base to finish starting up..." + +while [[ ! nc -z 10.2.3.1 5000 ]]; do + echo "Waiting 5 seconds for Mistborn-base..." + sleep 5 +done + +echo "Mistborn-base is running" + +exec "$@" From 01805e7aa2500f90cd01eb61ce3fa7a471059e78 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sat, 20 Mar 2021 20:55:39 -0400 Subject: [PATCH 07/10] typo --- scripts/wrappers/mistborn_docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/wrappers/mistborn_docker.sh b/scripts/wrappers/mistborn_docker.sh index ffe35ab..b182b91 100755 --- a/scripts/wrappers/mistborn_docker.sh +++ b/scripts/wrappers/mistborn_docker.sh @@ -35,7 +35,7 @@ fi # ensure base is up and listening echo "Waiting for Mistborn-base to finish starting up..." -while [[ ! nc -z 10.2.3.1 5000 ]]; do +while ! nc -z 10.2.3.1 5000; do echo "Waiting 5 seconds for Mistborn-base..." sleep 5 done From 1f1838466620647a226ed1942620541b27e4b5ac Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sat, 20 Mar 2021 21:17:15 -0400 Subject: [PATCH 08/10] random wait --- scripts/wrappers/mistborn_docker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/wrappers/mistborn_docker.sh b/scripts/wrappers/mistborn_docker.sh index b182b91..bb33894 100755 --- a/scripts/wrappers/mistborn_docker.sh +++ b/scripts/wrappers/mistborn_docker.sh @@ -36,8 +36,9 @@ fi echo "Waiting for Mistborn-base to finish starting up..." while ! nc -z 10.2.3.1 5000; do - echo "Waiting 5 seconds for Mistborn-base..." - sleep 5 + WAIT_TIME=$((5 + $RANDOM % 15)) + echo "Waiting ${WAIT_TIME} seconds for Mistborn-base..." + sleep ${WAIT_TIME} done echo "Mistborn-base is running" From a9cbe0632eaf4a89a315cf4d93a48dc500ef590c Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sat, 20 Mar 2021 22:28:58 -0400 Subject: [PATCH 09/10] restartsec --- scripts/services/Mistborn-bitwarden.service | 1 + scripts/services/Mistborn-guacamole.service | 1 + scripts/services/Mistborn-homeassistant.service | 1 + scripts/services/Mistborn-jellyfin.service | 1 + scripts/services/Mistborn-jitsi.service | 1 + scripts/services/Mistborn-nextcloud.service | 1 + scripts/services/Mistborn-onlyoffice.service | 1 + scripts/services/Mistborn-rocketchat.service | 1 + scripts/services/Mistborn-syncthing.service | 1 + scripts/services/Mistborn-tor.service | 1 + 10 files changed, 10 insertions(+) diff --git a/scripts/services/Mistborn-bitwarden.service b/scripts/services/Mistborn-bitwarden.service index 00ad114..431078c 100644 --- a/scripts/services/Mistborn-bitwarden.service +++ b/scripts/services/Mistborn-bitwarden.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-guacamole.service b/scripts/services/Mistborn-guacamole.service index b2fe6e7..808d013 100644 --- a/scripts/services/Mistborn-guacamole.service +++ b/scripts/services/Mistborn-guacamole.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-homeassistant.service b/scripts/services/Mistborn-homeassistant.service index e3c6463..5b5f864 100644 --- a/scripts/services/Mistborn-homeassistant.service +++ b/scripts/services/Mistborn-homeassistant.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-jellyfin.service b/scripts/services/Mistborn-jellyfin.service index 1787271..842605e 100644 --- a/scripts/services/Mistborn-jellyfin.service +++ b/scripts/services/Mistborn-jellyfin.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-jitsi.service b/scripts/services/Mistborn-jitsi.service index 2698f3d..1b12a62 100644 --- a/scripts/services/Mistborn-jitsi.service +++ b/scripts/services/Mistborn-jitsi.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-nextcloud.service b/scripts/services/Mistborn-nextcloud.service index 46b13f9..f512b05 100644 --- a/scripts/services/Mistborn-nextcloud.service +++ b/scripts/services/Mistborn-nextcloud.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-onlyoffice.service b/scripts/services/Mistborn-onlyoffice.service index 52eb61b..aa91ddc 100644 --- a/scripts/services/Mistborn-onlyoffice.service +++ b/scripts/services/Mistborn-onlyoffice.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-rocketchat.service b/scripts/services/Mistborn-rocketchat.service index f38518a..c8144f8 100644 --- a/scripts/services/Mistborn-rocketchat.service +++ b/scripts/services/Mistborn-rocketchat.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-syncthing.service b/scripts/services/Mistborn-syncthing.service index ed4a766..9c0acf5 100644 --- a/scripts/services/Mistborn-syncthing.service +++ b/scripts/services/Mistborn-syncthing.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true diff --git a/scripts/services/Mistborn-tor.service b/scripts/services/Mistborn-tor.service index bfb6c72..7d98765 100644 --- a/scripts/services/Mistborn-tor.service +++ b/scripts/services/Mistborn-tor.service @@ -6,6 +6,7 @@ PartOf=Mistborn-base.service [Service] Restart=always +RestartSec=15 User=root Group=docker PermissionsStartOnly=true From fa3845d097c969a0ca9b556e5c290f9807346882 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Sat, 20 Mar 2021 22:48:10 -0400 Subject: [PATCH 10/10] down --- scripts/services/Mistborn-bitwarden.service | 2 +- scripts/services/Mistborn-guacamole.service | 2 +- scripts/services/Mistborn-homeassistant.service | 2 +- scripts/services/Mistborn-jellyfin.service | 2 +- scripts/services/Mistborn-jitsi.service | 2 +- scripts/services/Mistborn-nextcloud.service | 2 +- scripts/services/Mistborn-onlyoffice.service | 2 +- scripts/services/Mistborn-rocketchat.service | 2 +- scripts/services/Mistborn-syncthing.service | 2 +- scripts/services/Mistborn-tor.service | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/services/Mistborn-bitwarden.service b/scripts/services/Mistborn-bitwarden.service index 431078c..8b0c8de 100644 --- a/scripts/services/Mistborn-bitwarden.service +++ b/scripts/services/Mistborn-bitwarden.service @@ -17,7 +17,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 3012 -j M # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-compose -f /opt/mistborn/extra/bitwarden.yml down # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP diff --git a/scripts/services/Mistborn-guacamole.service b/scripts/services/Mistborn-guacamole.service index 808d013..1c193e8 100644 --- a/scripts/services/Mistborn-guacamole.service +++ b/scripts/services/Mistborn-guacamole.service @@ -16,7 +16,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker- # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-compose -f /opt/mistborn/extra/guacamole.yml down # Post stop [Install] diff --git a/scripts/services/Mistborn-homeassistant.service b/scripts/services/Mistborn-homeassistant.service index 5b5f864..6ca8cc1 100644 --- a/scripts/services/Mistborn-homeassistant.service +++ b/scripts/services/Mistborn-homeassistant.service @@ -16,7 +16,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant doc # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-compose -f /opt/mistborn/extra/homeassistant.yml down # Post stop [Install] diff --git a/scripts/services/Mistborn-jellyfin.service b/scripts/services/Mistborn-jellyfin.service index 842605e..270769c 100644 --- a/scripts/services/Mistborn-jellyfin.service +++ b/scripts/services/Mistborn-jellyfin.service @@ -16,7 +16,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-c # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compose -f /opt/mistborn/extra/jellyfin.yml down # Post stop [Install] diff --git a/scripts/services/Mistborn-jitsi.service b/scripts/services/Mistborn-jitsi.service index 1b12a62..d99aa81 100644 --- a/scripts/services/Mistborn-jitsi.service +++ b/scripts/services/Mistborn-jitsi.service @@ -19,7 +19,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistbo ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose -f /opt/mistborn/extra/jitsi-meet.yml down # Post stop ExecStopPost=-/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_down.sh diff --git a/scripts/services/Mistborn-nextcloud.service b/scripts/services/Mistborn-nextcloud.service index f512b05..01f0132 100644 --- a/scripts/services/Mistborn-nextcloud.service +++ b/scripts/services/Mistborn-nextcloud.service @@ -16,7 +16,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker- # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-compose -f /opt/mistborn/extra/nextcloud.yml down # Post stop [Install] diff --git a/scripts/services/Mistborn-onlyoffice.service b/scripts/services/Mistborn-onlyoffice.service index aa91ddc..16f0010 100644 --- a/scripts/services/Mistborn-onlyoffice.service +++ b/scripts/services/Mistborn-onlyoffice.service @@ -16,7 +16,7 @@ ExecStartPre=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-compose -f /opt/mistborn/extra/onlyoffice.yml down # Post stop [Install] diff --git a/scripts/services/Mistborn-rocketchat.service b/scripts/services/Mistborn-rocketchat.service index c8144f8..8106fc9 100644 --- a/scripts/services/Mistborn-rocketchat.service +++ b/scripts/services/Mistborn-rocketchat.service @@ -17,7 +17,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 3001 -j M # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-compose -f /opt/mistborn/extra/rocketchat.yml down # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP diff --git a/scripts/services/Mistborn-syncthing.service b/scripts/services/Mistborn-syncthing.service index 9c0acf5..0399dec 100644 --- a/scripts/services/Mistborn-syncthing.service +++ b/scripts/services/Mistborn-syncthing.service @@ -18,7 +18,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 22000 -j # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh syncthing docker-compose -f /opt/mistborn/extra/syncthing.yml down # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p udp --dport 21027 -j MISTBORN_LOG_DROP ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP diff --git a/scripts/services/Mistborn-tor.service b/scripts/services/Mistborn-tor.service index 7d98765..43b8c42 100644 --- a/scripts/services/Mistborn-tor.service +++ b/scripts/services/Mistborn-tor.service @@ -17,7 +17,7 @@ ExecStartPre=/sbin/iptables -w -I DOCKER-USER -i DIFACE -p tcp --dport 9150 -j M # Start container when unit is started ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml up --build # Stop container when unit is stopped -ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml stop -t 60 +ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f /opt/mistborn/extra/tor.yml down # Post stop ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP