From ae5b8331e46235d9da405668137256bfb57fec5d Mon Sep 17 00:00:00 2001 From: brooke Date: Thu, 13 Feb 2025 16:52:24 -0500 Subject: [PATCH] setup zulip config file --- abra.sh | 1 + compose.yml | 11 ++++++++--- zulip.conf.tmpl | 12 ++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 zulip.conf.tmpl diff --git a/abra.sh b/abra.sh index d4d0159..7588be1 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,5 @@ export ENTRYPOINT_VERSION=v1 +export ZULIP_CONF_VERSION=v1 export PG_BACKUP_VERSION=v1 export MEM_ENTRYPOINT_VERSION=v1 export REDIS_ENTRYPOINT_VERSION=v1 diff --git a/compose.yml b/compose.yml index 274b8bc..2a83400 100644 --- a/compose.yml +++ b/compose.yml @@ -9,6 +9,8 @@ services: - source: entrypoint target: /custom-entrypoint.sh mode: 0555 + - source: zulip-conf + target: /etc/zulip/zulip.conf entrypoint: /custom-entrypoint.sh command: - "app:run" @@ -48,9 +50,8 @@ services: labels: - "traefik.enable=true" - "traefik.docker.network=proxy" - - "traefik.http.services.${STACK_NAME}.loadbalancer.server.scheme=https" - - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=443" - - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" + - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80" + - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "coop-cloud.${STACK_NAME}.version=0.1.0+9.4-0" @@ -176,6 +177,9 @@ configs: name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION} file: entrypoint.sh.tmpl template_driver: golang + zulip-conf: + name: ${STACK_NAME}_zulip-conf_${ZULIP_CONF_VERSION} + file: zulip.conf.tmpl memcached_entrypoint: name: ${STACK_NAME}_memcached_entrypoint_${MEM_ENTRYPOINT_VERSION} file: entrypoint.memcached.sh.tmpl @@ -197,6 +201,7 @@ configs: volumes: zulip: + zulip_conf: db: rabbitmq: redis: diff --git a/zulip.conf.tmpl b/zulip.conf.tmpl new file mode 100644 index 0000000..02a5519 --- /dev/null +++ b/zulip.conf.tmpl @@ -0,0 +1,12 @@ +[machine] +puppet_classes = zulip::profile::docker +deploy_type = production + +[postgresql] +version = 14 + +[application_server] +http_only = true + +[loadbalancer] +ips = 10.0.0.0/24 \ No newline at end of file