From 8dfc8f8eac20b2a715bb715b9e670aef6cb27b8c Mon Sep 17 00:00:00 2001 From: RATDAD Date: Sun, 15 Feb 2026 16:34:03 -0500 Subject: Updated DAViS container template --- stacks/dav/.davis.env.template | 60 ---------------------------------------- stacks/dav/.db.env.template | 3 -- stacks/dav/.env.template | 17 +++++++----- stacks/dav/.gitignore | 2 +- stacks/dav/.run.env.template | 63 ++++++++++++++++++++++++++++++++++++++++++ stacks/dav/compose.yml | 42 ++++++++++++++-------------- 6 files changed, 95 insertions(+), 92 deletions(-) delete mode 100644 stacks/dav/.davis.env.template delete mode 100644 stacks/dav/.db.env.template create mode 100644 stacks/dav/.run.env.template diff --git a/stacks/dav/.davis.env.template b/stacks/dav/.davis.env.template deleted file mode 100644 index 67d9a7e..0000000 --- a/stacks/dav/.davis.env.template +++ /dev/null @@ -1,60 +0,0 @@ -# -# -# DAViS Environment Variables - -# General settings -APP_ENV=prod # or dev -CALDAV_ENABLED=true -CARDDAV_ENABLED=true -WEBDAV_ENABLED=false -PUBLIC_CALENDARS_ENABLED=true -BIRTHDAY_REMINDER_OFFSET=PT9H -APP_TIMEZONE=America/New_York -LOG_FILE_PATH="%kernel.logs_dir%/%kernel.environment%.log" - -# Database -DATABASE_DRIVER=postgresql -DB_DATABASE=davis -DB_USER=davis_user -DB_PASSWORD=davis_password -DATABASE_URL=${DATABASE_DRIVER}://${DB_USER}:${DB_PASSWORD}@${_DB_CONTAINER}:5432/${DB_DATABASE}?serverVersion=15&charset=UTF-8 - -# For the Davis admin interface -ADMIN_LOGIN=admin -ADMIN_PASSWORD=admin -ADMIN_AUTH_BYPASS=false - -# DAV auth settings -AUTH_METHOD=Basic # Basic or IMAP or LDAP - -# Basic HTTP auth settings -AUTH_REALM=SabreDAV - -# IMAP auth settings -# IMAP_AUTH_URL=imap.mydomain.com:993 -# IMAP_ENCRYPTION_METHOD=ssl -# IMAP_CERTIFICATE_VALIDATION=true -# IMAP_AUTH_USER_AUTOCREATE=false - -# LDAP auth settings -# LDAP_AUTH_URL=ldap://127.0.0.1:3890 -# LDAP_DN_PATTERN=uid=%u,ou=users,dc=domain,dc=com -# LDAP_MAIL_ATTRIBUTE=mail -# LDAP_AUTH_USER_AUTOCREATE=false -# LDAP_CERTIFICATE_CHECKING_STRATEGY=try # never, hard, demand, try, or allow - -# WebDAV settings -WEBDAV_TMP_DIR=/webdav/tmp -WEBDAV_PUBLIC_DIR=/webdav/public -WEBDAV_HOMES_DIR= - -# Mail settings -# INVITE_FROM_ADDRESS=no-reply@example.org -# MAIL_HOST=smtp.myprovider.com -# MAIL_PORT=587 -# MAIL_USERNAME=userdav -# MAIL_PASSWORD=test -# MAILER_DSN=smtp://${MAIL_USERNAME}:${MAIL_PASSWORD}@${MAIL_HOST}:${MAIL_PORT} - -# Trust the immediate proxy for X-Forwarded-* headers including HTTPS detection -SYMFONY_TRUSTED_PROXIES=REMOTE_ADDR diff --git a/stacks/dav/.db.env.template b/stacks/dav/.db.env.template deleted file mode 100644 index bd9bc9e..0000000 --- a/stacks/dav/.db.env.template +++ /dev/null @@ -1,3 +0,0 @@ -POSTGRES_PASSWORD=${DB_PASSWORD} -POSTGRES_DB=${DB_DATABASE} -POSTGRES_USER=${DB_USER} diff --git a/stacks/dav/.env.template b/stacks/dav/.env.template index 2183497..d84f2b0 100644 --- a/stacks/dav/.env.template +++ b/stacks/dav/.env.template @@ -2,13 +2,16 @@ # # Stack Compose Variables -# Namespace -_STACK= -_CONTAINER= -_DB_CONTAINER= +# Namespaces +_STACK_0= -# Network -_NET= +# Containers +_CONTAINER_0= +_CONTAINER_1= + +# Networks +_NET_0= +_NET_1= # Volumes -# _DB_VOLUME= +_VOLUME_0= diff --git a/stacks/dav/.gitignore b/stacks/dav/.gitignore index 375a3dd..e6c78b8 100644 --- a/stacks/dav/.gitignore +++ b/stacks/dav/.gitignore @@ -2,4 +2,4 @@ *.env .database/ .database/** -compose.local.yml +compose.test.yml diff --git a/stacks/dav/.run.env.template b/stacks/dav/.run.env.template new file mode 100644 index 0000000..6ef4bc3 --- /dev/null +++ b/stacks/dav/.run.env.template @@ -0,0 +1,63 @@ +# +# +# DAViS Environment Variables + +# General settings +APP_ENV=prod # or dev +CALDAV_ENABLED=true +CARDDAV_ENABLED=true +WEBDAV_ENABLED=false +PUBLIC_CALENDARS_ENABLED=true +BIRTHDAY_REMINDER_OFFSET=PT9H +APP_TIMEZONE=America/New_York +LOG_FILE_PATH="%kernel.logs_dir%/%kernel.environment%.log" + +# Database +POSTGRES_PASSWORD= +POSTGRES_DB= +POSTGRES_USER= +DATABASE_DRIVER=postgresql +DB_DATABASE=${POSTGRES_DB} +DB_USER=${POSTGRES_USER} +DB_PASSWORD=${POSTGRES_PASSWORD} +DATABASE_URL=${DATABASE_DRIVER}://${DB_USER}:${DB_PASSWORD}@${_DB_CONTAINER}:5432/${DB_DATABASE}?serverVersion=15&charset=UTF-8 + +# For the Davis admin interface +ADMIN_LOGIN=admin +ADMIN_PASSWORD=admin +ADMIN_AUTH_BYPASS=false + +# DAV auth settings +AUTH_METHOD=Basic # Basic or IMAP or LDAP + +# Basic HTTP auth settings +AUTH_REALM=SabreDAV + +# IMAP auth settings +# IMAP_AUTH_URL=imap.mydomain.com:993 +# IMAP_ENCRYPTION_METHOD=ssl +# IMAP_CERTIFICATE_VALIDATION=true +# IMAP_AUTH_USER_AUTOCREATE=false + +# LDAP auth settings +# LDAP_AUTH_URL=ldap://127.0.0.1:3890 +# LDAP_DN_PATTERN=uid=%u,ou=users,dc=domain,dc=com +# LDAP_MAIL_ATTRIBUTE=mail +# LDAP_AUTH_USER_AUTOCREATE=false +# LDAP_CERTIFICATE_CHECKING_STRATEGY=try # never, hard, demand, try, or allow + +# WebDAV settings +WEBDAV_TMP_DIR=/webdav/tmp +WEBDAV_PUBLIC_DIR=/webdav/public +WEBDAV_HOMES_DIR= + +# Mail settings +# INVITE_FROM_ADDRESS=no-reply@example.org +# MAIL_HOST=smtp.myprovider.com +# MAIL_PORT=587 +# MAIL_USERNAME=userdav +# MAIL_PASSWORD=test +# MAILER_DSN=smtp://${MAIL_USERNAME}:${MAIL_PASSWORD}@${MAIL_HOST}:${MAIL_PORT} + +# Trust the immediate proxy for X-Forwarded-* headers including HTTPS detection +SYMFONY_TRUSTED_PROXIES=REMOTE_ADDR diff --git a/stacks/dav/compose.yml b/stacks/dav/compose.yml index fdc5b23..42d254f 100644 --- a/stacks/dav/compose.yml +++ b/stacks/dav/compose.yml @@ -1,34 +1,23 @@ -name: ${_STACK} +name: ${_STACK_0} networks: - net: - name: ${_NET} + edge-net: + name: ${_NET_0} external: true - intra: + db-net: + name: ${_NET_1} volumes: - data: - name: ${_DB_DATA_VOLUME} + dav-db: + name: ${_VOLUME_0} external: true services: - db: - container_name: ${_DB_CONTAINER} # Required for now. - image: postgres:16-alpine - networks: - - intra - env_file: - - .env - - .davis.env - - .db.env - volumes: - - data:/var/lib/postgresql/data - - davis: - container_name: ${_CONTAINER} + dav: + container_name: ${_CONTAINER_0} image: ghcr.io/tchapi/davis-standalone:latest env_file: - - .davis.env + - .run.env - .env networks: - net @@ -37,3 +26,14 @@ services: - 9000 depends_on: - db + dav-db: + container_name: ${_CONTAINER_1} # Required for now. + image: postgres:16 + networks: + - edge-net + - db-net + env_file: + - .run.env + - .env + volumes: + - dav-db:/var/lib/postgresql/data -- cgit v1.2.3-70-g09d2