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

Removed spin from config functions in app files

Browse Source
This commit is contained in:
root 2024-04-05 17:00:50 +00:00
parent 703b63d30e
commit 6f8bf28277
31 changed files with 0 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/autodiscover.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_autodiscover() {
echo -ne "\n* Configuring /federated/apps/autodiscover container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/autodiscover" ]; then
mkdir -p /federated/apps/autodiscover
@ -106,7 +104,6 @@ docker exec pdns pdnsutil add-record $DOMAIN _autodiscover._tcp SRV 86400 "0 0 4
docker exec pdns pdnsutil add-record $DOMAIN _ldap._tcp SRV 86400 "0 0 636 ldap.$DOMAIN"
[ $? -ne 0 ] && fail "Couldn't add dns record for auto discovery"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
@ -114,6 +111,5 @@ start_autodiscover() {
# Start service with command to make sure it's up before proceeding
start_service "autodiscover" "nc -z 172.99.0.32 8000 &> /dev/null" "8"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/baserow.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_baserow() {
echo -ne "\n* Configuring /federated/apps/baserow container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/baserow" ]; then
mkdir -p /federated/apps/baserow/data/baserow/data
@ -84,7 +82,6 @@ docker exec postgresql psql -U postgres -c "CREATE USER baserow WITH PASSWORD '$
docker exec postgresql psql -U postgres -c "CREATE DATABASE baserow" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE baserow TO baserow" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_baserow() {
@ -202,6 +199,5 @@ start_baserow() {
# Remove baserow create user
rm /federated/apps/baserow/data/baserow/data/createuser.sh
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

3
lib/bookstack.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_bookstack() {
echo -ne "\n* Configuring bookstack container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/bookstack" ]; then
mkdir -p /federated/apps/bookstack/data/config
@ -73,7 +71,6 @@ docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"CREATE US
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"grant all privileges on bookstack.* to 'bookstack'@'%';\"" &> /dev/null
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'flush privileges;'" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
start_bookstack() {

4
lib/caddy.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_caddy() {
echo -ne "\n* Configuring /federated/apps/caddy container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/caddy" ]; then
mkdir -p /federated/apps/caddy/data/data
@ -105,7 +103,6 @@ documentation.$DOMAIN:80 {
}
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_caddy() {
@ -204,6 +201,5 @@ start_caddy() {
# Start service with command and retry amount to make sure it's up before proceeding
start_service "caddy" "nc -z 172.99.0.31 80 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/castopod.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_castopod() {
echo -ne "\n* Configuring /federated/apps/castopod container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/castopod" ]; then
mkdir -p /federated/apps/castopod/data/var/www/castopod/public/media
@ -70,7 +68,6 @@ docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"CREATE US
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"grant all privileges on castopod.* to 'castopod'@'%';\""
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'flush privileges;'"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_castopod() {
@ -86,7 +83,6 @@ start_castopod() {
curl -v -b /tmp/cp-cookies --data-urlencode "csrf_test_name=$CSRF_TEST_NAME" --data-urlencode "username=$CASTOPOD_ADMIN_USERNAME" --data-urlencode "email=$CASTOPOD_ADMIN_EMAIL" --data-urlencode "password=$CASTOPOD_ADMIN_PASSWORD" $CASTOPOD_BASE_URL/cp-install/create-superadmin &> /dev/null
rm /tmp/cp-cookies
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_castopod() {

4
lib/collabora.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_collabora() {
echo -ne "\n* Configuring /federated/apps/collabora container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/collabora" ]; then
mkdir -p /federated/apps/collabora/data/root/certs &> /dev/null
@ -67,13 +65,11 @@ chmod 600 /federated/apps/collabora/.env
tar zxvf /federated/lib/files/collabora/fonts.tar.gz -C /federated/apps/collabora/data/opt/collaboraoffice/share/fonts/truetype/
[ $? -ne 0 ] && fail "Couldn't extract files/collabora/fonts.tar.gz into collabora"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_collabora() {
# Start service with command to make sure it's up before proceeding
start_service "collabora" "nc -z 172.99.0.17 9980 &> /dev/null" "15"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/coturn.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_coturn() {
echo -ne "\n* Configuring /federated/apps/coturn container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/coturn" ]; then
mkdir -p /federated/apps/coturn/data/etc
@ -75,13 +73,11 @@ min-port=49160
max-port=49200
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_coturn() {
# Start service with command to make sure it's up before proceeding
start_service "coturn" "nc -z 172.99.0.35 3478 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/element.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_element() {
echo -ne "\n* Configuring /federated/apps/element container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/element" ]; then
mkdir -p /federated/apps/element/data/element &> /dev/null
@ -125,13 +123,11 @@ cat > /federated/apps/element/data/element/element-config.json <<EOF
}
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_element() {
# Start service with command to make sure it's up before proceeding
start_service "element" "nc -z 172.99.0.20 80 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/espocrm.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_espocrm() {
echo -ne "\n* Configuring espocrm container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/espocrm" ]; then
mkdir -p /federated/apps/espocrm/data/var/www/html
@ -88,7 +86,6 @@ docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"CREATE US
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"grant all privileges on espocrm.* to 'espocrm'@'%';\""
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'flush privileges;'"
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
start_espocrm() {
@ -101,7 +98,6 @@ start_espocrm() {
# Install cronjob
(crontab -l 2>/dev/null; echo "* * * * * /usr/bin/docker exec espocrm /usr/local/bin/php -f /var/www/html/cron.php > /dev/null 2>&1") | sort -u | crontab -
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
email_espocrm() {

4
lib/freescout.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_freescout() {
echo -ne "\n* Configuring freescout container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/freescout" ]; then
mkdir -p /federated/apps/freescout/data/data
@ -74,7 +72,6 @@ docker exec postgresql psql -U postgres -c "CREATE USER freescout WITH PASSWORD
docker exec postgresql psql -U postgres -c "CREATE DATABASE freescout" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE freescout TO freescout" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
start_freescout() {
@ -84,7 +81,6 @@ start_freescout() {
docker exec pdns pdnsutil add-record $DOMAIN freescout A 86400 $EXTERNALIP &> /dev/null
[ $? -ne 0 ] && fail "Couldn't add dns record for freescout"
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
email_freescout() {

4
lib/gitea.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_gitea() {
echo -ne "\n* Configuring /federated/apps/gitea container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/gitea" ]; then
mkdir -p /federated/apps/gitea/data/data
@ -161,7 +159,6 @@ docker exec postgresql psql -U postgres -c "CREATE USER gitea WITH PASSWORD '$GI
docker exec postgresql psql -U postgres -c "CREATE DATABASE gitea" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE gitea TO gitea" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_gitea() {
@ -284,6 +281,5 @@ start_gitea() {
# Remove creategitea.sh
rm /federated/apps/gitea/data/data/creategitea.sh
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/jitsi.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_jitsi() {
echo -ne "\n* Configuring /federated/apps/jitsi container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/jitsi" ]; then
mkdir -p /federated/apps/jitsi
@ -616,7 +614,6 @@ mkdir -p ~/.jitsi-meet-cfg/{web,transcripts,prosody/config,prosody/prosody-plugi
/federated/apps/jitsi/gen-passwords.sh
[ $? -ne 0 ] && fail "Couldn't run /federated/apps/jitsi/gen-passwords.sh"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_jitsi() {
@ -715,6 +712,5 @@ start_jitsi() {
# Start service with command to make sure it's up before proceeding
start_service "jitsi" "nc -z 172.99.0.25 443 &> /dev/null" "8"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/ldap.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_ldap() {
echo -ne "\n* Configuring /federated/apps/ldap container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/ldap" ]; then
mkdir -p /federated/apps/ldap/data/certs &> /dev/null
@ -178,7 +176,6 @@ EOF
chmod +x /federated/apps/ldap/data/root/ldap.sh
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_ldap() {
@ -190,6 +187,5 @@ start_ldap() {
docker exec ldap /root/ldap.sh &> /dev/null
[ $? -ne 0 ] && fail "Couldn't run ldap.sh inside ldap container"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/listmonk.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_listmonk() {
echo -ne "\n* Configuring /federated/apps/listmonk container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/listmonk" ]; then
mkdir -p /federated/apps/listmonk/data/listmonk/static /federated/apps/listmonk/data/listmonk/uploads
@ -76,7 +74,6 @@ docker exec postgresql psql -U postgres -c "CREATE USER listmonk WITH PASSWORD '
docker exec postgresql psql -U postgres -c "CREATE DATABASE listmonk" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE listmonk TO listmonk" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_listmonk() {
@ -91,7 +88,6 @@ start_listmonk() {
# Start service with command to make sure it's up before proceeding
start_service "listmonk" "nc -z 172.99.0.21 9000 &> /dev/null" "8"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_listmonk() {

4
lib/mail.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_mail() {
echo -ne "\n* Configuring /federated/apps/mail container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/mail" ]; then
mkdir -p /federated/apps/mail/data/root/certs &> /dev/null
@ -149,7 +147,6 @@ bantime = 180d
port = smtp,pop3,pop3s,imap,imaps,submission,submissions,sieve
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_mail() {
@ -178,6 +175,5 @@ start_mail() {
/federated/bin/stop mail &> /dev/null
/federated/bin/start mail &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/matrix.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_matrix() {
echo -ne "\n* Configuring /federated/apps/matrix container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/matrix" ]; then
mkdir -p /federated/apps/matrix/data/matrix &> /dev/null
@ -123,7 +121,6 @@ docker exec postgresql psql -U postgres -c "CREATE USER matrix WITH PASSWORD '$M
docker exec postgresql psql -U postgres -c "CREATE DATABASE matrix" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE matrix TO matrix" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_matrix() {
@ -136,7 +133,6 @@ start_matrix() {
# Set admin user as admin in Matrix
docker exec postgresql psql -U matrix -c "update users set admin='1' where name='\"@admin:matrix.$DOMAIN\"'" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_matrix() {

4
lib/matrixsignal.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_matrixsignal() {
echo -ne "\n* Configuring /federated/apps/matrixsignal container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/matrixsignal" ]; then
mkdir -p /federated/apps/matrixsignal/data
@ -76,14 +74,12 @@ EOF
# Set permissions
chown -R 991:991 /federated/apps/matrix/data/matrix
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_matrixsignal() {
# Start service with command to make sure it's up before proceeding
start_service "matrixsignal" "nc -z 172.99.0.81 29328 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
uninstall_matrixsignal() {

4
lib/matrixslack.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_matrixslack() {
echo -ne "\n* Configuring /federated/apps/matrixslack container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/matrixslack" ]; then
mkdir -p /federated/apps/matrixslack/data
@ -76,14 +74,12 @@ EOF
# Set permissions
chown -R 991:991 /federated/apps/matrix/data/matrix
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_matrixslack() {
# Start service with command to make sure it's up before proceeding
start_service "matrixslack" "nc -z 172.99.0.80 29335 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
uninstall_matrixslack() {

4
lib/matrixwhatsapp.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_matrixwhatsapp() {
echo -ne "\n* Configuring /federated/apps/matrixwhatsapp container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/matrixwhatsapp" ]; then
mkdir -p /federated/apps/matrixwhatsapp/data
@ -76,14 +74,12 @@ EOF
# Set permissions
chown -R 991:991 /federated/apps/matrix/data/matrix
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_matrixwhatsapp() {
# Start service with command to make sure it's up before proceeding
start_service "matrixwhatsapp" "nc -z 172.99.0.81 29328 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
uninstall_matrixwhatsapp() {

4
lib/msp.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_msp() {
echo -ne "\n* Configuring msp container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/msp" ]; then
mkdir -p /federated/apps/msp/data
@ -60,7 +58,6 @@ IMAGE_VERSION="latest"
EOF
chmod 600 /federated/apps/msp/.env
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
start_msp() {
@ -70,7 +67,6 @@ start_msp() {
docker exec pdns pdnsutil add-record $DOMAIN msp A 86400 $EXTERNALIP &> /dev/null
[ $? -ne 0 ] && fail "Couldn't add dns record for msp"
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
email_msp() {

4
lib/nextcloud.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_nextcloud() {
echo -ne "\n* Configuring /federated/apps/nextcloud container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/nextcloud" ]; then
mkdir -p /federated/apps/nextcloud/data/root &> /dev/null
@ -273,7 +271,6 @@ EOF
chmod +x /federated/apps/nextcloud/data/config.sh
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
@ -309,6 +306,5 @@ start_nextcloud() {
# Remove configs
rm /federated/apps/nextcloud/data/var/www/html/config.sh /federated/apps/nextcloud/data/var/www/html/configs.json
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/nginx.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_nginx() {
echo -ne "\n* Configuring /federated/apps/nginx container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/nginx" ]; then
mkdir -p /federated/apps/nginx/data/etc/nginx/conf.d
@ -73,13 +71,11 @@ server { listen 80 default_server;
}
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_nginx() {
# Start service with command to make sure it's up before proceeding
start_service "nginx" "nc -z 172.99.0.40 80 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/panel.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_panel() {
echo -ne "\n* Configuring /federated/apps/panel container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/panel" ]; then
mkdir -p /federated/apps/panel/data/opt/ldap_user_manager
@ -74,13 +72,11 @@ NO_HTTPS=true
EOF
chmod 600 /federated/apps/panel/.env
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_panel() {
# Start service with command to make sure it's up before proceeding
start_service "panel" "nc -z 172.99.0.23 80 &> /dev/null" "7"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/pdns.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
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
@ -97,7 +95,6 @@ pdnsutil add-record $DOMAIN @ A 86400 $EXTERNALIP
EOF
chmod +x /federated/apps/pdns/data/root/createrecords.sh
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_pdns() {
@ -127,6 +124,5 @@ start_pdns() {
# Remove createrecords
rm /federated/apps/pdns/data/root/createrecords.sh
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/pdnsadmin.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_pdnsadmin() {
echo -ne "\n* Configuring /federated/apps/pdnsadmin container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/pdnsadmin" ]; then
mkdir -p /federated/apps/pdnsadmin/data/etc
@ -89,7 +87,6 @@ pidfile = /run/uwsgi/%n.pid
enable-threads = true
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_pdnsadmin() {
@ -99,6 +96,5 @@ start_pdnsadmin() {
# Run MySQL command to create admin user for pdns admin interface
docker exec pdnsmysql bash -c "mysql -updns -p$MYSQL_PASSWORD pdns -e '$PDNS_MYSQL_COMMAND;'"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/pdnsmysql.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_pdnsmysql() {
echo -ne "\n* Configuring /federated/apps/pdnsmysql container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/pdnsmysql" ]; then
mkdir -p /federated/apps/pdnsmysql/data/var/lib/mysql
@ -48,13 +46,11 @@ MYSQL_USER=pdns
EOF
chmod 600 /federated/apps/pdnsmysql/.env
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_pdnsmysql() {
# Start service with command to make sure it's up before proceeding
start_service "pdnsmysql" "nc -z 172.99.0.10 3306 &> /dev/null" "8"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

7
lib/postgresql.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_postgresql() {
echo -ne "\n* Configuring /federated/apps/postgresql container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/postgresql" ]; then
mkdir -p /federated/apps/postgresql/data/var/lib/postgresql /federated/apps/postgresql/data/docker-entrypoint-initdb.d
@ -70,7 +68,6 @@ PSQL_SECRET=$(create_password);
echo "$PSQL_SECRET" > /federated/apps/postgresql/.postgresql.secret
chmod 600 /federated/apps/postgresql/.postgresql.secret
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_postgresql() {
@ -94,9 +91,5 @@ start_postgresql() {
/federated/bin/stop postgresql &> /dev/null
/federated/bin/start postgresql &> /dev/null
# Remove init.sql
# rm /federated/apps/postgresql/data/docker-entrypoint-initdb.d/init.sql
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

3
lib/traefik.sh
View File

@ -6,8 +6,6 @@ PATH=$HOME/.docker/cli-plugins:/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sb
config_traefik() {
echo -ne "\n* Configuring /federated/apps/traefik container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/traefik" ]; then
mkdir -p /federated/apps/traefik/data/letsencrypt
@ -90,7 +88,6 @@ PDNS_API_URL=http://pdns.$DOMAIN:8081
EOF
chmod 600 /federated/apps/traefik/.env
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_traefik() {

4
lib/vaultwarden.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_vaultwarden() {
echo -ne "\n* Configuring /federated/apps/vaultwarden container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/vaultwarden" ]; then
mkdir -p /federated/apps/vaultwarden/data/data
@ -67,13 +65,11 @@ docker exec postgresql psql -U postgres -c "CREATE DATABASE vaultwarden" &> /dev
docker exec postgresql psql -U postgres -c "CREATE USER vaultwarden WITH PASSWORD '$VAULTWARDEN_SECRET'" &> /dev/null
docker exec postgresql psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE vaultwarden TO vaultwarden" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
start_vaultwarden() {
# Start service with command to make sure it's up before proceeding
start_service "vaultwarden" "nc -z 172.99.0.22 80 &> /dev/null" "8"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/wireguard.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_wireguard() {
echo -ne "\n* Configuring /federated/apps/wireguard container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/wireguard" ]; then
mkdir -p /federated/apps/wireguard/data/config/coredns
@ -87,7 +85,6 @@ cat > /federated/apps/wireguard/data/config/coredns/Corefile <<EOF
}
EOF
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}
email_wireguard() {
@ -154,6 +151,5 @@ start_wireguard() {
# Start service with command to make sure it's up before proceeding
start_service "wireguard" "nc -uvz 172.99.0.24 51820 &> /dev/null" "8"
kill -9 $SPINPID &> /dev/null
echo -ne "done."
}

4
lib/wordpress.sh
View File

@ -7,8 +7,6 @@ get_appvars
config_wordpress() {
echo -ne "\n* Configuring wordpress container.."
spin &
SPINPID=$!
if [ ! -d "/federated/apps/wordpress" ]; then
mkdir -p /federated/apps/wordpress/data/bitnami/wordpress
@ -78,7 +76,6 @@ docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"CREATE US
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e \"grant all privileges on wordpress.* to 'wordpress'@'%';\"" &> /dev/null
docker exec pdnsmysql bash -c "mysql -uroot -p$MYSQL_ROOTPASSWORD -e 'flush privileges;'" &> /dev/null
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
start_wordpress() {
@ -93,7 +90,6 @@ start_wordpress() {
docker exec pdns pdnsutil add-record $DOMAIN wordpress A 86400 $EXTERNALIP &> /dev/null
[ $? -ne 0 ] && fail "Couldn't add dns record for freescout"
kill -9 $SPINPID &> /dev/null
echo -ne "done.\n"
}
email_wordpress() {