Compare commits
12 Commits
custom_css
...
2.0.0+6.4.
Author | SHA1 | Date | |
---|---|---|---|
73e9f7bfcc | |||
3a940d845f | |||
d7b3c1e18e | |||
3af308645e | |||
cb85124b06 | |||
d68c9ad18c | |||
38682b8503 | |||
ce314169cb | |||
34be0c287e | |||
aab7e022d0 | |||
a7e409b337 | |||
ffe4fa1c54 |
@ -2,11 +2,13 @@ TYPE=zammad
|
|||||||
|
|
||||||
DOMAIN=zammad.example.com
|
DOMAIN=zammad.example.com
|
||||||
TIMEOUT=600
|
TIMEOUT=600
|
||||||
|
ENABLE_BACKUPS=true
|
||||||
|
|
||||||
## Domain aliases
|
## Domain aliases
|
||||||
#EXTRA_DOMAINS=', `www.zammad.example.com`'
|
#EXTRA_DOMAINS=', `www.zammad.example.com`'
|
||||||
|
|
||||||
LETS_ENCRYPT_ENV=production
|
LETS_ENCRYPT_ENV=production
|
||||||
|
COMPOSE_FILE="compose.yml"
|
||||||
|
|
||||||
SECRET_DB_PASSWORD_VERSION=v1
|
SECRET_DB_PASSWORD_VERSION=v1
|
||||||
SECRET_SMTP_PASSWORD_VERSION=v1
|
SECRET_SMTP_PASSWORD_VERSION=v1
|
||||||
@ -28,3 +30,9 @@ SMTP_PORT=465
|
|||||||
#SSO_PROVIDER_DOMAIN=authentik.example.com
|
#SSO_PROVIDER_DOMAIN=authentik.example.com
|
||||||
#IDP_SSO_TARGET_URL=https://authentik.example.com/application/saml/zammad/sso/binding/init/
|
#IDP_SSO_TARGET_URL=https://authentik.example.com/application/saml/zammad/sso/binding/init/
|
||||||
#IDP_SLO_SERVICE_URL=https://authentik.example.com/application/saml/zammad/slo/binding/redirect/
|
#IDP_SLO_SERVICE_URL=https://authentik.example.com/application/saml/zammad/slo/binding/redirect/
|
||||||
|
|
||||||
|
|
||||||
|
## Zammad internal backups
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.backup.yml"
|
||||||
|
# BACKUP_TIME=03:00"
|
||||||
|
# HOLD_DAYS=10
|
||||||
|
7
abra.sh
7
abra.sh
@ -1,5 +1,6 @@
|
|||||||
export ENTRYPOINT_VERSION=v2
|
export ENTRYPOINT_VERSION=v2
|
||||||
export AUTO_WIZARD_VERSION=v1
|
export AUTO_WIZARD_VERSION=v2
|
||||||
|
export PG_BACKUP_VERSION=v2
|
||||||
|
|
||||||
get_setting_changes() {
|
get_setting_changes() {
|
||||||
/custom-entrypoint.sh "rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
|
/custom-entrypoint.sh "rails r 'puts JSON.pretty_generate(JSON.parse(Setting.all.select{ |setting| setting.state_current != setting.state_initial }.map { |setting| {name: setting.name, value: setting.state_current[\""value\""]} } .to_json))'"
|
||||||
@ -35,7 +36,7 @@ enable_authentik_sso() {
|
|||||||
'idp_cert_fingerprint'=>'',
|
'idp_cert_fingerprint'=>'',
|
||||||
'name_identifier_format'=>'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'})
|
'name_identifier_format'=>'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'})
|
||||||
"
|
"
|
||||||
abra app cmd -T -C support.dev.local-it.cloud zammad-railsserver rails_run "$(printf "%q " $COMMAND )"
|
abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND )"
|
||||||
}
|
}
|
||||||
|
|
||||||
set_logo() {
|
set_logo() {
|
||||||
@ -48,5 +49,5 @@ set_logo() {
|
|||||||
logo_timestamp = Service::SystemAssets::ProductLogo.store(logo_content);
|
logo_timestamp = Service::SystemAssets::ProductLogo.store(logo_content);
|
||||||
Setting.set('product_logo', logo_timestamp);
|
Setting.set('product_logo', logo_timestamp);
|
||||||
"
|
"
|
||||||
abra app cmd -T -C support.dev.local-it.cloud zammad-railsserver rails_run "$(printf "%q " $COMMAND )"
|
abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND )"
|
||||||
}
|
}
|
||||||
|
@ -46,10 +46,6 @@
|
|||||||
"name": "organization",
|
"name": "organization",
|
||||||
"value": "{{ env "ORGANIZATION" }}"
|
"value": "{{ env "ORGANIZATION" }}"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "product_logo",
|
|
||||||
"value": "{{ env "LOGO_URL" }}"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "timezone_default",
|
"name": "timezone_default",
|
||||||
"value": "{{ env "TZ" }}"
|
"value": "{{ env "TZ" }}"
|
||||||
|
36
compose.backup.yml
Normal file
36
compose.backup.yml
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
version: "3.8"
|
||||||
|
services:
|
||||||
|
zammad-backup:
|
||||||
|
image: ghcr.io/zammad/zammad:6.4.0-34
|
||||||
|
command: ["zammad-backup"]
|
||||||
|
volumes:
|
||||||
|
- zammad-backup:/var/tmp/zammad
|
||||||
|
- zammad-storage:/opt/zammad/storage:ro
|
||||||
|
user: 0:0
|
||||||
|
deploy:
|
||||||
|
labels:
|
||||||
|
backupbot.backup.volumes.zammad-backup: "false"
|
||||||
|
restart_policy:
|
||||||
|
condition: on-failure
|
||||||
|
environment:
|
||||||
|
POSTGRESQL_DB: zammad_production
|
||||||
|
POSTGRESQL_HOST: zammad-postgresql
|
||||||
|
POSTGRESQL_USER: zammad
|
||||||
|
POSTGRESQL_PASS_FILE: /run/secrets/db_password
|
||||||
|
POSTGRESQL_PORT: 5432
|
||||||
|
# Backup settings
|
||||||
|
BACKUP_DIR: "/var/tmp/zammad"
|
||||||
|
BACKUP_TIME: "${BACKUP_TIME:-03:00}"
|
||||||
|
#BACKUP_SLEEP: 86400
|
||||||
|
HOLD_DAYS: 10
|
||||||
|
DOMAIN:
|
||||||
|
entrypoint: /custom-entrypoint.sh
|
||||||
|
configs:
|
||||||
|
- source: entrypoint
|
||||||
|
target: /custom-entrypoint.sh
|
||||||
|
mode: 0555
|
||||||
|
secrets:
|
||||||
|
- db_password
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
zammad-backup:
|
57
compose.yml
57
compose.yml
@ -13,11 +13,6 @@ x-shared:
|
|||||||
POSTGRESQL_OPTIONS: ?pool=50
|
POSTGRESQL_OPTIONS: ?pool=50
|
||||||
POSTGRESQL_DB_CREATE:
|
POSTGRESQL_DB_CREATE:
|
||||||
REDIS_URL: redis://zammad-redis:6379
|
REDIS_URL: redis://zammad-redis:6379
|
||||||
# Backup settings
|
|
||||||
BACKUP_DIR: "/var/tmp/zammad"
|
|
||||||
BACKUP_TIME: "${BACKUP_TIME:-03:00}"
|
|
||||||
#BACKUP_SLEEP: 86400
|
|
||||||
HOLD_DAYS: 10
|
|
||||||
TZ: "${TZ:-Europe/Berlin}"
|
TZ: "${TZ:-Europe/Berlin}"
|
||||||
# Allow passing in these variables via .env:
|
# Allow passing in these variables via .env:
|
||||||
AUTOWIZARD_JSON:
|
AUTOWIZARD_JSON:
|
||||||
@ -48,13 +43,12 @@ x-shared:
|
|||||||
SSO_PROVIDER_DOMAIN:
|
SSO_PROVIDER_DOMAIN:
|
||||||
IDP_SSO_TARGET_URL:
|
IDP_SSO_TARGET_URL:
|
||||||
IDP_SLO_SERVICE_URL:
|
IDP_SLO_SERVICE_URL:
|
||||||
image: ghcr.io/zammad/zammad:6.3.1-95
|
image: ghcr.io/zammad/zammad:6.4.0-34
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
volumes:
|
volumes:
|
||||||
- zammad-storage:/opt/zammad/storage
|
- zammad-storage:/opt/zammad/storage
|
||||||
#old: - zammad-data:/opt/zammad
|
|
||||||
depends_on:
|
depends_on:
|
||||||
- zammad-memcached
|
- zammad-memcached
|
||||||
- zammad-postgresql
|
- zammad-postgresql
|
||||||
@ -72,24 +66,16 @@ x-shared:
|
|||||||
- admin_password
|
- admin_password
|
||||||
|
|
||||||
services:
|
services:
|
||||||
zammad-backup:
|
|
||||||
<<: *zammad-service
|
|
||||||
command: ["zammad-backup"]
|
|
||||||
volumes:
|
|
||||||
- zammad-backup:/var/tmp/zammad
|
|
||||||
- zammad-storage:/opt/zammad/storage:ro
|
|
||||||
#old: - zammad-data:/opt/zammad
|
|
||||||
user: 0:0
|
|
||||||
deploy:
|
|
||||||
labels:
|
|
||||||
- "backupbot.backup=true"
|
|
||||||
- "backupbot.backup.path=/var/tmp/zammad"
|
|
||||||
|
|
||||||
zammad-elasticsearch:
|
zammad-elasticsearch:
|
||||||
image: bitnami/elasticsearch:8.14.3
|
image: bitnami/elasticsearch:8.16.1
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
resources:
|
||||||
|
limits:
|
||||||
|
memory: 4G
|
||||||
|
reservations:
|
||||||
|
memory: 2G
|
||||||
volumes:
|
volumes:
|
||||||
- elasticsearch-data:/bitnami/elasticsearch/data
|
- elasticsearch-data:/bitnami/elasticsearch/data
|
||||||
environment:
|
environment:
|
||||||
@ -100,12 +86,6 @@ services:
|
|||||||
timeout: 10s
|
timeout: 10s
|
||||||
retries: 10
|
retries: 10
|
||||||
start_period: 5m
|
start_period: 5m
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: 4G
|
|
||||||
reservations:
|
|
||||||
memory: 2G
|
|
||||||
|
|
||||||
zammad-init:
|
zammad-init:
|
||||||
<<: *zammad-service
|
<<: *zammad-service
|
||||||
@ -116,7 +96,7 @@ services:
|
|||||||
|
|
||||||
zammad-memcached:
|
zammad-memcached:
|
||||||
command: memcached -m 256M
|
command: memcached -m 256M
|
||||||
image: memcached:1.6.29-alpine
|
image: memcached:1.6.32-alpine
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
|
test: 'echo "version" | nc -vn -w 1 127.0.0.1 11211'
|
||||||
interval: 30s
|
interval: 30s
|
||||||
@ -150,7 +130,7 @@ services:
|
|||||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=1.0.2+6.3.1-95"
|
- "coop-cloud.${STACK_NAME}.version=2.0.0+6.4.0-34"
|
||||||
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
test: ["CMD", "curl", "-f", "http://localhost:8080"]
|
||||||
@ -168,10 +148,19 @@ services:
|
|||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
|
labels:
|
||||||
|
backupbot.backup: "${ENABLE_BACKUPS:-true}"
|
||||||
|
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
||||||
|
backupbot.backup.volumes.postgresql-data.path: "backup.sql"
|
||||||
|
backupbot.restore.post-hook: '/pg_backup.sh restore'
|
||||||
|
backupbot.backup.volumes.elasticsearch-data: "false"
|
||||||
|
backupbot.backup.volumes.redis-data: "false"
|
||||||
volumes:
|
volumes:
|
||||||
- postgresql-data:/var/lib/postgresql/data
|
- postgresql-data:/var/lib/postgresql/data
|
||||||
# Backup Restore
|
configs:
|
||||||
#- zammad-backup:/var/tmp/zammad:ro
|
- source: pg_backup
|
||||||
|
target: /pg_backup.sh
|
||||||
|
mode: 0555
|
||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
healthcheck:
|
healthcheck:
|
||||||
@ -193,7 +182,7 @@ services:
|
|||||||
|
|
||||||
|
|
||||||
zammad-redis:
|
zammad-redis:
|
||||||
image: redis:7.2.5-alpine
|
image: redis:7.4.1-alpine
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
@ -230,7 +219,6 @@ volumes:
|
|||||||
elasticsearch-data:
|
elasticsearch-data:
|
||||||
postgresql-data:
|
postgresql-data:
|
||||||
redis-data:
|
redis-data:
|
||||||
zammad-backup:
|
|
||||||
zammad-storage:
|
zammad-storage:
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
@ -246,6 +234,9 @@ configs:
|
|||||||
name: ${STACK_NAME}_auto_wizard_${AUTO_WIZARD_VERSION}
|
name: ${STACK_NAME}_auto_wizard_${AUTO_WIZARD_VERSION}
|
||||||
file: auto_wizard.json.tmpl
|
file: auto_wizard.json.tmpl
|
||||||
template_driver: golang
|
template_driver: golang
|
||||||
|
pg_backup:
|
||||||
|
name: ${STACK_NAME}_pg_backup_${PG_BACKUP_VERSION}
|
||||||
|
file: pg_backup.sh
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
db_password:
|
db_password:
|
||||||
|
34
pg_backup.sh
Normal file
34
pg_backup.sh
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
BACKUP_FILE='/var/lib/postgresql/data/backup.sql'
|
||||||
|
|
||||||
|
function backup {
|
||||||
|
export PGPASSWORD=$(cat /run/secrets/db_password)
|
||||||
|
pg_dump -U ${POSTGRES_USER} ${POSTGRES_DB} > $BACKUP_FILE
|
||||||
|
}
|
||||||
|
|
||||||
|
function restore {
|
||||||
|
cd /var/lib/postgresql/data/
|
||||||
|
restore_config(){
|
||||||
|
# Restore allowed connections
|
||||||
|
cat pg_hba.conf.bak > pg_hba.conf
|
||||||
|
su postgres -c 'pg_ctl reload'
|
||||||
|
}
|
||||||
|
# Don't allow any other connections than local
|
||||||
|
cp pg_hba.conf pg_hba.conf.bak
|
||||||
|
echo "local all all trust" > pg_hba.conf
|
||||||
|
su postgres -c 'pg_ctl reload'
|
||||||
|
trap restore_config EXIT INT TERM
|
||||||
|
|
||||||
|
# Recreate Database
|
||||||
|
psql -U ${POSTGRES_USER} -d postgres -c "DROP DATABASE ${POSTGRES_DB} WITH (FORCE);"
|
||||||
|
createdb -U ${POSTGRES_USER} ${POSTGRES_DB}
|
||||||
|
psql -U ${POSTGRES_USER} -d ${POSTGRES_DB} -1 -f $BACKUP_FILE
|
||||||
|
|
||||||
|
trap - EXIT INT TERM
|
||||||
|
restore_config
|
||||||
|
}
|
||||||
|
|
||||||
|
$@
|
Reference in New Issue
Block a user