Browse Source

updated to 24.02 and fixed cert permisisons

toastie89 1 month ago
parent
commit
accfc01374
2 changed files with 11 additions and 11 deletions
  1. 1 1
      data/conf.d/30-tls.yml
  2. 10 10
      docker-compose.yml

+ 1 - 1
data/conf.d/30-tls.yml

@@ -16,5 +16,5 @@ s2s_use_starttls: required
 
 certfiles:
   - /etc/ssl/ejabberd/fullchain.pem
-  - /etc/ssl/ejabberd/key.pem
+  - /etc/ssl/ejabberd/ejabberd-key.pem
 

+ 10 - 10
docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.4'
 services:
   ejabberd:
-    image: ejabberd/ecs:22.05
+    image: ejabberd/ecs:24.02
     container_name: ejabberd
     hostname: ${HOSTNAME}
     mem_limit: 512m
@@ -23,12 +23,12 @@ services:
     entrypoint: /home/ejabberd/entrypoint.sh
     command: foreground
 
-    healthcheck:
+#    healthcheck:
 #      test: ["CMD", "nc", "-z", "ejabberd:5347"]
-      test: /home/ejabberd/bin/ejabberdctl status | grep -q started
-      interval: 15s #interval for the first and subsequent checks
-      timeout: 10s
-      retries: 3
+#      test: /home/ejabberd/bin/ejabberdctl status | grep -q started
+#      interval: 15s #interval for the first and subsequent checks
+#      timeout: 10s
+#      retries: 3
     
     volumes:
       - ./entrypoint.sh:/home/ejabberd/entrypoint.sh:ro
@@ -61,12 +61,12 @@ services:
                         proxy.${HOSTNAME},
                         push.${HOSTNAME}
       LETSENCRYPT_EMAIL: webmaster@${HOSTNAME}
-      ACME_POST_HOOK: chmod a+r /etc/nginx/certs/${HOSTNAME}/key.pem
+      ACME_POST_HOOK: install --owner=9000 --group=9000 --mode=500 --preserve-timestamps /etc/nginx/certs/${HOSTNAME}/key.pem /etc/nginx/certs/${HOSTNAME}/ejabberd-key.pem
 
     networks:
       - reverse-proxy_default
       - irc
-      - db_default
+#      - db_default
 
   biboumi:
     image: louiz/biboumi:9.0
@@ -78,8 +78,8 @@ services:
       - 113:8113  #identd, used by irc servers to differentiate user coming from one host#
 
     depends_on:
-      ejabberd:
-        condition: service_healthy
+      - ejabberd
+#        condition: service_healthy
 
     volumes:
       - ./data/biboumi/database/:/var/lib/biboumi/