Update Installation

deon 2024-05-26 07:17:13 +00:00
parent fee520c3f4
commit 003f84a012

@ -89,67 +89,67 @@ You can name it anything you like, and typically they have an extension of `.yml
Make adjustments as appropriate. Make adjustments as appropriate.
```plaintext ```yml
version: "3.5"
services: services:
web: image: ${IMAGE:-gitea.dege.au/bbs/clrghouz}
image: gitea.dege.au/bbs/clrghouz
#cap_add: #cap_add:
# SYS_ADMIN #- SYS_ADMIN
# NET_ADMIN #- NET_ADMIN
# NET_RAW #- NET_RAW
depends_on: depends_on:
- postgres - postgres
deploy: deploy:
resources: resources:
limits: limits:
memory: 512M memory: 768M
#devices: #devices:
# /dev/net/tun #- /dev/net/tun
environment: environment:
APP_KEY: [APP_KEY] APP_KEY: ${APP_KEY}
APP_TIMEZONE: Australia/Melbourne APP_TIMEZONE: ${APP_TIMEZONE:-Australia/Melbourne}
APP_URL: https://clrghouz.test.dege.au/ APP_URL: https://${WEB_HOSTNAME}/
AWS_ACCESS_KEY_ID: "[MINIO_ACCESS_KEY]" AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
AWS_SECRET_ACCESS_KEY: "[MINIO_SECRET_KEY]" AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
AWS_ENDPOINT: http://minio:9000/ AWS_ENDPOINT: ${AWS_ENDPOINT}
AWS_BUCKET: clrghouz AWS_BUCKET: ${AWS_BUCKET:-clrghouz}
DB_PASSWORD: "[DB_PASSWORD]" DB_DATABASE: ${DB_DATABASE:-laravel}
FIDO_PACKET_KEEP: "true" DB_USERNAME: ${DB_USERNAME:-laravel}
FIDO_HAPROXY: "false" DB_PASSWORD: ${DB_PASSWORD}
LOG_LEVEL: info FIDO_DNS_NS: hap-1-3.dege.au
MAIL_FROM_ADDRESS: your@email.address FIDO_PACKET_KEEP: ${FIDO_PACKET_KEEP:-"TRUE"}
MAIL_FROM_NAME: "YOUR NAME" FIDO_HAPROXY: ${FIDO_HAPROXY:-"TRUE"}
MEMCACHED_START: "TRUE" LOG_LEVEL: ${LOG_LEVEL:-info}
#ZEROTIER_START: "false" MAIL_FROM_ADDRESS: ${MAIL_FROM_ADDRESS}
MAIL_FROM_NAME: ${MAIL_FROM_NAME}
MEMCACHED_START: ${MEMCACHED_START:-"FALSE"}
ZEROTIER_START: ${ZEROTIER_START:-"FALSE"}
networks: networks:
default: default:
public: public:
ipv6_address: [IPv6_PREFIX]:0d0c:100::2 ipv6_address: ${IP6_PREFIX}:${IP6_SUFFIX}::2
aliases: aliases:
- clrghouz - clrghouz
hostname: clrghouz.test.dege.au hostname: ${WEB_HOSTNAME}
ports: ports:
- 53:53/udp - 53:53/udp
#- 80:80 #- 80:80
#- 24554:24554 #- 124554:24554
#- 60179:60179 #- 60179:60179
sysctls: sysctls:
- "net.ipv6.conf.all.disable_ipv6=0" - "net.ipv6.conf.all.disable_ipv6=0"
volumes: volumes:
- /srv/docker/clrghouz/app/cache:/var/www/html/storage/framework/cache/data - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/cache:/var/www/html/storage/framework/cache/data
- /srv/docker/clrghouz/app/sessions:/var/www/html/storage/framework/sessions - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/sessions:/var/www/html/storage/framework/sessions
- /srv/docker/clrghouz/app/logs:/var/www/html/storage/logs - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/logs:/var/www/html/storage/logs
- /srv/docker/clrghouz/app/data:/var/www/html/data - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/data:/var/www/html/data
- /srv/docker/clrghouz/app/fido:/var/www/html/storage/app/fido - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/fido:/var/www/html/storage/app/fido
# /srv/docker/clrghouz/zerotier:/var/lib/zerotier-one #- ${VOL_PREFIX:-/srv/docker/clrghouz}/zerotier:/var/lib/zerotier-one
queue: queue:
image: gitea.dege.au/bbs/clrghouz image: ${IMAGE:-gitea.dege.au/bbs/clrghouz}
#cap_add: #cap_add:
# SYS_ADMIN #- SYS_ADMIN
# NET_ADMIN #- NET_ADMIN
depends_on: depends_on:
- postgres - postgres
deploy: deploy:
@ -158,56 +158,55 @@ services:
limits: limits:
memory: 512M memory: 512M
#devices: #devices:
# /dev/net/tun #- /dev/net/tun
environment: environment:
APP_KEY: [APP_KEY] APP_KEY: ${APP_KEY}
APP_TIMEZONE: Australia/Melbourne APP_TIMEZONE: ${APP_TIMEZONE:-Australia/Melbourne}
APP_URL: https://clrghouz.test.dege.au/ APP_URL: https://${WEB_HOSTNAME}/
AWS_ACCESS_KEY_ID: "[MINIO_ACCESS_KEY]" AWS_ACCESS_KEY_ID: ${AWS_ACCESS_KEY_ID}
AWS_SECRET_ACCESS_KEY: "[MINIO_SECRET_KEY]" AWS_SECRET_ACCESS_KEY: ${AWS_SECRET_ACCESS_KEY}
AWS_ENDPOINT: http://minio:9000/ AWS_ENDPOINT: ${AWS_ENDPOINT}
AWS_BUCKET: clrghouz AWS_BUCKET: ${AWS_BUCKET:-clrghouz}
CACHE_DRIVER: file
CONTAINER_ROLE: queue CONTAINER_ROLE: queue
DB_PASSWORD: "[DB_PASSWORD]" DB_DATABASE: ${DB_DATABASE:-laravel}
LOG_LEVEL: info DB_USERNAME: ${DB_USERNAME:-laravel}
MAIL_FROM_ADDRESS: your@email.address DB_PASSWORD: ${DB_PASSWORD}
MAIL_FROM_NAME: "YOUR NAME" FIDO_PACKET_KEEP: ${FIDO_PACKET_KEEP:-"TRUE"}
WORK_QUEUES: default,poll,tic 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 WORK_TIMEOUT: 900
#ZEROTIER_START: "false" ZEROTIER_START: ${ZEROTIER_START:-"FALSE"}
networks: networks:
default: default:
public: public:
ipv6_address: [IPv6_PREFIX]:0d0c:100::3 ipv6_address: ${IP6_PREFIX}:${IP6_SUFFIX}::3
sysctls: sysctls:
- "net.ipv6.conf.all.disable_ipv6=0" - "net.ipv6.conf.all.disable_ipv6=0"
volumes: volumes:
- /srv/docker/clrghouz/app/logs:/var/www/html/storage/logs - ${VOL_PREFIX:-/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/fido:/var/www/html/storage/app/fido
# /srv/docker/clrghouz/zerotier.queue:/var/lib/zerotier-one #- ${VOL_PREFIX:-/srv/docker/clrghouz}/zerotier.queue:/var/lib/zerotier-one
schedule: schedule:
image: gitea.dege.au/bbs/clrghouz image: ${IMAGE:-gitea.dege.au/bbs/clrghouz}
deploy: deploy:
replicas: 1
resources: resources:
limits: limits:
memory: 128M memory: 128M
depends_on: depends_on:
- postgres - postgres
environment: environment:
APP_KEY: [APP_KEY] APP_KEY: ${APP_KEY}
APP_TIMEZONE: Australia/Melbourne APP_TIMEZONE: ${APP_TIMEZONE:-Australia/Melbourne}
APP_URL: https://clrghouz.test.dege.au/
CACHE_DRIVER: file
CONTAINER_ROLE: scheduler CONTAINER_ROLE: scheduler
DB_PASSWORD: "[DB_PASSWORD]" DB_DATABASE: ${DB_DATABASE:-laravel}
networks: DB_USERNAME: ${DB_USERNAME:-laravel}
default: DB_PASSWORD: ${DB_PASSWORD}
LOG_LEVEL: ${LOG_LEVEL:-info}
volumes: volumes:
- /srv/docker/clrghouz/app/logs:/var/www/html/storage/logs - ${VOL_PREFIX:-/srv/docker/clrghouz}/app/logs:/var/www/html/storage/logs
- /srv/docker/clrghouz/app/fido:/var/www/html/storage/app/fido
memcached: memcached:
image: memcached:alpine image: memcached:alpine
@ -218,7 +217,7 @@ services:
memory: 512M memory: 512M
stop_signal: SIGUSR1 stop_signal: SIGUSR1
volumes: volumes:
- /srv/docker/clrghouz/memcached:/memcached - ${VOL_PREFIX:-/srv/docker/clrghouz}/memcached:/memcached
postgres: postgres:
image: postgres:15-alpine image: postgres:15-alpine
@ -227,17 +226,17 @@ services:
limits: limits:
memory: 512M memory: 512M
environment: environment:
POSTGRES_DB: clrghouz POSTGRES_DB: ${DB_DATABASE:-laravel}
POSTGRES_USER: clrghouz POSTGRES_USER: ${DB_USERNAME-laravel}
POSTGRES_PASSWORD: "[DB_PASSWORD]" POSTGRES_PASSWORD: ${DB_PASSWORD}
networks: networks:
default: default:
#labels: #labels:
# cron.container.daily: "root#pg_dumpall -U clrghouz#S3_BUCKET=restic.docker restic -q --no-cache backup --stdin --stdin-filename docker-clrghouz-database" # 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 shm_size: 1g
volumes: volumes:
- /srv/docker/clrghouz/postgres:/var/lib/postgresql/data - ${VOL_PREFIX:-/srv/docker/clrghouz}/postgres:/var/lib/postgresql/data
minio: minio:
image: tobi312/minio image: tobi312/minio
@ -256,7 +255,7 @@ services:
ports: ports:
- 9001:9001 # Console - 9001:9001 # Console
volumes: volumes:
- /srv/docker/clrghouz/minio:/data - ${VOL_PREFIX:-/srv/docker/clrghouz}/minio:/data
haproxy: haproxy:
image: haproxy:alpine image: haproxy:alpine
@ -271,7 +270,7 @@ services:
networks: networks:
default: default:
public: public:
ipv6_address: [IPv6_PREFIX]:0d0c:100::f ipv6_address: ${IP6_PREFIX}:${IP6_SUFFIX}::f
ports: ports:
- "24553:24553" - "24553:24553"
- "24554:24554" - "24554:24554"
@ -280,8 +279,8 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
- /srv/docker/clrghouz/haproxy:/usr/local/etc/haproxy/config - ${VOL_PREFIX:-/srv/docker/clrghouz}/haproxy:/usr/local/etc/haproxy/config
- /srv/docker/clrghouz/nginx/ssl/:/usr/local/etc/haproxy/ssl - ${VOL_PREFIX:-/srv/docker/clrghouz}/nginx/ssl/:/usr/local/etc/haproxy/ssl
networks: networks:
public: public:
@ -292,8 +291,8 @@ networks:
ipam: ipam:
driver: default driver: default
config: config:
- subnet: [IPv6_PREFIX]:0d0c:100::/96 - subnet: ${IP6_PREFIX}:${IP6_SUFFIX}::/96
gateway: [IPv6_PREFIX]:0d0c:100::1 gateway: ${IP6_PREFIX}:${IP6_SUFFIX}::1
``` ```
_NOTES:_ _NOTES:_