Browse Source

Resolve "Started Extra Services restart on OS reboot"

merge-requests/73/merge
Steven Foerster 5 years ago
parent
commit
d65e5434a0
  1. 3
      scripts/conf/docker-daemon.json
  2. 1
      scripts/services/Mistborn-bitwarden.service
  3. 1
      scripts/services/Mistborn-guacamole.service
  4. 1
      scripts/services/Mistborn-homeassistant.service
  5. 1
      scripts/services/Mistborn-jellyfin.service
  6. 1
      scripts/services/Mistborn-jitsi.service
  7. 1
      scripts/services/Mistborn-nextcloud.service
  8. 1
      scripts/services/Mistborn-onlyoffice.service
  9. 1
      scripts/services/Mistborn-rocketchat.service
  10. 1
      scripts/services/Mistborn-syncthing.service
  11. 1
      scripts/services/Mistborn-tor.service
  12. 3
      scripts/subinstallers/docker.sh
  13. 7
      scripts/subinstallers/docker_daemon.sh
  14. 7
      scripts/update.sh
  15. 13
      scripts/wrappers/mistborn_docker.sh

3
scripts/conf/docker-daemon.json

@ -0,0 +1,3 @@
{
"shutdown-timeout": 60
}

1
scripts/services/Mistborn-bitwarden.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-guacamole.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-homeassistant.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-jellyfin.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-jitsi.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-nextcloud.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-onlyoffice.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-rocketchat.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-syncthing.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

1
scripts/services/Mistborn-tor.service

@ -6,6 +6,7 @@ PartOf=Mistborn-base.service
[Service] [Service]
Restart=always Restart=always
RestartSec=15
User=root User=root
Group=docker Group=docker
PermissionsStartOnly=true PermissionsStartOnly=true

3
scripts/subinstallers/docker.sh

@ -18,3 +18,6 @@ fi
if [ ! -f /usr/local/bin/docker-compose ]; then if [ ! -f /usr/local/bin/docker-compose ]; then
sudo -E ln -s $(which docker-compose) /usr/local/bin/docker-compose sudo -E ln -s $(which docker-compose) /usr/local/bin/docker-compose
fi fi
# daemon.json
#source ./scripts/subinstallers/docker_daemon.sh

7
scripts/subinstallers/docker_daemon.sh

@ -0,0 +1,7 @@
#!/bin/bash
# daemon.json
if [ ! -f /etc/docker/daemon.json ]; then
sudo -E cp ./scripts/conf/docker-daemon.json /etc/docker/daemon.json
sudo -E systemctl restart docker
fi

7
scripts/update.sh

@ -18,6 +18,13 @@ sudo mistborn-cli pullbuild
sudo docker container prune -f sudo docker container prune -f
sudo docker image prune -f sudo docker image prune -f
# RESTART
sudo systemctl stop Mistborn-base sudo systemctl stop Mistborn-base
# docker daemon
#source ./scripts/subinstallers/docker_daemon.sh
sudo systemctl restart Mistborn-setup sudo systemctl restart Mistborn-setup
sudo systemctl restart Mistborn-base sudo systemctl restart Mistborn-base

13
scripts/wrappers/mistborn_docker.sh

@ -32,4 +32,15 @@ else
echo "No init script. Proceeding." echo "No init script. Proceeding."
fi fi
exec "$@" # ensure base is up and listening
echo "Waiting for Mistborn-base to finish starting up..."
while ! nc -z 10.2.3.1 5000; do
WAIT_TIME=$((5 + $RANDOM % 15))
echo "Waiting ${WAIT_TIME} seconds for Mistborn-base..."
sleep ${WAIT_TIME}
done
echo "Mistborn-base is running"
exec "$@"

Loading…
Cancel
Save