Update Installation

2024-05-26 07:17:13 +00:00 · 2024-05-26 07:17:13 +00:00 · 003f84a012
commit 003f84a012
parent fee520c3f4
1 changed files with 78 additions and 79 deletions
--- a/Installation.md
+++ b/Installation.md
@ -89,67 +89,67 @@ You can name it anything you like, and typically they have an extension of `.yml

 Make adjustments as appropriate.

-```plaintext
-version: "3.5"
-
+```yml
 services:
-  web:
-    image: gitea.dege.au/bbs/clrghouz
+    image: ${IMAGE:-gitea.dege.au/bbs/clrghouz}
    #cap_add:
-    # SYS_ADMIN
-    # NET_ADMIN
-    # NET_RAW
+    #- SYS_ADMIN
+    #- NET_ADMIN
+    #- NET_RAW
    depends_on:
    - postgres
    deploy:
      resources:
        limits:
-          memory: 512M
+          memory: 768M
    #devices:
-    # /dev/net/tun
+    #- /dev/net/tun
    environment:
-      APP_KEY: [APP_KEY]
-      APP_TIMEZONE: Australia/Melbourne
-      APP_URL: https://clrghouz.test.dege.au/
-      AWS_ACCESS_KEY_ID: "[MINIO_ACCESS_KEY]"
-      AWS_SECRET_ACCESS_KEY: "[MINIO_SECRET_KEY]"
-      AWS_ENDPOINT: http://minio:9000/
-      AWS_BUCKET: clrghouz
-      DB_PASSWORD: "[DB_PASSWORD]"
-      FIDO_PACKET_KEEP: "true"
-      FIDO_HAPROXY: "false"
-      LOG_LEVEL: info
-      MAIL_FROM_ADDRESS: your@email.address
-      MAIL_FROM_NAME: "YOUR NAME"
-      MEMCACHED_START: "TRUE"
-      #ZEROTIER_START: "false"
+      APP_KEY: ${APP_KEY}
+      APP_TIMEZONE: ${APP_TIMEZONE:-Australia/Melbourne}
+      APP_URL: https://${WEB_HOSTNAME}/
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      AWS_ENDPOINT: ${AWS_ENDPOINT}
+      AWS_BUCKET: ${AWS_BUCKET:-clrghouz}
+      DB_DATABASE: ${DB_DATABASE:-laravel}
+      DB_USERNAME: ${DB_USERNAME:-laravel}
+      DB_PASSWORD: ${DB_PASSWORD}
+      FIDO_DNS_NS: hap-1-3.dege.au
+      FIDO_PACKET_KEEP: ${FIDO_PACKET_KEEP:-"TRUE"}
+      FIDO_HAPROXY: ${FIDO_HAPROXY:-"TRUE"}
+      LOG_LEVEL: ${LOG_LEVEL:-info}
+      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS}
+      MAIL_FROM_NAME: ${MAIL_FROM_NAME}
+      MEMCACHED_START: ${MEMCACHED_START:-"FALSE"}
+      ZEROTIER_START: ${ZEROTIER_START:-"FALSE"}
    networks:
      default:
      public:
-        ipv6_address: [IPv6_PREFIX]:0d0c:100::2
+        ipv6_address: ${IP6_PREFIX}:${IP6_SUFFIX}::2
        aliases:
          - clrghouz
-    hostname: clrghouz.test.dege.au
+    hostname: ${WEB_HOSTNAME}
    ports:
    - 53:53/udp
    #- 80:80
-    #- 24554:24554
+    #- 124554:24554
    #- 60179:60179
    sysctls:
    - "net.ipv6.conf.all.disable_ipv6=0"
    volumes:
-    - /srv/docker/clrghouz/app/cache:/var/www/html/storage/framework/cache/data
-    - /srv/docker/clrghouz/app/sessions:/var/www/html/storage/framework/sessions
-    - /srv/docker/clrghouz/app/logs:/var/www/html/storage/logs
-    - /srv/docker/clrghouz/app/data:/var/www/html/data
-    - /srv/docker/clrghouz/app/fido:/var/www/html/storage/app/fido
-    # /srv/docker/clrghouz/zerotier:/var/lib/zerotier-one
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/cache:/var/www/html/storage/framework/cache/data
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/sessions:/var/www/html/storage/framework/sessions
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/logs:/var/www/html/storage/logs
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/data:/var/www/html/data
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/fido:/var/www/html/storage/app/fido
+    #- ${VOL_PREFIX:-/srv/docker/clrghouz}/zerotier:/var/lib/zerotier-one

  queue:
-    image: gitea.dege.au/bbs/clrghouz
+    image: ${IMAGE:-gitea.dege.au/bbs/clrghouz}
    #cap_add:
-    # SYS_ADMIN
-    # NET_ADMIN
+    #- SYS_ADMIN
+    #- NET_ADMIN
    depends_on:
    - postgres
    deploy:
@ -158,56 +158,55 @@ services:
        limits:
          memory: 512M
    #devices:
-    # /dev/net/tun
+    #- /dev/net/tun
    environment:
-      APP_KEY: [APP_KEY]
-      APP_TIMEZONE: Australia/Melbourne
-      APP_URL: https://clrghouz.test.dege.au/
-      AWS_ACCESS_KEY_ID: "[MINIO_ACCESS_KEY]"
-      AWS_SECRET_ACCESS_KEY: "[MINIO_SECRET_KEY]"
-      AWS_ENDPOINT: http://minio:9000/
-      AWS_BUCKET: clrghouz
-      CACHE_DRIVER: file
+      APP_KEY: ${APP_KEY}
+      APP_TIMEZONE: ${APP_TIMEZONE:-Australia/Melbourne}
+      APP_URL: https://${WEB_HOSTNAME}/
+      AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
+      AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
+      AWS_ENDPOINT: ${AWS_ENDPOINT}
+      AWS_BUCKET: ${AWS_BUCKET:-clrghouz}
      CONTAINER_ROLE: queue
-      DB_PASSWORD: "[DB_PASSWORD]"
-      LOG_LEVEL: info
-      MAIL_FROM_ADDRESS: your@email.address
-      MAIL_FROM_NAME: "YOUR NAME"
-      WORK_QUEUES: default,poll,tic
+      DB_DATABASE: ${DB_DATABASE:-laravel}
+      DB_USERNAME: ${DB_USERNAME:-laravel}
+      DB_PASSWORD: ${DB_PASSWORD}
+      FIDO_PACKET_KEEP: ${FIDO_PACKET_KEEP:-"TRUE"}
+      LOG_LEVEL: ${LOG_LEVEL:-info}
+      MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS}
+      MAIL_FROM_NAME: ${MAIL_FROM_NAME}
+      WORK_QUEUES: default,poll,mail,tic
      WORK_TIMEOUT: 900
-      #ZEROTIER_START: "false"
+      ZEROTIER_START: ${ZEROTIER_START:-"FALSE"}
    networks:
      default:
      public:
-        ipv6_address: [IPv6_PREFIX]:0d0c:100::3
+        ipv6_address: ${IP6_PREFIX}:${IP6_SUFFIX}::3
    sysctls:
    - "net.ipv6.conf.all.disable_ipv6=0"
    volumes:
-    - /srv/docker/clrghouz/app/logs:/var/www/html/storage/logs
-    - /srv/docker/clrghouz/app/fido:/var/www/html/storage/app/fido
-    # /srv/docker/clrghouz/zerotier.queue:/var/lib/zerotier-one
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/logs:/var/www/html/storage/logs
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/fido:/var/www/html/storage/app/fido
+    #- ${VOL_PREFIX:-/srv/docker/clrghouz}/zerotier.queue:/var/lib/zerotier-one

  schedule:
-    image: gitea.dege.au/bbs/clrghouz
+    image: ${IMAGE:-gitea.dege.au/bbs/clrghouz}
    deploy:
-      replicas: 1
      resources:
        limits:
          memory: 128M
    depends_on:
    - postgres
    environment:
-      APP_KEY: [APP_KEY]
-      APP_TIMEZONE: Australia/Melbourne
-      APP_URL: https://clrghouz.test.dege.au/
-      CACHE_DRIVER: file
+      APP_KEY: ${APP_KEY}
+      APP_TIMEZONE: ${APP_TIMEZONE:-Australia/Melbourne}
      CONTAINER_ROLE: scheduler
-      DB_PASSWORD: "[DB_PASSWORD]"
-    networks:
-      default:
+      DB_DATABASE: ${DB_DATABASE:-laravel}
+      DB_USERNAME: ${DB_USERNAME:-laravel}
+      DB_PASSWORD: ${DB_PASSWORD}
+      LOG_LEVEL: ${LOG_LEVEL:-info}
    volumes:
-    - /srv/docker/clrghouz/app/logs:/var/www/html/storage/logs
-    - /srv/docker/clrghouz/app/fido:/var/www/html/storage/app/fido
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/logs:/var/www/html/storage/logs

  memcached:
    image: memcached:alpine
@ -218,7 +217,7 @@ services:
          memory: 512M
    stop_signal: SIGUSR1
    volumes:
-    - /srv/docker/clrghouz/memcached:/memcached
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/memcached:/memcached

  postgres:
    image: postgres:15-alpine
@ -227,17 +226,17 @@ services:
        limits:
          memory: 512M
    environment:
-      POSTGRES_DB: clrghouz
-      POSTGRES_USER: clrghouz
-      POSTGRES_PASSWORD: "[DB_PASSWORD]"
+      POSTGRES_DB: ${DB_DATABASE:-laravel}
+      POSTGRES_USER: ${DB_USERNAME-laravel}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
    networks:
      default:
    #labels:
    #  cron.container.daily: "root#pg_dumpall -U clrghouz#S3_BUCKET=restic.docker restic -q --no-cache backup --stdin --stdin-filename docker-clrghouz-database"
-    #  backup.stack.daily: "/srv/docker/clrghouz"
+    #  backup.stack.daily: "${VOL_PREFIX:-/srv/docker/clrghouz}"
    shm_size: 1g
    volumes:
-    - /srv/docker/clrghouz/postgres:/var/lib/postgresql/data
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/postgres:/var/lib/postgresql/data

  minio:
    image: tobi312/minio
@ -256,7 +255,7 @@ services:
    ports:
    - 9001:9001 # Console
    volumes:
-    - /srv/docker/clrghouz/minio:/data
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/minio:/data

  haproxy:
    image: haproxy:alpine
@ -271,7 +270,7 @@ services:
    networks:
      default:
      public:
-        ipv6_address: [IPv6_PREFIX]:0d0c:100::f
+        ipv6_address: ${IP6_PREFIX}:${IP6_SUFFIX}::f
    ports:
    - "24553:24553"
    - "24554:24554"
@ -280,8 +279,8 @@ services:
    - "80:80"
    - "443:443"
    volumes:
-    - /srv/docker/clrghouz/haproxy:/usr/local/etc/haproxy/config
-    - /srv/docker/clrghouz/nginx/ssl/:/usr/local/etc/haproxy/ssl
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/haproxy:/usr/local/etc/haproxy/config
+    - ${VOL_PREFIX:-/srv/docker/clrghouz}/nginx/ssl/:/usr/local/etc/haproxy/ssl

 networks:
  public:
@ -292,8 +291,8 @@ networks:
    ipam:
      driver: default
      config:
-      - subnet: [IPv6_PREFIX]:0d0c:100::/96
-        gateway: [IPv6_PREFIX]:0d0c:100::1
+      - subnet: ${IP6_PREFIX}:${IP6_SUFFIX}::/96
+        gateway: ${IP6_PREFIX}:${IP6_SUFFIX}::1
 ```

 _NOTES:_