bero/test
1
0
Fork 0
Code Issues 52 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Fixed network creation and Ubuntu resolve check

Browse Source
This commit is contained in:
root 2022-11-07 14:23:31 +00:00
parent a6f1a86376
commit e720a80e02
8 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
fstack/lib/checks.sh
View File

@ -64,44 +64,34 @@ check_ports() {
# If port 53 (dns) in use by system-resolvd (Ubuntu) then auto fix # If port 53 (dns) in use by system-resolvd (Ubuntu) then auto fix
if [ "$SS" == 53 ]; then if [ "$SS" == 53 ]; then
if [ $OSRELEASE == "Ubuntu" ]; then if [ $OSRELEASE == "Ubuntu" ]; then
grep "127\.0" /etc/resolv.conf &> /dev/null if [ `pgrep -x systemd-resolve` ]; then
if [ $? -eq 0 ]; then echo -ne "\n* Port 53 in use by systemd-resolved, fixing.."
echo -ne "\n* Port 53 in use by systemd-resolved, fixing.." spin &
spin & SPINPID=$!
SPINPID=$!
# Install resolvconf to fix # Install resolvconf to fix
sudo apt install resolvconf -y &> /dev/null sudo apt install resolvconf -y &> /dev/null
[ $? -eq 0 ] && echo -ne "." || failcheck "Failed running sudo apt install resolvconf" [ $? -eq 0 ] && echo -ne "." || failcheck "Failed running sudo apt install resolvconf"
# Shut down systemd-resolved # Shut down systemd-resolved
systemctl stop systemd-resolved systemctl stop systemd-resolved &> /dev/null
[ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved" [ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved"
systemctl disable systemd-resolved systemctl disable systemd-resolved &> /dev/null
[ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved" [ $? -ne 0 ] && failcheck "Failed running systemctl stop systemd-resolved"
# Put nameserver entries so will exist on reboot # Put nameserver entries so will exist on reboot
echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/tail
echo "nameserver 8.8.8.8" > /run/resolvconf/resolv.conf echo "nameserver 8.8.8.8" > /run/resolvconf/resolv.conf
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done." echo -ne "done."
else else
echo -ne "\nFAILED - Port 53 (dns) is already in use\n\n" && exit 2 echo -ne "\nFAILED - Port 53 (dns) is already in use\n\n" && exit 2
fi fi
fi fi
elif [ "$SS" == "$i" ]; then elif [ "$SS" == "$i" ]; then
failcheck "FAILED - Port $i is already in use" failcheck "FAILED - Port $i is already in use"
fi fi
done done
fi fi
# Check Port 53 (dns) with nc
# elif command -v nc &> /dev/null; then
# nc -z $EXTERNALIP 53 &> /dev/null
# [ $? -eq 0 ] && failcheck "Port 53 (dns) is already in use."
#
# nc -z 127.0.0.1 53 &> /dev/null
# [ $? -eq 0 ] && failcheck "Port 53 (dns) is already in use."
# fi
} }

2
fstack/lib/collabora.sh
View File

@ -20,7 +20,7 @@ config_collabora() {
DOMAIN_LAST=${DOMAIN_ARRAY[1]} DOMAIN_LAST=${DOMAIN_ARRAY[1]}
cat > fstack/collabora/docker-compose.yml <<EOF cat > fstack/collabora/docker-compose.yml <<EOF
version: '3.8' version: '3.7'
services: services:
collabora: collabora:

2
fstack/lib/dns.sh
View File

@ -16,7 +16,7 @@ config_dns() {
mkdir -p fstack/dns/data/var/log/letsencrypt mkdir -p fstack/dns/data/var/log/letsencrypt
cat > fstack/dns/docker-compose.yml <<'EOF' cat > fstack/dns/docker-compose.yml <<'EOF'
version: '3.8' version: '3.7'
services: services:
dns: dns:

3
fstack/lib/ldap.sh
View File

@ -24,7 +24,8 @@ config_ldap() {
LDAPADMINPASS=`echo -n $ADMINPASS | openssl dgst -sha1 -binary | openssl enc -base64 | awk '{print "{SHA}"$0}'` LDAPADMINPASS=`echo -n $ADMINPASS | openssl dgst -sha1 -binary | openssl enc -base64 | awk '{print "{SHA}"$0}'`
cat > fstack/ldap/docker-compose.yml <<EOF cat > fstack/ldap/docker-compose.yml <<EOF
version: '3.8' version: '3.7'
services: services:
ldap: ldap:
image: osixia/openldap:latest image: osixia/openldap:latest

2
fstack/lib/mail.sh
View File

@ -23,7 +23,7 @@ config_mail() {
DOMAIN_LAST=${DOMAIN_ARRAY[1]} DOMAIN_LAST=${DOMAIN_ARRAY[1]}
cat > fstack/mail/docker-compose.yml <<EOF cat > fstack/mail/docker-compose.yml <<EOF
version: '3.8' version: '3.7'
services: services:
mail: mail:

2
fstack/lib/nextcloud.sh
View File

@ -21,7 +21,7 @@ config_nextcloud() {
DOMAIN_LAST=${DOMAIN_ARRAY[1]} DOMAIN_LAST=${DOMAIN_ARRAY[1]}
cat > fstack/nextcloud/docker-compose.yml <<EOF cat > fstack/nextcloud/docker-compose.yml <<EOF
version: '3.8' version: '3.7'
services: services:
nextcloud_db: nextcloud_db:

3
fstack/lib/panel.sh
View File

@ -44,7 +44,8 @@ COPY new_user.php /opt/ldap_user_manager/account_manager/
EOF EOF
cat > fstack/panel/docker-compose.yml <<EOF cat > fstack/panel/docker-compose.yml <<EOF
version: '3.8' version: '3.7'
services: services:
panel: panel:
image: wheelybird/ldap-user-manager:latest image: wheelybird/ldap-user-manager:latest

3
fstack/lib/proxy.sh
View File

@ -20,7 +20,8 @@ config_proxy() {
DOMAIN_LAST=${DOMAIN_ARRAY[1]} DOMAIN_LAST=${DOMAIN_ARRAY[1]}
cat > fstack/proxy/docker-compose.yml <<EOF cat > fstack/proxy/docker-compose.yml <<EOF
version: '3.8' version: '3.7'
services: services:
proxy: proxy:
image: jwilder/nginx-proxy image: jwilder/nginx-proxy