diff --git a/bin/convertdomain b/bin/convertdomain
index 9d50fba..9ee4f2c 100755
--- a/bin/convertdomain
+++ b/bin/convertdomain
@@ -222,6 +222,10 @@ convert_mail() {
docker exec pdns pdnsutil add-record $DOMAIN_NEW _dmarc TXT 86400 "\"v=DMARC1; p=quarantine; rua=mailto:admin@$DOMAIN_NEW; ruf=mailto:admin@$DOMAIN_NEW; sp=none; ri=86400\"" &> /dev/null
[ $? -ne 0 ] && fail "Couldn't insert DMARC record into /federated/apps/pdns container"
+ # Stop and Start mail to reload DKIM
+ /federated/bin/stop mail &> /dev/null
+ /federated/bin/start mail &> /dev/null
+
echo -ne "done."
}
convert_collabora() {
diff --git a/bin/install-federated b/bin/install-federated
index c60afee..fe8efb8 100755
--- a/bin/install-federated
+++ b/bin/install-federated
@@ -4,6 +4,7 @@
PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
. /federated/lib/functions.sh
+. /federated/lib/network.sh
trap cleanup `seq 1 15`
get_config() {
@@ -18,32 +19,32 @@ get_config() {
# fi
# done
- . /federated/lib/network.sh
- . /federated/lib/pdnsmysql.sh
- . /federated/lib/pdns.sh
- . /federated/lib/pdnsadmin.sh
- . /federated/lib/traefik.sh
- . /federated/lib/postgresql.sh
- . /federated/lib/ldap.sh
- . /federated/lib/mail.sh
- . /federated/lib/collabora.sh
- . /federated/lib/nextcloud.sh
- . /federated/lib/matrix.sh
- . /federated/lib/element.sh
- . /federated/lib/jitsi.sh
- . /federated/lib/listmonk.sh
- . /federated/lib/vaultwarden.sh
- . /federated/lib/panel.sh
- . /federated/lib/wireguard.sh
- . /federated/lib/baserow.sh
- . /federated/lib/gitea.sh
- . /federated/lib/caddy.sh
- . /federated/lib/autodiscover.sh
- . /federated/lib/castopod.sh
- . /federated/lib/wordpress.sh
- . /federated/lib/coturn.sh
- . /federated/lib/bookstack.sh
- . /federated/lib/freescout.sh
+# . /federated/lib/pdnsmysql.sh
+# . /federated/lib/pdns.sh
+# . /federated/lib/pdnsadmin.sh
+# . /federated/lib/traefik.sh
+# . /federated/lib/postgresql.sh
+# . /federated/lib/ldap.sh
+# . /federated/lib/mail.sh
+# . /federated/lib/collabora.sh
+# . /federated/lib/nextcloud.sh
+# . /federated/lib/matrix.sh
+# . /federated/lib/element.sh
+# . /federated/lib/jitsi.sh
+# . /federated/lib/listmonk.sh
+# . /federated/lib/vaultwarden.sh
+# . /federated/lib/panel.sh
+# . /federated/lib/wireguard.sh
+# . /federated/lib/baserow.sh
+# . /federated/lib/gitea.sh
+# . /federated/lib/caddy.sh
+# . /federated/lib/autodiscover.sh
+# . /federated/lib/castopod.sh
+# . /federated/lib/wordpress.sh
+# . /federated/lib/coturn.sh
+# . /federated/lib/bookstack.sh
+# . /federated/lib/freescout.sh
+# . /federated/lib/msp.sh
COUNTRIES=("AF" "AL" "DZ" "AS" "AD" "AO" "AI" "AQ" "AG" "AR" "AM" "AW" "AU" "AT" "AZ" "BS" "BH" "BD" "BB" "BY" "BE" "BZ" "BJ" "BM" "BT" "BO" "BO" "BA" "BW" "BV" "BR" "IO" "BN" "BN" "BG" "BF" "BI" "KH" "CM" "CA" "CV" "KY" "CF" "TD" "CL" "CN" "CX" "CC" "CO" "KM" "CG" "CD" "CK" "CR" "CI" "CI" "HR" "CU" "CY" "CZ" "DK" "DJ" "DM" "DO" "EC" "EG" "SV" "GQ" "ER" "EE" "ET" "FK" "FO" "FJ" "FI" "FR" "GF" "PF" "TF" "GA" "GM" "GE" "DE" "GH" "GI" "GR" "GL" "GD" "GP" "GU" "GT" "GG" "GN" "GW" "GY" "HT" "HM" "VA" "HN" "HK" "HU" "IS" "IN" "ID" "IR" "IQ" "IE" "IM" "IL" "IT" "JM" "JP" "JE" "JO" "KZ" "KE" "KI" "KP" "KR" "KR" "KW" "KG" "LA" "LV" "LB" "LS" "LR" "LY" "LY" "LI" "LT" "LU" "MO" "MK" "MG" "MW" "MY" "MV" "ML" "MT" "MH" "MQ" "MR" "MU" "YT" "MX" "FM" "MD" "MC" "MN" "ME" "MS" "MA" "MZ" "MM" "MM" "NA" "NR" "NP" "NL" "AN" "NC" "NZ" "NI" "NE" "NG" "NU" "NF" "MP" "NO" "OM" "PK" "PW" "PS" "PA" "PG" "PY" "PE" "PH" "PN" "PL" "PT" "PR" "QA" "RE" "RO" "RU" "RU" "RW" "SH" "KN" "LC" "PM" "VC" "VC" "VC" "WS" "SM" "ST" "SA" "SN" "RS" "SC" "SL" "SG" "SK" "SI" "SB" "SO" "ZA" "GS" "SS" "ES" "LK" "SD" "SR" "SJ" "SZ" "SE" "CH" "SY" "TW" "TW" "TJ" "TZ" "TH" "TL" "TG" "TK" "TO" "TT" "TN" "TR" "TM" "TC" "TV" "UG" "UA" "AE" "GB" "US" "UM" "UY" "UZ" "VU" "VE" "VE" "VN" "VN" "VG" "VI" "WF" "EH" "YE" "ZM" "ZW")
@@ -98,6 +99,7 @@ config_network
# Configure and start each federated service
for i in "${SERVICES[@]}"; do
+ . /federated/lib/$i.sh
config_$i
start_$i
done
diff --git a/lib/functions.sh b/lib/functions.sh
index 607d619..1f1e447 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -1,7 +1,7 @@
# Federated Computer functions
# Define all services
-SERVICES=("pdnsmysql" "pdns" "pdnsadmin" "traefik" "postgresql" "ldap" "mail" "collabora" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "gitea" "caddy" "autodiscover" "castopod" "wordpress" "coturn" "bookstack" "freescout")
+SERVICES=("pdnsmysql" "pdns" "pdnsadmin" "traefik" "postgresql" "ldap" "mail" "collabora" "nextcloud" "matrix" "element" "listmonk" "vaultwarden" "panel" "wireguard" "jitsi" "baserow" "gitea" "caddy" "autodiscover" "castopod" "wordpress" "coturn" "bookstack" "freescout" "msp")
fail() {
echo -ne "FAILED\n\n$1\n\n"
@@ -412,6 +412,14 @@ Here is your applications reference chart with $DOMAIN:
| Click here |
FreeScout is the super lightweight and powerful free open source help desk |
+
+ | Music Side Project |
+ msp.$DOMAIN |
+ admin@$DOMAIN
admin password above |
+ User access is separate from panel |
+ Click here |
+ Music Side Project Studio enables you to harness the potential of RSS feeds and the Lightning Network, allowing you to self-host your music and receive direct payment from your fans |
+
Thanks for your support!
@@ -640,6 +648,14 @@ Password = "$LISTMONKPASS"
Click here |
FreeScout is the super lightweight and powerful free open source help desk |
+
+ | Music Side Project |
+ msp.$DOMAIN |
+ admin@$DOMAIN
admin password above |
+ User access is separate from panel |
+ Click here |
+ Music Side Project Studio enables you to harness the potential of RSS feeds and the Lightning Network, allowing you to self-host your music and receive direct payment from your fans |
+
diff --git a/lib/latest-versions b/lib/latest-versions
index ccbc4dd..5e8efe9 100644
--- a/lib/latest-versions
+++ b/lib/latest-versions
@@ -22,3 +22,5 @@ castopod=1.6.5
wordpress=6.2.2
coturn=4.6.2
bookstack=23.08.3
+freescout=latest_php8.0
+msp=latest
diff --git a/lib/msp.sh b/lib/msp.sh
new file mode 100644
index 0000000..2ecb71a
--- /dev/null
+++ b/lib/msp.sh
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+# MSP Service
+
+PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+
+config_msp() {
+ echo -ne "\n* Configuring /federated/apps/msp container.."
+ spin &
+ SPINPID=$!
+
+ if [ ! -d "/federated/apps/msp" ]; then
+ mkdir -p /federated/apps/msp/data
+ fi
+
+ADMINPASS=`cat /federated/apps/panel/.env | grep SMTP_PASSWORD | awk -F= '{ print $2 }'`
+TRAEFIK_HTTPAUTH_STRING_MSP=$(echo `htpasswd -nb admin@$DOMAIN $ADMINPASS` | sed -e s/\\$/\\$\\$/g)
+
+cat > /federated/apps/msp/docker-compose.yml < /federated/apps/msp/.env < /dev/null
+echo -ne "done."
+}
+start_msp() {
+ # Start service with command to make sure it's up before proceeding
+ start_service "msp" "nc -z 172.99.0.38 3000 &> /dev/null" "7"
+
+ docker exec pdns pdnsutil add-record $DOMAIN msp A 86400 $EXTERNALIP
+ [ $? -ne 0 ] && fail "Couldn't add dns record for msp"
+
+ kill -9 $SPINPID &> /dev/null
+ echo -ne "done."
+}
diff --git a/lib/pdns.sh.bak b/lib/pdns.sh.bak
deleted file mode 100644
index cec6298..0000000
--- a/lib/pdns.sh.bak
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/bash -x
-#
-# PowerDNS DNS Service
-
-PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-config_pdns() {
- echo -ne "\n* Configuring /federated/apps/pdns container.."
- spin &
- SPINPID=$!
-
- if [ ! -d "/federated/apps/pdns" ]; then
- mkdir -p /federated/apps/pdns/data/root
- fi
-
-cat > /federated/apps/pdns/docker-compose.yml < /federated/apps/pdns/.env < /federated/apps/pdns/data/root/createrecords.sh < /dev/null
-echo -ne "done."
-}
-start_pdns() {
- # Grab the container IP from docker-compose above
- SERVICE_IP=`grep ipv4_address /federated/apps/pdns/docker-compose.yml | awk '{ print $2 }'`
-
- # Start service with command to make sure it's up before proceeding
- start_service "pdns" "nc -z ${SERVICE_IP} 8081 &> /dev/null"
-
- # Run createrecords.sh inside baserow container
- docker exec -it pdns /root/createrecords.sh &> /dev/null
- [ $? -ne 0 ] && fail "Couldn't run createrecords.sh in /federated/apps/pdns container"
-
- kill -9 $SPINPID &> /dev/null
- echo -ne "done."
-}