crappyrules/mistborn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into 135-scirius

Browse Source
This commit is contained in:
Steven Foerster
2021-04-27 20:03:34 -04:00
parent 59b216e9dd 1ca2a80da3
commit 6061d0598b
15 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/services/Mistborn-bitwarden.service
+1 -1
View File
@@ -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 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-elasticsearch.service
+1 -1
View File
@@ -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 ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh elasticsearch docker-compose -f /opt/mistborn/extra/elasticsearch.yml down
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-guacamole.service
+1 -1
View File
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-comp
# Post stop # Post stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-homeassistant.service
+1 -1
View File
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-
# Post stop # Post stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-jellyfin.service
+1 -1
View File
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compo
# Post stop # Post stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-jitsi.service
+1 -1
View File
@@ -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 ExecStopPost=-/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_down.sh
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-nextcloud.service
+1 -1
View File
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-comp
# Post stop # Post stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-onlyoffice.service
+1 -1
View File
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-com
# Post stop # Post stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-raspap.service
+1 -1
View File
@@ -22,4 +22,4 @@ ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 8095 -j MIS
# Post stop # Post stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-rocketchat.service
+1 -1
View File
@@ -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 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-syncthing.service
+1 -1
View File
@@ -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 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-tor.service
+1 -1
View File
@@ -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 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/services/Mistborn-wazuh.service
+1 -1
View File
@@ -23,4 +23,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh wazuh docker-compose
[Install] [Install]
WantedBy=multi-user.target WantedBy=Mistborn-base.service
scripts/subinstallers/extra/wazuh.sh
+2 -2
View File
@@ -23,14 +23,14 @@ import secrets
import random import random
import string import string
random_pass = ([secrets.choice("@$!%*?-_"), random_pass = ([secrets.choice("@$!*?-_"),
secrets.choice(string.digits), secrets.choice(string.digits),
secrets.choice(string.ascii_lowercase), secrets.choice(string.ascii_lowercase),
secrets.choice(string.ascii_uppercase), secrets.choice(string.ascii_uppercase),
] ]
+ [secrets.choice(string.ascii_lowercase + [secrets.choice(string.ascii_lowercase
+ string.ascii_uppercase + string.ascii_uppercase
+ "@$!%*?-_" + "@$!*?-_"
+ string.digits) for i in range(12)]) + string.digits) for i in range(12)])
random.shuffle(random_pass) random.shuffle(random_pass)
scripts/subinstallers/iptables.sh
+1 -1
View File
@@ -6,7 +6,7 @@ figlet "Mistborn: Configuring Firewall"
echo "stop iptables wrappers" echo "stop iptables wrappers"
if [ "$DISTRO" == "ubuntu" ]; then if [ "$DISTRO" == "ubuntu" ]; then
# Disable UFW echo "Disabling UFW"
sudo systemctl stop ufw || true sudo systemctl stop ufw || true
sudo systemctl disable ufw || true sudo systemctl disable ufw || true
fi fi