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

Second push of new directory structure

Browse Source
This commit is contained in:
root 2022-12-13 20:51:41 +00:00
parent 09f9ee5c62
commit 6cf4c00de1
11 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/install-federated.sh
View File

@ -88,8 +88,7 @@ check_ports
config_network config_network
# Configure and start each federated service # 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 ldap mail collabora nextcloud matrix listmonk vaultwarden panel proxy jitsi; do
for i in dns postgresql; do
config_$i config_$i
start_$i start_$i
done done

2
lib/collabora.sh
View File

@ -11,7 +11,7 @@ config_collabora() {
if [ ! -d "/federated/apps/collabora" ]; then if [ ! -d "/federated/apps/collabora" ]; then
mkdir -p /federated/apps/collabora/data/root/certs &> /dev/null 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/* chown 104 /federated/apps/collabora/data/root/certs/*
fi fi

6
lib/jitsi.sh
View File

@ -23,7 +23,7 @@ config_jitsi() {
DOMAIN_LAST=${DOMAIN_ARRAY[1]} DOMAIN_LAST=${DOMAIN_ARRAY[1]}
# Extract Jitsi into /federated/apps/jitsi # 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" [ $? -ne 0 ] && fail "Couldn't extract files/jitsi/stable* into /federated/apps/jitsi"
# Create docker compose file # 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} 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" [ $? -ne 0 ] && fail "Couldn't run mkdir for jitsi configurations"
.//federated/apps/jitsi/gen-passwords.sh /federated/apps/jitsi/gen-passwords.sh
[ $? -ne 0 ] && fail "Couldn't run jitsi/gen-passwords.sh" [ $? -ne 0 ] && fail "Couldn't run /federated/apps/jitsi/gen-passwords.sh"
kill -9 $SPINPID &> /dev/null kill -9 $SPINPID &> /dev/null
echo -ne "done." echo -ne "done."

2
lib/ldap.sh
View File

@ -15,7 +15,7 @@ config_ldap() {
mkdir -p /federated/apps/ldap/data/etc/ldap/slap.d &> /dev/null 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/certs &> /dev/null
mkdir -p /federated/apps/ldap/data/root &> /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 fi
DOMAIN_ARRAY=(${DOMAIN//./ }) DOMAIN_ARRAY=(${DOMAIN//./ })

2
lib/listmonk.sh
View File

@ -10,7 +10,7 @@ config_listmonk() {
SPINPID=$! SPINPID=$!
if [ ! -d "/federated/apps/listmonk" ]; then 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 fi
DOMAIN_ARRAY=(${DOMAIN//./ }) DOMAIN_ARRAY=(${DOMAIN//./ })

4
lib/mail.sh
View File

@ -15,7 +15,7 @@ config_mail() {
mkdir -p /federated/apps/mail/data/var/mail-state &> /dev/null 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/var/log/mail &> /dev/null
mkdir -p /federated/apps/mail/data/tmp/docker-mailserver &> /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 fi
DOMAIN_ARRAY=(${DOMAIN//./ }) DOMAIN_ARRAY=(${DOMAIN//./ })
@ -141,7 +141,7 @@ start_mail() {
[ $? -ne 0 ] && fail "Couldn't generate DKIM record" [ $? -ne 0 ] && fail "Couldn't generate DKIM record"
# Insert the DKIM DNS TXT entry into /federated/apps/dns container # 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" [ $? -ne 0 ] && fail "Couldn't insert DKIM record into /federated/apps/dns container"
# Insert the DMARC DNS TXT entry into /federated/apps/dns container # Insert the DMARC DNS TXT entry into /federated/apps/dns container

4
lib/matrix.sh
View File

@ -11,7 +11,7 @@ config_matrix() {
if [ ! -d "/federated/apps/matrix" ]; then if [ ! -d "/federated/apps/matrix" ]; then
mkdir -p /federated/apps/matrix/data/matrix apps/matrix/data/element &> /dev/null 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 chmod 644 /federated/apps/matrix/data/matrix/*.pem
fi fi
@ -140,7 +140,7 @@ cat > /federated/apps/matrix/data/element/element-config.json <<EOF
EOF EOF
# Generate the matrix homeserver.yaml file # Generate the matrix homeserver.yaml file
docker run -it --rm -v "`pwd`//federated/apps/matrix/data/matrix:/data" -e SYNAPSE_SERVER_NAME=matrix.$DOMAIN -e SYNAPSE_REPORT_STATS=yes matrixdotorg/synapse:latest generate &> /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" [ $? -ne 0 ] && fail "Couldn't run docker matrixdotorg/synapse:latest generate"
# Take out default Sqlite database config # Take out default Sqlite database config

2
lib/nextcloud.sh
View File

@ -202,7 +202,7 @@ start_nextcloud() {
fi fi
# Move nextcloud.sh and set nextcloud.sh executable # 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 chown www-data:root /var/www/html/nextcloud.sh
docker exec -it nextcloud chmod 755 /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" [ $? -ne 0 ] && fail "Couldn't chown nextcloud.sh in /federated/apps/nextcloud container"

2
lib/panel.sh
View File

@ -26,7 +26,7 @@ ansible_python_interpreter=/usr/bin/python3
ansible_ssh_common_args='-o StrictHostKeyChecking=no' ansible_ssh_common_args='-o StrictHostKeyChecking=no'
EOF 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 <<EOF cat > /federated/apps/panel/Dockerfile <<EOF
FROM wheelybird/ldap-user-manager:latest FROM wheelybird/ldap-user-manager:latest

6
lib/postgresql.sh
View File

@ -10,9 +10,9 @@ config_postgresql() {
SPINPID=$! SPINPID=$!
if [ ! -d "/federated/apps/postgresql" ]; then if [ ! -d "/federated/apps/postgresql" ]; then
mkdir -p /federated/apps/postgresql/data/var/lib/postgresql apps/postgresql/data/docker-entrypoint-initdb.d mkdir -p /federated/apps/postgresql/data/var/lib/postgresql /federated/apps/postgresql/data/docker-entrypoint-initdb.d
cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/fullchain1.pem apps/postgresql/data/var/lib/postgresql/server.crt cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/fullchain1.pem /federated/apps/postgresql/data/var/lib/postgresql/server.crt
cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/privkey1.pem apps/postgresql/data/var/lib/postgresql/server.key cp /federated/apps/dns/data/etc/letsencrypt/archive/$DOMAIN/privkey1.pem /federated/apps/postgresql/data/var/lib/postgresql/server.key
chown 999 /federated/apps/postgresql/data/var/lib/postgresql/server.* chown 999 /federated/apps/postgresql/data/var/lib/postgresql/server.*
chmod 600 /federated/apps/postgresql/data/var/lib/postgresql/server.* chmod 600 /federated/apps/postgresql/data/var/lib/postgresql/server.*
fi fi

4
lib/proxy.sh
View File

@ -11,8 +11,8 @@ config_proxy() {
if [ ! -d "/federated/apps/proxy" ]; then if [ ! -d "/federated/apps/proxy" ]; then
mkdir -p /federated/apps/proxy/data/root/certs &> /dev/null mkdir -p /federated/apps/proxy/data/root/certs &> /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/fullchain1.pem /federated/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/privkey1.pem /federated/apps/proxy/data/root/certs/$DOMAIN.key
fi fi
DOMAIN_ARRAY=(${DOMAIN//./ }) DOMAIN_ARRAY=(${DOMAIN//./ })