From aafb0a4126d69e7b6ff95d7645d97c7f3082bafa Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Thu, 7 Jul 2022 00:20:05 +1000
Subject: [PATCH] update to postgres 14, added ark-server, and grabbed
 autodiscover server, but not implemented it yet, so its commented out

---
 docker-compose.yml | 79 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 75 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 590ec27..546ff74 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -425,6 +425,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.hass.rule=Host(`hass.depaoli.id.au`)"
       - "traefik.http.routers.hass.tls=true"
+      - "traefik.http.routers.hass.tls.options=tls12@file"
       - "traefik.http.routers.hass.entrypoints=secureweb"
     ports:
       - "8123:8123"
@@ -606,7 +607,7 @@ services:
 
   bookdb_dev:
     container_name: bookdb_dev
-    image: postgres:13
+    image: postgres:latest
     restart: always
     environment:
       POSTGRES_PASSWORD: blahdeblah
@@ -624,7 +625,7 @@ services:
 
   bookdb:
     container_name: bookdb
-    image: postgres:13
+    image: postgres:latest
     restart: always
     environment:
       POSTGRES_PASSWORD: blahdeblah
@@ -658,7 +659,7 @@ services:
 
   padb_dev:
     container_name: padb_dev
-    image: postgres:13
+    image: postgres:latest
     restart: always
     environment:
       POSTGRES_PASSWORD: for_now_pa
@@ -676,7 +677,7 @@ services:
 
   padb:
     container_name: padb
-    image: postgres:13
+    image: postgres:latest
     restart: always
     environment:
       POSTGRES_PASSWORD: for_now_pa
@@ -726,6 +727,7 @@ services:
       - "traefik.enable=true"
       - "traefik.http.routers.bitwarden_rs.rule=Host(`bw.depaoli.id.au`) || Host(`ddphome.asuscomm.com`)"
       - "traefik.http.routers.bitwarden_rs.tls=true"
+      - "traefik.http.routers.bitwarden_rs.tls.options=tls12@file"
       - "traefik.http.routers.bitwarden_rs.entrypoints=secureweb"
 
   # auto-update docker images
@@ -839,3 +841,72 @@ services:
       - pihole
     volumes:
       - "/etc/localtime:/etc/localtime:ro"
+
+#  autodiscover:
+#    image: monogramm/autodiscover-email-settings:latest
+#    container_name: autodiscover
+#    environment:
+#      - COMPANY_NAME=depaoli
+#      - SUPPORT_URL=https://autodiscover.depaoli.id.au
+#      - DOMAIN=depaoli.id.au
+#      # IMAP configuration (host mandatory to enable)
+#      - IMAP_HOST=mail.depaoli.id.au
+#      - IMAP_PORT=993
+#      - IMAP_SOCKET=SSL
+#      # POP configuration (host mandatory to enable)
+#      #- POP_HOST=pop3.example.com
+#      #- POP_PORT=995
+#      #- POP_SOCKET=SSL
+#      # SMTP configuration (host mandatory to enable)
+#      - SMTP_HOST=mail.depaoli.id.au
+#      - SMTP_PORT=587
+#      - SMTP_SOCKET=STARTTLS
+#      # MobileSync/ActiveSync configuration (url mandatory to enable)
+#      #- MOBILESYNC_URL=https://sync.example.com
+#      #- MOBILESYNC_NAME=sync.example.com
+#      # LDAP configuration (host mandatory to enable)
+#      #- LDAP_HOST=ldap.example.com
+#      #- LDAP_PORT=636
+#      #- LDAP_SOCKET=SSL
+#      #- LDAP_BASE=dc=ldap,dc=example,dc=com
+#      #- LDAP_USER_FIELD=uid
+#      #- LDAP_USER_BASE=ou=People,dc=ldap,dc=example,dc=com
+#      #- LDAP_SEARCH=(|(objectClass=PostfixBookMailAccount))
+#      # Apple mobile config identifiers (identifier mandatory to enable)
+#      - PROFILE_IDENTIFIER=au.id.depaoli.autodiscover
+#      - PROFILE_UUID=92943D26-CAB3-4086-897D-DC6C0D8B1E86
+#      - MAIL_UUID=7A981A9E-D5D0-4EF8-87FE-39FD6A506FAC
+#      - LDAP_UUID=6ECB6BA9-2208-4ABF-9E60-4E9F4CD7309E
+#    labels:
+#      - "com.centurylinklabs.watchtower.enable=true"
+#      - "traefik.enable=true"
+#      - "traefik.http.routers.radarr.rule=Host(`autodiscover.depaoli.id.au`)"
+#      - "traefik.http.routers.radarr.tls=true"
+#      - "traefik.http.routers.radarr.entrypoints=secureweb"
+  ark-server:
+    restart: always
+    container_name: ark-server
+    image: hermsi/ark-server:latest
+    volumes:
+      - /srv/docker/container/ark-server:/app
+      - /srv/docker/container/ark-server-backups:/home/steam/ARK-Backups
+    environment:
+      - "SESSION_NAME=Aberration Server - ARK"
+      - "SERVER_MAP=Aberration_P"
+      - "SERVER_PASSWORD=ThisGameSucks"
+      - "ADMIN_PASSWORD=arkadminpassword"
+      - "MAX_PLAYERS=3"
+      - "UPDATE_ON_START=false"
+      - "BACKUP_ON_STOP=true"
+      - "PRE_UPDATE_BACKUP=true"
+      - "WARN_ON_STOP=true"
+      - "GAME_MOD_IDS=731604991,2182894352,821530042,1404697612,895711211"
+    ports:
+      # Port for connections from ARK game client
+      - "7777:7777/udp"
+      # Raw UDP socket port (always Game client port +1)
+      - "7778:7778/udp"
+      # RCON management port
+      - "27020:27020/tcp"
+      # Steam's server-list port
+      - "27015:27015/udp"