Resolve "Dependent Service Restart Handling"

2021-04-27 02:31:55 +00:00
parent 6fe1abc57f
commit b9b0eebf1e
15 changed files with 16 additions and 16 deletions
@@ -22,4 +22,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-comp
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -19,4 +19,4 @@ ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh elasticsearch docker
 ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh elasticsearch docker-compose -f /opt/mistborn/extra/elasticsearch.yml down

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-comp
 # Post stop

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-
 # Post stop

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compo
 # Post stop

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -24,4 +24,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose
 ExecStopPost=-/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_down.sh

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-comp
 # Post stop

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-com
 # Post stop

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -22,4 +22,4 @@ ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 8095 -j MIS
 # Post stop

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -22,4 +22,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-com
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -24,4 +24,4 @@ ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p udp --dport 21027 -j MI
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -22,4 +22,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP

 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -23,4 +23,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh wazuh docker-compose


 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
@@ -23,14 +23,14 @@ import secrets
 import random
 import string

-random_pass = ([secrets.choice("@$!%*?-_"),
+random_pass = ([secrets.choice("@$!*?-_"),
                           secrets.choice(string.digits),
                           secrets.choice(string.ascii_lowercase),
                           secrets.choice(string.ascii_uppercase),
                           ]
                          + [secrets.choice(string.ascii_lowercase
                                           + string.ascii_uppercase
-                                           + "@$!%*?-_"
+                                           + "@$!*?-_"
                                           + string.digits) for i in range(12)])

 random.shuffle(random_pass)
@@ -6,7 +6,7 @@ figlet "Mistborn: Configuring Firewall"

 echo "stop iptables wrappers"
 if [ "$DISTRO" == "ubuntu" ]; then
-    # Disable UFW
+    echo "Disabling UFW"
    sudo systemctl stop ufw || true
    sudo systemctl disable ufw || true
 fi