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

Merge branch 'dev/docker_compose'

Browse Source
This commit is contained in:
Bernhard "bero" Rosenkränzer (Boggins) 2024-11-06 15:55:45 +01:00
commit 083b1db7e4
31 changed files with 82 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/convertdomain
View File

@ -121,7 +121,7 @@ convert_traefik() {
rm -rf /federated/apps/traefik/data/letsencrypt/acme.json rm -rf /federated/apps/traefik/data/letsencrypt/acme.json
# Start Traefik # Start Traefik
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
# Keep trying to see that certificates are generated # Keep trying to see that certificates are generated
RETRY="20" RETRY="20"
@ -134,7 +134,7 @@ convert_traefik() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
failcheck "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik'" failcheck "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik'"
fi fi
((RETRY--)) ((RETRY--))

10
bin/stop
View File

@ -13,8 +13,8 @@ stopservice() {
spin & spin &
SPINPID=$! SPINPID=$!
cd /federated/apps/$1 && docker-compose -f docker-compose.yml -p $1 down &> /dev/null cd /federated/apps/$1 && docker compose -f docker-compose.yml -p $1 down &> /dev/null
[ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker-compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n" [ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n"
disown $SPINPID &> /dev/null disown $SPINPID &> /dev/null
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
@ -26,13 +26,13 @@ stopservice_all_old() {
[ ! -d "/federated/apps/$i" ] && continue [ ! -d "/federated/apps/$i" ] && continue
echo "* Stopping $i.." echo "* Stopping $i.."
cd /federated/apps/$i && docker-compose -f docker-compose.yml -p $i down cd /federated/apps/$i && docker compose -f docker-compose.yml -p $i down
done done
} }
stopservice_all() { stopservice_all() {
echo "* Stopping $i." echo "* Stopping $i."
cd /federated/apps/$1 && docker-compose -f docker-compose.yml -p $1 down &> /dev/null cd /federated/apps/$1 && docker compose -f docker-compose.yml -p $1 down &> /dev/null
[ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker-compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n" [ $? -ne 0 ] && echo -ne "\nThere was a problem stopping service /federated/apps/$1\nCheck the output of 'docker logs $1' while stopping or run\ndocker compose -f /federated/apps/$1/docker-compose.yml -p $1 down\n\n"
} }
[[ $# -ne 1 ]] && usage [[ $# -ne 1 ]] && usage

2
lib/authelia.sh
View File

@ -219,7 +219,7 @@ uninstall_authelia() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/authelia && docker-compose -f docker-compose.yml -p authelia down &> /dev/null cd /federated/apps/authelia && docker compose -f docker-compose.yml -p authelia down &> /dev/null
# Delete the entries in the settings table # Delete the entries in the settings table
[[ -d "/federated/apps/pdnsmysql/data/var/lib/mysql/pdnsadmin" ]] && POWERDNS_DB="pdnsadmin" || POWERDNS_DB="pdns" [[ -d "/federated/apps/pdnsmysql/data/var/lib/mysql/pdnsadmin" ]] && POWERDNS_DB="pdnsadmin" || POWERDNS_DB="pdns"

2
lib/baserow.sh
View File

@ -167,7 +167,7 @@ uninstall_baserow() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/baserow && docker-compose -f docker-compose.yml -p baserow down &> /dev/null cd /federated/apps/baserow && docker compose -f docker-compose.yml -p baserow down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE baserow" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE baserow" &> /dev/null

2
lib/bookstack.sh
View File

@ -180,7 +180,7 @@ uninstall_bookstack() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/bookstack && docker-compose -f docker-compose.yml -p bookstack down &> /dev/null cd /federated/apps/bookstack && docker compose -f docker-compose.yml -p bookstack down &> /dev/null
# Delete database and user # Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database bookstack;'" &> /dev/null docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database bookstack;'" &> /dev/null

2
lib/caddy.sh
View File

@ -188,7 +188,7 @@ uninstall_caddy() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/caddy && docker-compose -f docker-compose.yml -p caddy down &> /dev/null cd /federated/apps/caddy && docker compose -f docker-compose.yml -p caddy down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/caddy rm -rf /federated/apps/caddy

2
lib/castopod.sh
View File

@ -168,7 +168,7 @@ uninstall_castopod() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/castopod && docker-compose -f docker-compose.yml -p castopod down &> /dev/null cd /federated/apps/castopod && docker compose -f docker-compose.yml -p castopod down &> /dev/null
# Delete database and user # Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database castopod;'" &> /dev/null docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database castopod;'" &> /dev/null

6
lib/connector.sh
View File

@ -71,10 +71,10 @@ start_connector() {
if [ $DEBUG ]; then if [ $DEBUG ]; then
# Start /federated/apps/connector with output to console for debug # Start /federated/apps/connector with output to console for debug
docker-compose -f /federated/apps/connector/docker-compose.yml -p connector up docker compose -f /federated/apps/connector/docker-compose.yml -p connector up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/connector" [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/connector"
else else
docker-compose -f /federated/apps/connector/docker-compose.yml -p connector up -d &> /dev/null docker compose -f /federated/apps/connector/docker-compose.yml -p connector up -d &> /dev/null
# Keep trying connector port 80 to make sure it's up # Keep trying connector port 80 to make sure it's up
# before we proceed # before we proceed
@ -85,7 +85,7 @@ start_connector() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/connector/docker-compose.yml -p connector down &> /dev/null docker compose -f /federated/apps/connector/docker-compose.yml -p connector down &> /dev/null
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
fail "There was a problem starting service /federated/apps/connector\nCheck the output of 'docker logs connector' or turn on\ndebug with -d" fail "There was a problem starting service /federated/apps/connector\nCheck the output of 'docker logs connector' or turn on\ndebug with -d"
fi fi

2
lib/dashboard.sh
View File

@ -75,7 +75,7 @@ uninstall_dashboard() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/dashboard && docker-compose -f docker-compose.yml -p dashboard down &> /dev/null cd /federated/apps/dashboard && docker compose -f docker-compose.yml -p dashboard down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/dashboard rm -rf /federated/apps/dashboard

2
lib/discourse.sh
View File

@ -193,7 +193,7 @@ uninstall_discourse() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/discourse && docker-compose -f docker-compose.yml -p discourse down &> /dev/null cd /federated/apps/discourse && docker compose -f docker-compose.yml -p discourse down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE discourse" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE discourse" &> /dev/null

6
lib/dns.sh
View File

@ -207,11 +207,11 @@ start_dns() {
if [ $DEBUG ]; then if [ $DEBUG ]; then
# Start /federated/apps/dns with output to console for debug # Start /federated/apps/dns with output to console for debug
docker-compose -f /federated/apps/dns/docker-compose.yml -p dns up docker compose -f /federated/apps/dns/docker-compose.yml -p dns up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/dns" [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/dns"
else else
# Start /federated/apps/dns with output to /dev/null # Start /federated/apps/dns with output to /dev/null
docker-compose -f /federated/apps/dns/docker-compose.yml -p dns up -d &> /dev/null docker compose -f /federated/apps/dns/docker-compose.yml -p dns up -d &> /dev/null
# Keep trying to see that certificates are generated # Keep trying to see that certificates are generated
RETRY="18" RETRY="18"
@ -231,7 +231,7 @@ start_dns() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/dns/docker-compose.yml -p dns down &> /dev/null docker compose -f /federated/apps/dns/docker-compose.yml -p dns down &> /dev/null
fail "There was a problem starting service /federated/apps/dns\nCheck the output of 'docker logs dns' or turn on\ndebug with -d" fail "There was a problem starting service /federated/apps/dns\nCheck the output of 'docker logs dns' or turn on\ndebug with -d"
fi fi
((RETRY--)) ((RETRY--))

4
lib/espocrm.sh
View File

@ -183,7 +183,7 @@ uninstall_espocrm() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/espocrm && docker-compose -f docker-compose.yml -p espocrm down &> /dev/null cd /federated/apps/espocrm && docker compose -f docker-compose.yml -p espocrm down &> /dev/null
# Delete database and user # Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database espocrm;'" &> /dev/null docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database espocrm;'" &> /dev/null
@ -266,7 +266,7 @@ EOF
sed -i "/oidcScopes/d" /federated/apps/espocrm/data/var/www/html/data/config.php sed -i "/oidcScopes/d" /federated/apps/espocrm/data/var/www/html/data/config.php
sed -i "/authenticationMethod/a \ 'oidcScopes' => [\n\ 0 => 'profile',\n\ 1 => 'email',\n\ 2 => 'groups',\n\ 3 => 'openid'\n\ ]," /federated/apps/espocrm/data/var/www/html/data/config.php sed -i "/authenticationMethod/a \ 'oidcScopes' => [\n\ 0 => 'profile',\n\ 1 => 'email',\n\ 2 => 'groups',\n\ 3 => 'openid'\n\ ]," /federated/apps/espocrm/data/var/www/html/data/config.php
# Add in extra_hosts to docker-compose # Add in extra_hosts to docker compose
add_authelia_config_to_dockercompose "$APP" add_authelia_config_to_dockercompose "$APP"
# Set auth method to Oidc only # Set auth method to Oidc only

2
lib/freescout.sh
View File

@ -166,7 +166,7 @@ uninstall_freescout() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/freescout && docker-compose -f docker-compose.yml -p freescout down &> /dev/null cd /federated/apps/freescout && docker compose -f docker-compose.yml -p freescout down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE freescout" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE freescout" &> /dev/null

34
lib/functions.sh
View File

@ -133,7 +133,7 @@ upgrade_federated() {
echo -ne "upgrading to $VERSION..\n" echo -ne "upgrading to $VERSION..\n"
if [[ ! "$APP_NOTRUNNING" ]]; then if [[ ! "$APP_NOTRUNNING" ]]; then
echo -ne "\n Shutting Down $APP.." echo -ne "\n Shutting Down $APP.."
cd /federated/apps/$APP && docker-compose -f docker-compose.yml -p $APP down cd /federated/apps/$APP && docker compose -f docker-compose.yml -p $APP down
fi fi
if [ "$APP" = "jitsi" ]; then if [ "$APP" = "jitsi" ]; then
sed -i "s/#JITSI_IMAGE_VERSION=.*/JITSI_IMAGE_VERSION=$VERSION/g" /federated/apps/$APP/.env sed -i "s/#JITSI_IMAGE_VERSION=.*/JITSI_IMAGE_VERSION=$VERSION/g" /federated/apps/$APP/.env
@ -189,7 +189,7 @@ start_service_convert() {
# Start /federated/apps/SERVICE with output to /dev/null # Start /federated/apps/SERVICE with output to /dev/null
echo -ne "\n* Starting /federated/apps/$SERVICE service.." echo -ne "\n* Starting /federated/apps/$SERVICE service.."
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before # Keep trying service port to make sure it's up before
# we proceed # we proceed
@ -200,7 +200,7 @@ start_service_convert() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d" fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d"
fi fi
((RETRY--)) ((RETRY--))
@ -217,10 +217,10 @@ start_service_upgrade() {
if [ $DEBUG ]; then if [ $DEBUG ]; then
# Start /federated/apps/SERVICE with output to console for debug # Start /federated/apps/SERVICE with output to console for debug
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE" [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
else else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before # Keep trying service port to make sure it's up before
# we proceed # we proceed
@ -231,7 +231,7 @@ start_service_upgrade() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d" fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with -d"
fi fi
((RETRY--)) ((RETRY--))
@ -247,7 +247,7 @@ start_service_withalert2() {
ALERT="$4" ALERT="$4"
# First start the service # First start the service
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service COMMAND to make sure it's up before we proceed # Keep trying service COMMAND to make sure it's up before we proceed
while [ "$RETRY" -gt "0" ]; do while [ "$RETRY" -gt "0" ]; do
@ -263,13 +263,13 @@ start_service_withalert2() {
if [ "$ALERT" = "yes" ]; then if [ "$ALERT" = "yes" ]; then
EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null` EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile
docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile" docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile"
echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n" echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
else else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n" echo -ne "\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' while starting or run\ndocker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up\n"
fi fi
echo -ne "\n" echo -ne "\n"
fi fi
@ -286,7 +286,7 @@ start_service_withalert() {
echo -ne "* Starting $SERVICE.." echo -ne "* Starting $SERVICE.."
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before # Keep trying service port to make sure it's up before
# we proceed # we proceed
@ -302,12 +302,12 @@ start_service_withalert() {
if [ "$ALERT" = "yes" ]; then if [ "$ALERT" = "yes" ]; then
EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null` EXTERNALIP=`dig @resolver4.opendns.com myip.opendns.com +short 2> /dev/null`
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile echo "Generated by /federated/bin/start" > /federated/apps/mail/data/root/certs/mailfile
docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile" docker exec mail bash -c "mail -r admin@$DOMAIN -a \"Content-type: text/html\" -s \"$SERVICE failed to start on $EXTERNALIP\" $ALERTS_EMAIL < /root/certs/mailfile"
echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n" echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n"
else else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n" echo -ne "\n\nThere was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x\n\n"
fi fi
fi fi
@ -326,10 +326,10 @@ start_service() {
if [ $DEBUG ]; then if [ $DEBUG ]; then
# Start /federated/apps/SERVICE with output to console for debug # Start /federated/apps/SERVICE with output to console for debug
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE" [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/$SERVICE"
else else
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE up -d &> /dev/null
# Keep trying service port to make sure it's up before # Keep trying service port to make sure it's up before
# we proceed # we proceed
@ -339,7 +339,7 @@ start_service() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null docker compose -f /federated/apps/$SERVICE/docker-compose.yml -p $SERVICE down &> /dev/null
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x" fail "There was a problem starting service /federated/apps/$SERVICE\nCheck the output of 'docker logs $SERVICE' or turn on\ndebug with set -x"
fi fi

2
lib/gitea.sh
View File

@ -245,7 +245,7 @@ uninstall_gitea() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/gitea && docker-compose -f docker-compose.yml -p gitea down &> /dev/null cd /federated/apps/gitea && docker compose -f docker-compose.yml -p gitea down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE gitea" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE gitea" &> /dev/null

41
lib/jitsi.sh
View File

@ -449,17 +449,17 @@ TZ=UTC
PUBLIC_URL=https://jitsi.$DOMAIN PUBLIC_URL=https://jitsi.$DOMAIN
EOF EOF
if [ -n "$JITSI_SCALE" ]; then if [ "$JITSI_SCALE" = "server" ]; then
if [ "$JITSI_SCALE" = "server" ]; then cat >> /federated/apps/jitsi/.env <<EOF
cat >> /federated/apps/jitsi/.env <<EOF XMPP_SERVER=xmpp.jitsitest.federatedcomputer.cloud,xmpp.jitsitest2.fedcom.net
XMPP_SERVER=xmpp.jitsitest.federatedcomputer.cloud
EOF EOF
else else
cat >> /federated/apps/jitsi/.env <<EOF cat >> /federated/apps/jitsi/.env <<EOF
XMPP_SERVER=xmpp.$DOMAIN XMPP_SERVER=xmpp.$DOMAIN
EOF EOF
fi fi
if [ -n "$JITSI_SCALE" ]; then
# XMPP_AUTH_DOMAIN and XMPP_INTERNAL_MUC_DOMAIN don't # XMPP_AUTH_DOMAIN and XMPP_INTERNAL_MUC_DOMAIN don't
# need to resolve - they just need to be identical across # need to resolve - they just need to be identical across
# the involved Jitsi components. # the involved Jitsi components.
@ -471,20 +471,20 @@ EOF
XMPP_AUTH_DOMAIN=auth.jitsiscale.federated.computer XMPP_AUTH_DOMAIN=auth.jitsiscale.federated.computer
XMPP_INTERNAL_MUC_DOMAIN=internal-muc.jitsiscale.federated.computer XMPP_INTERNAL_MUC_DOMAIN=internal-muc.jitsiscale.federated.computer
EOF EOF
else
cat >> /federated/apps/jitsi/.env <<EOF
XMPP_AUTH_DOMAIN=auth.$DOMAIN
XMPP_INTERNAL_MUC_DOMAIN=internal-muc.$DOMAIN
EOF
fi
if [ "$JITSI_SCALE" = "server" ]; then if [ "$JITSI_SCALE" = "server" ]; then
cat >> /federated/apps/jitsi/.env <<EOF cat >> /federated/apps/jitsi/.env <<EOF
# XMPP password for JVB client connections # XMPP password for JVB client connections
JVB_AUTH_PASSWORD= JVB_AUTH_PASSWORD=
EOF EOF
fi
else else
cat >> /federated/apps/jitsi/.env <<EOF
XMPP_SERVER=xmpp.$DOMAIN
XMPP_AUTH_DOMAIN=auth.$DOMAIN
XMPP_INTERNAL_MUC_DOMAIN=internal-muc.$DOMAIN
EOF
cat >> /federated/apps/jitsi/.env <<EOF cat >> /federated/apps/jitsi/.env <<EOF
XMPP_DOMAIN=$DOMAIN XMPP_DOMAIN=$DOMAIN
@ -782,7 +782,7 @@ uninstall_jitsi() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/jitsi && docker-compose -f docker-compose.yml -p jitsi down &> /dev/null cd /federated/apps/jitsi && docker compose -f docker-compose.yml -p jitsi down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/jitsi rm -rf /federated/apps/jitsi
@ -805,7 +805,7 @@ uninstall_jitsi() {
fi fi
if [[ -d "/federated/apps/jitsiopenid" ]]; then if [[ -d "/federated/apps/jitsiopenid" ]]; then
cd /federated/apps/jitsiopenid && docker-compose -f docker-compose.yml -p jitsiopenid down &> /dev/null cd /federated/apps/jitsiopenid && docker compose -f docker-compose.yml -p jitsiopenid down &> /dev/null
rm -rf /federated/apps/jitsiopenid rm -rf /federated/apps/jitsiopenid
docker image rm mod242/jitsi-go-openid:latest &> /dev/null docker image rm mod242/jitsi-go-openid:latest &> /dev/null
fi fi
@ -816,7 +816,12 @@ uninstall_jitsi() {
start_jitsi() { start_jitsi() {
# Start service with command to make sure it's up before proceeding # Start service with command to make sure it's up before proceeding
start_service "jitsi" "nc -z 192.168.0.25 443 &> /dev/null" "8" start_service "jitsi" "nc -z 192.168.0.25 443 &> /dev/null" "8"
# Allow multiple JVBs to connect
if [ "$JITSI_SCALE" = "client" ]; then
for i in $(seq 1 10); do
docker exec -ti jitsi-prosody-1 prosodyctl --config /config/prosody.cfg.lua register jvb$i auth.jitsiscale.federated.computer J17515cAl3-jvb
done
fi
echo -ne "done." echo -ne "done."
} }
configsso_jitsi() { configsso_jitsi() {

4
lib/listmonk.sh
View File

@ -77,7 +77,7 @@ echo -ne "done."
} }
start_listmonk() { start_listmonk() {
# Install the database scheme first # Install the database scheme first
docker-compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null docker compose -f /federated/apps/listmonk/docker-compose.yml run --rm listmonk ./listmonk --install --yes &> /dev/null
# Change app.root_url and other settings to our domain # Change app.root_url and other settings to our domain
docker exec postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null docker exec postgresql psql -U listmonk -c "update settings set value='\"http://listmonk.$DOMAIN\"' where key='app.root_url'" &> /dev/null
@ -176,7 +176,7 @@ uninstall_listmonk() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/listmonk && docker-compose -f docker-compose.yml -p listmonk down &> /dev/null cd /federated/apps/listmonk && docker compose -f docker-compose.yml -p listmonk down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE listmonk" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE listmonk" &> /dev/null

2
lib/mail.sh
View File

@ -305,7 +305,7 @@ uninstall_mail() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/mail && docker-compose -f docker-compose.yml -p mail down &> /dev/null cd /federated/apps/mail && docker compose -f docker-compose.yml -p mail down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/mail rm -rf /federated/apps/mail

2
lib/matrix.sh
View File

@ -225,7 +225,7 @@ uninstall_matrix() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/matrix && docker-compose -f docker-compose.yml -p matrix down &> /dev/null cd /federated/apps/matrix && docker compose -f docker-compose.yml -p matrix down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrix" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE matrix" &> /dev/null

2
lib/matrixsignal.sh
View File

@ -87,7 +87,7 @@ uninstall_matrixsignal() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/matrixsignal && docker-compose -f docker-compose.yml -p matrixsignal down &> /dev/null cd /federated/apps/matrixsignal && docker compose -f docker-compose.yml -p matrixsignal down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrixsignal" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE matrixsignal" &> /dev/null

2
lib/matrixslack.sh
View File

@ -87,7 +87,7 @@ uninstall_matrixslack() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/matrixslack && docker-compose -f docker-compose.yml -p matrixslack down &> /dev/null cd /federated/apps/matrixslack && docker compose -f docker-compose.yml -p matrixslack down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrixslack" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE matrixslack" &> /dev/null

2
lib/matrixwhatsapp.sh
View File

@ -87,7 +87,7 @@ uninstall_matrixwhatsapp() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/matrixwhatsapp && docker-compose -f docker-compose.yml -p matrixwhatsapp down &> /dev/null cd /federated/apps/matrixwhatsapp && docker compose -f docker-compose.yml -p matrixwhatsapp down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE matrixwhatsapp" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE matrixwhatsapp" &> /dev/null

2
lib/msp.sh
View File

@ -152,7 +152,7 @@ uninstall_msp() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/msp && docker-compose -f docker-compose.yml -p msp down &> /dev/null cd /federated/apps/msp && docker compose -f docker-compose.yml -p msp down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/msp rm -rf /federated/apps/msp

2
lib/nextcloud.sh
View File

@ -320,7 +320,7 @@ uninstall_nextcloud() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/nextcloud && docker-compose -f docker-compose.yml -p nextcloud down &> /dev/null cd /federated/apps/nextcloud && docker compose -f docker-compose.yml -p nextcloud down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE nextcloud" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE nextcloud" &> /dev/null

2
lib/pdns.sh
View File

@ -53,7 +53,7 @@ PDNS_api=yes
PDNS_api_key=$PDNS_APIKEY PDNS_api_key=$PDNS_APIKEY
PDNSCONF_API_KEY=$PDNS_APIKEY PDNSCONF_API_KEY=$PDNS_APIKEY
PDNS_webserver=yes PDNS_webserver=yes
PDNS_webserver-allow-from=127.0.0.1,10.0.0.0/8,172.0.0.0/8,192.0.0.0/24,192.168.0.0/16 PDNS_webserver_allow_from=127.0.0.1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
PDNS_webserver_address=0.0.0.0 PDNS_webserver_address=0.0.0.0
PDNS_webserver_password=$PDNS_WEBSERVER_PASSWORD PDNS_webserver_password=$PDNS_WEBSERVER_PASSWORD
PDNS_version_string=anonymous PDNS_version_string=anonymous

2
lib/redis.sh
View File

@ -63,7 +63,7 @@ uninstall_redis() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/redis && docker-compose -f docker-compose.yml -p redis down &> /dev/null cd /federated/apps/redis && docker compose -f docker-compose.yml -p redis down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/redis rm -rf /federated/apps/redis

2
lib/roundcube.sh
View File

@ -117,7 +117,7 @@ uninstall_roundcube() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/roundcube && docker-compose -f docker-compose.yml -p roundcube down &> /dev/null cd /federated/apps/roundcube && docker compose -f docker-compose.yml -p roundcube down &> /dev/null
# Delete database and user # Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database roundcube;'" &> /dev/null docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database roundcube;'" &> /dev/null

6
lib/traefik.sh
View File

@ -101,11 +101,11 @@ start_traefik_old() {
if [ $DEBUG ]; then if [ $DEBUG ]; then
# Start /federated/apps/traefik with output to console for debug # Start /federated/apps/traefik with output to console for debug
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up
[ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/traefik" [ $? -eq 0 ] && echo -ne "done.\n" || fail "There was a problem starting service /federated/apps/traefik"
else else
# Start /federated/apps/traefik with output to /dev/null # Start /federated/apps/traefik with output to /dev/null
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik up -d &> /dev/null
# Keep trying to see that certificates are generated # Keep trying to see that certificates are generated
RETRY="20" RETRY="20"
@ -120,7 +120,7 @@ start_traefik_old() {
break break
else else
if [ "$RETRY" == 1 ]; then if [ "$RETRY" == 1 ]; then
docker-compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null docker compose -f /federated/apps/traefik/docker-compose.yml -p traefik down &> /dev/null
fail "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik' or turn on\ndebug with -d" fail "There was a problem starting service /federated/apps/traefik\nCheck the output of 'docker logs traefik' or turn on\ndebug with -d"
fi fi
((RETRY--)) ((RETRY--))

2
lib/vaultwarden.sh
View File

@ -81,7 +81,7 @@ uninstall_vaultwarden() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/vaultwarden && docker-compose -f docker-compose.yml -p vaultwarden down &> /dev/null cd /federated/apps/vaultwarden && docker compose -f docker-compose.yml -p vaultwarden down &> /dev/null
# Delete database and user in postgresql # Delete database and user in postgresql
docker exec postgresql psql -U postgres -c "DROP DATABASE vaultwarden" &> /dev/null docker exec postgresql psql -U postgres -c "DROP DATABASE vaultwarden" &> /dev/null

2
lib/wireguard.sh
View File

@ -138,7 +138,7 @@ uninstall_wireguard() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/wireguard && docker-compose -f docker-compose.yml -p wireguard down &> /dev/null cd /federated/apps/wireguard && docker compose -f docker-compose.yml -p wireguard down &> /dev/null
# Delete the app directory # Delete the app directory
rm -rf /federated/apps/wireguard rm -rf /federated/apps/wireguard

2
lib/wordpress.sh
View File

@ -180,7 +180,7 @@ uninstall_wordpress() {
SPINPID=$! SPINPID=$!
# First stop the service # First stop the service
cd /federated/apps/wordpress && docker-compose -f docker-compose.yml -p wordpress down &> /dev/null cd /federated/apps/wordpress && docker compose -f docker-compose.yml -p wordpress down &> /dev/null
# Delete database and user # Delete database and user
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database wordpress;'" &> /dev/null docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'drop database wordpress;'" &> /dev/null