-
-
Notifications
You must be signed in to change notification settings - Fork 4
feat(zammad): add config to stack.yml #202
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
huzaifaedhi22
wants to merge
6
commits into
main
Choose a base branch
from
feat/zammad
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5a70cc4
feat(zammad): add config to stack.yml
huzaifaedhi22 b1d4bd4
feat(sqitch): add zammad secrets
sthelemann 809c76b
Merge pull request #204 from maevsi/feat/sqitch/zammad-secrets
huzaifaedhi22 2db82da
fix: use postgres role
huzaifaedhi22 4a73d7e
Merge branch 'main' into feat/zammad
sthelemann 8038985
feat(zammad): use x-shared section
sthelemann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,9 @@ | |
| # Vibetype | ||
| # https://github.com/maevsi/vibetype/ | ||
| --- | ||
|
|
||
| #version: "3.7" | ||
|
|
||
| secrets: | ||
| grafana_admin_email: | ||
| # The observation dashboard's admin email. | ||
|
|
@@ -100,6 +103,69 @@ secrets: | |
| vibetype_turnstile-key: | ||
| # The captcha provider's application key. | ||
| file: ./secrets/vibetype/turnstile-key.secret | ||
|
|
||
| x-shared: | ||
| zammad-service: &zammad-service | ||
| # shared environment, image, volumes | ||
| environment: &zammad-environment | ||
| MEMCACHE_SERVERS: ${MEMCACHE_SERVERS:-zammad-memcached:11211} | ||
| POSTGRESQL_DB: zammad | ||
| POSTGRESQL_HOST: postgres | ||
| POSTGRESQL_USER: zammad | ||
| POSTGRESQL_PASS: zammad | ||
| POSTGRESQL_PORT: 5432 | ||
| POSTGRESQL_OPTIONS: ${POSTGRESQL_OPTIONS:-?pool=50} | ||
| POSTGRESQL_DB_CREATE: "false" | ||
| REDIS_URL: ${REDIS_URL:-redis://zammad-redis:6379} | ||
| S3_URL: | ||
| # Backup settings | ||
| BACKUP_DIR: "${BACKUP_DIR:-/var/tmp/zammad}" | ||
| BACKUP_TIME: "${BACKUP_TIME:-03:00}" | ||
| HOLD_DAYS: "${HOLD_DAYS:-10}" | ||
| TZ: "${TZ:-Europe/Berlin}" | ||
| # Allow passing in these variables via .env: | ||
| AUTOWIZARD_JSON: | ||
| AUTOWIZARD_RELATIVE_PATH: | ||
| ELASTICSEARCH_ENABLED: | ||
| ELASTICSEARCH_SCHEMA: | ||
| ELASTICSEARCH_HOST: | ||
| ELASTICSEARCH_PORT: | ||
| ELASTICSEARCH_USER: ${ELASTICSEARCH_USER:-elastic} | ||
| ELASTICSEARCH_PASS: ${ELASTICSEARCH_PASS:-zammad} | ||
| ELASTICSEARCH_NAMESPACE: | ||
| ELASTICSEARCH_REINDEX: | ||
| NGINX_PORT: 8080 | ||
| NGINX_CLIENT_MAX_BODY_SIZE: | ||
| NGINX_SERVER_NAME: zammad.${STACK_DOMAIN} | ||
| NGINX_SERVER_SCHEME: https | ||
| RAILS_TRUSTED_PROXIES: | ||
| ZAMMAD_HTTP_TYPE: | ||
| ZAMMAD_FQDN: | ||
| ZAMMAD_WEB_CONCURRENCY: | ||
| ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS: | ||
| ZAMMAD_PROCESS_SCHEDULED_JOBS_WORKERS: | ||
| ZAMMAD_PROCESS_DELAYED_JOBS_WORKERS: | ||
| ZAMMAD_RAILSSERVER_HOST: zammad-railsserver | ||
| ZAMMAD_WEBSOCKET_HOST: zammad-websocket | ||
| # ZAMMAD_SESSION_JOBS_CONCURRENT is deprecated, please use ZAMMAD_PROCESS_SESSIONS_JOBS_WORKERS instead. | ||
| ZAMMAD_SESSION_JOBS_CONCURRENT: | ||
| # Variables used by ngingx-proxy container for reverse proxy creations | ||
| # for docs refer to https://github.com/nginx-proxy/nginx-proxy | ||
| VIRTUAL_HOST: | ||
| VIRTUAL_PORT: | ||
| # Variables used by acme-companion for retrieval of LetsEncrypt certificate | ||
| # for docs refer to https://github.com/nginx-proxy/acme-companion | ||
| LETSENCRYPT_HOST: | ||
| LETSENCRYPT_EMAIL: | ||
|
|
||
| image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.5.0-89} | ||
| volumes: | ||
| - zammad-storage:/opt/zammad/storage | ||
| depends_on: | ||
| - zammad-memcached | ||
| - postgresql | ||
| - zammad-redis | ||
|
|
||
| services: | ||
| adminer: | ||
| # You can access the database's frontend at [adminer.localhost](https://adminer.localhost/). | ||
|
|
@@ -325,7 +391,7 @@ services: | |
| POSTGRES_DB_FILE: /run/secrets/postgres_db | ||
| POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password | ||
| POSTGRES_USER_FILE: /run/secrets/postgres_user | ||
| image: postgis/postgis:17-3.5-alpine | ||
| image: imresamu/postgis:17-3.5.2-alpine3.21 | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To be reverted |
||
| ports: #DARGSTACK-REMOVE | ||
| - 5432:5432 #DARGSTACK-REMOVE | ||
| secrets: | ||
|
|
@@ -374,6 +440,7 @@ services: | |
| - postgres_user | ||
| volumes: | ||
| - ../../../reccoom/:/srv/app/ | ||
|
|
||
| redpanda: | ||
| # You can access the event streaming platform's ui as described under `redpanda-console`. | ||
| command: | ||
|
|
@@ -553,8 +620,80 @@ services: | |
| - ${PNPM_STORE_DIR}:/srv/.pnpm-store/ #DARGSTACK-REMOVE | ||
| - ./certificates/:/srv/certificates/ #DARGSTACK-REMOVE | ||
| - ../../../vibetype/:/srv/app/ #DARGSTACK-REMOVE | ||
| - ./configurations/postgraphile/jwtRS256.key.pub:/run/environment-variables/NUXT_PUBLIC_VIO_AUTH_JWT_PUBLIC_KEY:ro | ||
| version: "3.7" | ||
| - ./configurations/postgraphile/jwtRS256.key.pub:/run/environment-variables/NUXT_PUB1LIC_VIO_AUTH_JWT_PUBLIC_KEY:ro | ||
|
|
||
| zammad-backup: | ||
| # Zammad backup. | ||
| <<: *zammad-service | ||
| command: ["zammad-backup"] | ||
| volumes: | ||
| - zammad-backup:/var/tmp/zammad | ||
| - zammad-storage:/opt/zammad/storage:ro | ||
| user: 0:0 | ||
|
|
||
| zammad-elasticsearch: | ||
| # Zammad Elastisearch. | ||
| image: bitnami/elasticsearch:${ELASTICSEARCH_VERSION:-8.18.0} | ||
| volumes: | ||
| - zammad-elasticsearch-data:/bitnami/elasticsearch/data | ||
| environment: | ||
| # Enable authorization without HTTPS. For external access with | ||
| # SSL termination, use solutions like nginx-proxy-manager. | ||
| ELASTICSEARCH_ENABLE_SECURITY: 'true' | ||
| ELASTICSEARCH_SKIP_TRANSPORT_TLS: 'true' | ||
| ELASTICSEARCH_ENABLE_REST_TLS: 'false' | ||
| # ELASTICSEARCH_USER is hardcoded to 'elastic' in the container. | ||
| ELASTICSEARCH_PASSWORD: ${ELASTICSEARCH_PASS:-zammad} | ||
|
|
||
| zammad-init: | ||
| # Zammad initialization. | ||
| <<: *zammad-service | ||
| command: ["zammad-init"] | ||
| depends_on: | ||
| - postgresql | ||
| user: 0:0 | ||
|
|
||
| zammad-memcached: | ||
| # Zammad memcached. | ||
| command: memcached -m 256M | ||
| image: memcached:${MEMCACHE_VERSION:-1.6.38-alpine} | ||
|
|
||
| zammad-nginx: | ||
| # You can access the Zammad frontend at [zammad.localhost](https://zammad.localhost/). | ||
| <<: *zammad-service | ||
| deploy: | ||
| labels: | ||
| - traefik.enable=true | ||
| - traefik.http.routers.zammad.entryPoints=web | ||
| - traefik.http.routers.zammad.middlewares=redirectscheme #DARGSTACK-REMOVE | ||
| - traefik.http.routers.zammad.rule=Host(`zammad.${STACK_DOMAIN}`) | ||
| - traefik.http.routers.zammad_secure.entryPoints=web-secure | ||
| - traefik.http.routers.zammad_secure.rule=Host(`zammad.${STACK_DOMAIN}`) | ||
| - traefik.http.routers.zammad_secure.tls.options=mintls13@file #DARGSTACK-REMOVE | ||
| - traefik.http.services.zammad.loadbalancer.server.port=8080 | ||
| command: ["zammad-nginx"] | ||
|
|
||
| zammad-railsserver: | ||
| # Zammad railsserver. | ||
| <<: *zammad-service | ||
| command: ["zammad-railsserver"] | ||
|
|
||
| zammad-redis: | ||
| # Zammad redis. | ||
| image: redis:${REDIS_VERSION:-7.4.3-alpine} | ||
| volumes: | ||
| - zammad-redis-data:/data | ||
|
|
||
| zammad-scheduler: | ||
| # Zammad scheduler. | ||
| <<: *zammad-service | ||
| command: ["zammad-scheduler"] | ||
|
|
||
| zammad-websocket: | ||
| # Zammad websocket. | ||
| <<: *zammad-service | ||
| command: ["zammad-websocket"] | ||
|
|
||
| volumes: | ||
| debezium_kafka_configuration: | ||
| # The change data capture's configuration. | ||
|
|
@@ -583,3 +722,15 @@ volumes: | |
| redpanda_data: | ||
| # The message queue's data. | ||
| {} | ||
| zammad-elasticsearch-data: | ||
| # Zammad's elastisearch data | ||
| {} | ||
| zammad-redis-data: | ||
| # Zammad's redis data | ||
| {} | ||
| zammad-backup: | ||
| # Zammad's backup data | ||
| {} | ||
| zammad-storage: | ||
| # Zammad's storage data | ||
| {} | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to delete the comments