Matrix fix, moved files dir

lib/dns.sh

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

lib/jitsi.sh

@@ -23,7 +23,7 @@ config_jitsi() {
   DOMAIN_LAST=${DOMAIN_ARRAY[1]}
 
 # 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"
 
 # Create docker compose file

lib/ldap.sh

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

lib/matrix.sh

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

lib/panel.sh

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