Jabber umzug

Jabber und Jabber-test instanz passen jetzt, jabber-test braucht noch LDAP anbindung

webserver/docker_jabber/templates/docker-compose.yml

@@ -3,14 +3,6 @@ version: "3"
 
 services:
 
-  auth:
-
-    image: dweomer/saslauthd
-    restart: always
-    volumes:
-      - /srv/jabber_test/saslauthd.conf:/etc/saslauthd.conf:ro
-      - /srv/jabber_test/saslauthd:/var/run/saslauthd
-
   app:
 
     image: prosody/prosody:0.10
@@ -23,12 +15,9 @@ services:
       - /srv/jabber_test/logs:/var/log/prosody
       - /srv/jabber_test/data:/var/lib/prosody
       # mount the certificates created by lets encrypt
-      - /etc/ssl/key.pem:/etc/prosody/certs/jabber-test.warpzone.ms.key
-      - /etc/ssl/fullchain.pem:/etc/prosody/certs/jabber-test.warpzone.ms.crt
-      - /etc/ssl/key.pem:/etc/prosody/certs/muc.jabber-test.warpzone.ms.key
-      - /etc/ssl/fullchain.pem:/etc/prosody/certs/muc.jabber-test.warpzone.ms.crt
-      - /etc/ssl/key.pem:/etc/prosody/certs/proxy.jabber-test.warpzone.ms.key
-      - /etc/ssl/fullchain.pem:/etc/prosody/certs/proxy.jabber-test.warpzone.ms.crt
-      # sasl2 auth mounts 
-      - /srv/jabber_test/prosody.conf:/usr/lib/sasl/prosody.conf
-      - /srv/jabber_test/saslauthd:/var/run/saslauthd
+      - /etc/ssl/key.pem:/etc/prosody/certs/jabber.warpzone.ms.key
+      - /etc/ssl/fullchain.pem:/etc/prosody/certs/jabber.warpzone.ms.crt
+      - /etc/ssl/key.pem:/etc/prosody/certs/muc.jabber.warpzone.ms.key
+      - /etc/ssl/fullchain.pem:/etc/prosody/certs/muc.jabber.warpzone.ms.crt
+      - /etc/ssl/key.pem:/etc/prosody/certs/proxy.jabber.warpzone.ms.key
+      - /etc/ssl/fullchain.pem:/etc/prosody/certs/proxy.jabber.warpzone.ms.crt