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

Matrix fix, moved files dir

Browse Source
This commit is contained in:
root 2022-12-14 21:54:26 +00:00
parent 756672c8a0
commit 924d63eba8
7 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/dns.sh
View File

@ -173,9 +173,7 @@ ns2 IN A $EXTERNALIP
mail IN A $EXTERNALIP mail IN A $EXTERNALIP
www IN A $EXTERNALIP www IN A $EXTERNALIP
panel IN A $EXTERNALIP panel IN A $EXTERNALIP
webmail IN A $EXTERNALIP
nextcloud IN A $EXTERNALIP nextcloud IN A $EXTERNALIP
computer IN A $EXTERNALIP
collabora IN A $EXTERNALIP collabora IN A $EXTERNALIP
jitsi IN A $EXTERNALIP jitsi IN A $EXTERNALIP
matrix IN A $EXTERNALIP matrix IN A $EXTERNALIP

0
files/jitsi/stable-7882.tar.gz → lib/files/jitsi/stable-7882.tar.gz
View File

0
files/panel/new_user.php → lib/files/panel/new_user.php
View File

2
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/files/jitsi/stable-* --strip-components 1 -C /federated/apps/jitsi &> /dev/null tar zxvf /federated/lib/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

2
lib/ldap.sh
View File

@ -162,7 +162,7 @@ start_ldap() {
# Keep trying ldap port to make sure it's up # Keep trying ldap port to make sure it's up
# before we proceed # before we proceed
RETRY="25" RETRY="35"
while [ $RETRY -gt 0 ]; do while [ $RETRY -gt 0 ]; do
nc -z 172.99.0.11 636 &> /dev/null nc -z 172.99.0.11 636 &> /dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

2
lib/matrix.sh
View File

@ -156,7 +156,7 @@ database:
name: psycopg2 name: psycopg2
args: args:
user: matrix user: matrix
password: d3r3k123 password: $ADMINPASS
host: postgresql.$DOMAIN host: postgresql.$DOMAIN
database: matrix database: matrix
cp_min: 5 cp_min: 5

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/files/panel/new_user.php /federated/apps/panel cp /federated/lib/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