From 6cf4c00de1e5d473b5f7c6eb1f1e1a1d81a4d9c5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 13 Dec 2022 20:51:41 +0000 Subject: [PATCH] Second push of new directory structure --- bin/install-federated.sh | 3 +-- lib/collabora.sh | 2 +- lib/jitsi.sh | 6 +++--- lib/ldap.sh | 2 +- lib/listmonk.sh | 2 +- lib/mail.sh | 4 ++-- lib/matrix.sh | 4 ++-- lib/nextcloud.sh | 2 +- lib/panel.sh | 2 +- lib/postgresql.sh | 6 +++--- lib/proxy.sh | 4 ++-- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bin/install-federated.sh b/bin/install-federated.sh index 0769b58..6380ec3 100755 --- a/bin/install-federated.sh +++ b/bin/install-federated.sh @@ -88,8 +88,7 @@ check_ports config_network # Configure and start each federated service -#for i in dns postgresql ldap mail collabora nextcloud matrix listmonk vaultwarden panel proxy jitsi; do -for i in dns postgresql; do +for i in dns postgresql ldap mail collabora nextcloud matrix listmonk vaultwarden panel proxy jitsi; do config_$i start_$i done diff --git a/lib/collabora.sh b/lib/collabora.sh index 5790c74..4ed0061 100644 --- a/lib/collabora.sh +++ b/lib/collabora.sh @@ -11,7 +11,7 @@ config_collabora() { if [ ! -d "/federated/apps/collabora" ]; then mkdir -p /federated/apps/collabora/data/root/certs &> /dev/null - cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem apps/collabora/data/root/certs/ + cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem /federated/apps/collabora/data/root/certs/ chown 104 /federated/apps/collabora/data/root/certs/* fi diff --git a/lib/jitsi.sh b/lib/jitsi.sh index 92d4fd7..8ad1044 100644 --- a/lib/jitsi.sh +++ b/lib/jitsi.sh @@ -23,7 +23,7 @@ config_jitsi() { DOMAIN_LAST=${DOMAIN_ARRAY[1]} # Extract Jitsi into /federated/apps/jitsi -tar zxvf /federated/apps/files/jitsi/stable-* --strip-components 1 -C apps/jitsi &> /dev/null +tar zxvf /federated/files/jitsi/stable-* --strip-components 1 -C /federated/apps/jitsi &> /dev/null [ $? -ne 0 ] && fail "Couldn't extract files/jitsi/stable* into /federated/apps/jitsi" # Create docker compose file @@ -606,8 +606,8 @@ EOF mkdir -p ~/.jitsi-meet-cfg/{web,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri} [ $? -ne 0 ] && fail "Couldn't run mkdir for jitsi configurations" -.//federated/apps/jitsi/gen-passwords.sh -[ $? -ne 0 ] && fail "Couldn't run jitsi/gen-passwords.sh" +/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." diff --git a/lib/ldap.sh b/lib/ldap.sh index ad0ba6b..b351ca1 100644 --- a/lib/ldap.sh +++ b/lib/ldap.sh @@ -15,7 +15,7 @@ config_ldap() { mkdir -p /federated/apps/ldap/data/etc/ldap/slap.d &> /dev/null mkdir -p /federated/apps/ldap/data/certs &> /dev/null mkdir -p /federated/apps/ldap/data/root &> /dev/null - cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem apps/ldap/data/certs/ + cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem /federated/apps/ldap/data/certs/ fi DOMAIN_ARRAY=(${DOMAIN//./ }) diff --git a/lib/listmonk.sh b/lib/listmonk.sh index 4868765..891651f 100644 --- a/lib/listmonk.sh +++ b/lib/listmonk.sh @@ -10,7 +10,7 @@ config_listmonk() { SPINPID=$! if [ ! -d "/federated/apps/listmonk" ]; then - mkdir -p /federated/apps/listmonk/static apps/listmonk/data/listmonk + mkdir -p /federated/apps/listmonk/static /federated/apps/listmonk/data/listmonk fi DOMAIN_ARRAY=(${DOMAIN//./ }) diff --git a/lib/mail.sh b/lib/mail.sh index 957585b..4a4656b 100644 --- a/lib/mail.sh +++ b/lib/mail.sh @@ -15,7 +15,7 @@ config_mail() { mkdir -p /federated/apps/mail/data/var/mail-state &> /dev/null mkdir -p /federated/apps/mail/data/var/log/mail &> /dev/null mkdir -p /federated/apps/mail/data/tmp/docker-mailserver &> /dev/null - cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem apps/mail/data/root/certs/ + cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem /federated/apps/mail/data/root/certs/ fi DOMAIN_ARRAY=(${DOMAIN//./ }) @@ -141,7 +141,7 @@ start_mail() { [ $? -ne 0 ] && fail "Couldn't generate DKIM record" # Insert the DKIM DNS TXT entry into /federated/apps/dns container - cat /federated/apps/mail/data/tmp/docker-mailserver/opendkim/keys/$DOMAIN/mail.txt >> apps/dns/data/etc/bind/zones/$DOMAIN + cat /federated/apps/mail/data/tmp/docker-mailserver/opendkim/keys/$DOMAIN/mail.txt >> /federated/apps/dns/data/etc/bind/zones/$DOMAIN [ $? -ne 0 ] && fail "Couldn't insert DKIM record into /federated/apps/dns container" # Insert the DMARC DNS TXT entry into /federated/apps/dns container diff --git a/lib/matrix.sh b/lib/matrix.sh index 0915a39..211af96 100644 --- a/lib/matrix.sh +++ b/lib/matrix.sh @@ -11,7 +11,7 @@ config_matrix() { if [ ! -d "/federated/apps/matrix" ]; then mkdir -p /federated/apps/matrix/data/matrix apps/matrix/data/element &> /dev/null - cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem apps/matrix/data/matrix + cp -rf /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/*.pem /federated/apps/matrix/data/matrix chmod 644 /federated/apps/matrix/data/matrix/*.pem fi @@ -140,7 +140,7 @@ cat > /federated/apps/matrix/data/element/element-config.json < /dev/null +docker run -it --rm -v "/federated/apps/matrix/data/matrix:/data" -e SYNAPSE_SERVER_NAME=matrix.$DOMAIN -e SYNAPSE_REPORT_STATS=yes matrixdotorg/synapse:latest generate &> /dev/null [ $? -ne 0 ] && fail "Couldn't run docker matrixdotorg/synapse:latest generate" # Take out default Sqlite database config diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh index 13f41d1..9ad3d59 100644 --- a/lib/nextcloud.sh +++ b/lib/nextcloud.sh @@ -202,7 +202,7 @@ start_nextcloud() { fi # Move nextcloud.sh and set nextcloud.sh executable - mv /federated/apps/nextcloud/data/nextcloud.sh apps/nextcloud/data/var/www/html/ + mv /federated/apps/nextcloud/data/nextcloud.sh /federated/apps/nextcloud/data/var/www/html/ docker exec -it nextcloud chown www-data:root /var/www/html/nextcloud.sh docker exec -it nextcloud chmod 755 /var/www/html/nextcloud.sh [ $? -ne 0 ] && fail "Couldn't chown nextcloud.sh in /federated/apps/nextcloud container" diff --git a/lib/panel.sh b/lib/panel.sh index 69ad482..50fbf1d 100644 --- a/lib/panel.sh +++ b/lib/panel.sh @@ -26,7 +26,7 @@ ansible_python_interpreter=/usr/bin/python3 ansible_ssh_common_args='-o StrictHostKeyChecking=no' EOF -cp /federated/apps/files/panel/new_user.php apps/panel +cp /federated/files/panel/new_user.php /federated/apps/panel cat > /federated/apps/panel/Dockerfile < /dev/null - cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/fullchain1.pem apps/proxy/data/root/certs/$DOMAIN.crt - cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/privkey1.pem apps/proxy/data/root/certs/$DOMAIN.key + cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/fullchain1.pem /federated/apps/proxy/data/root/certs/$DOMAIN.crt + cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/privkey1.pem /federated/apps/proxy/data/root/certs/$DOMAIN.key fi DOMAIN_ARRAY=(${DOMAIN//./ })