Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0623071756 | ||
|
|
1e16a607cc |
@@ -1,32 +0,0 @@
|
|||||||
# Zammad Recipe Maintenance
|
|
||||||
|
|
||||||
All contributions should be made via a pull request. This is to ensure a
|
|
||||||
certain quality and consistency, that others can rely on.
|
|
||||||
|
|
||||||
## Maintainer Responsibilities
|
|
||||||
|
|
||||||
A recipe maintainer has the following responsibilities:
|
|
||||||
|
|
||||||
- Respond to pull requests / issues within two weeks
|
|
||||||
- Make image security updates within a week
|
|
||||||
- Make image major updates every three months
|
|
||||||
|
|
||||||
In order to fullfill these responsibilities a recipe maintainer:
|
|
||||||
|
|
||||||
- Has to watch the repository (to get notifications)
|
|
||||||
- Needs to make sure renovate is configured properly
|
|
||||||
|
|
||||||
## Pull Requests
|
|
||||||
|
|
||||||
A pull request can be merged if it is approved by at least one maintainer. For
|
|
||||||
pull requests opened by a maintainer they need to be approved by another
|
|
||||||
maintainer. Even though it is okay to merge a pull request with one approval, it
|
|
||||||
is always better if all maintainers looked at the pull request and approved it.
|
|
||||||
|
|
||||||
## Become a maintainer
|
|
||||||
|
|
||||||
Everyone can apply to be a recipe maintainer:
|
|
||||||
1. Watch the repository to always get updates
|
|
||||||
2. Simply add your self to the list in the [README.md](./README.md) and open a new pull request with the change.
|
|
||||||
3. Once the pull request gets merged you will be added to the [zammad maintainers team](https://git.coopcloud.tech/org/coop-cloud/teams/zammad-maintainers).
|
|
||||||
4. Join the room [#cc-|-zammad-maintenance:matrix.org](#cc-|-zammad-maintenance:matrix.org) and chat to other maintainers.
|
|
||||||
@@ -4,9 +4,8 @@ Zammad is a free helpdesk or issue tracking system.
|
|||||||
|
|
||||||
<!-- metadata -->
|
<!-- metadata -->
|
||||||
|
|
||||||
* **Maintainer**: Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
|
|
||||||
* **Category**: Apps
|
* **Category**: Apps
|
||||||
* **Status**: `stable`
|
* **Status**: 0
|
||||||
* **Image**: [`zammad`](https://hub.docker.com/r/zammad), 4, upstream
|
* **Image**: [`zammad`](https://hub.docker.com/r/zammad), 4, upstream
|
||||||
* **Healthcheck**: Yes
|
* **Healthcheck**: Yes
|
||||||
* **Backups**: No
|
* **Backups**: No
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ export AUTO_WIZARD_VERSION=v2
|
|||||||
export PG_BACKUP_VERSION=v2
|
export PG_BACKUP_VERSION=v2
|
||||||
|
|
||||||
get_setting_changes() {
|
get_setting_changes() {
|
||||||
/custom-entrypoint.sh "bundle exec 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))'"
|
||||||
}
|
}
|
||||||
|
|
||||||
console() {
|
console() {
|
||||||
/custom-entrypoint.sh "bundle exec rails c"
|
/custom-entrypoint.sh "rails c"
|
||||||
}
|
}
|
||||||
|
|
||||||
rails_run() {
|
rails_run() {
|
||||||
@@ -17,7 +17,7 @@ rails_run() {
|
|||||||
|
|
||||||
init() {
|
init() {
|
||||||
cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json
|
cp -f /opt/zammad/contrib/auto_wizard.json /tmp/auto_wizard.json
|
||||||
/custom-entrypoint.sh "bundle exec rake zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
|
/custom-entrypoint.sh "rails zammad:setup:auto_wizard[/tmp/auto_wizard.json]"
|
||||||
}
|
}
|
||||||
|
|
||||||
enable_authentik_sso() {
|
enable_authentik_sso() {
|
||||||
@@ -38,6 +38,23 @@ enable_authentik_sso() {
|
|||||||
abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)"
|
abra app cmd -T $DOMAIN zammad-railsserver rails_run "$(printf "%q " $COMMAND)"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enable_rauthy_sso() {
|
||||||
|
COMMAND="
|
||||||
|
(u = User.find_by(id: 3)) && (u.login='$OID_ADMIN_UID') && u.save!;
|
||||||
|
Setting.set('auth_openid_connect', true);
|
||||||
|
Setting.set('auth_third_party_auto_link_at_inital_login', true);
|
||||||
|
Setting.set('auth_openid_connect_credentials', {
|
||||||
|
'display_name'=>'$ORGANIZATION',
|
||||||
|
'identifier'=>'$OID_SSO_IDENTIFIER',
|
||||||
|
'issuer'=>'$OID_SSO_ISSUER',
|
||||||
|
'uid_field'=>'$OID_SSO_UID_FIELD',
|
||||||
|
'scope'=>'$OID_SSO_SCOPES',
|
||||||
|
'pkce'=>'$OID_SSO_PKCE',
|
||||||
|
'callback_url'=>'$OID_SSO_CALLBACK_URL'})
|
||||||
|
"
|
||||||
|
abra app cmd -T $DOMAIN app rails_run "$(printf "%q " $COMMAND)"
|
||||||
|
}
|
||||||
|
|
||||||
set_logo() {
|
set_logo() {
|
||||||
LOGO_PATH="$1"
|
LOGO_PATH="$1"
|
||||||
abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/
|
abra app cp "$APP_NAME" "$LOGO_PATH" zammad-railsserver:/tmp/
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
version: "3.8"
|
version: "3.8"
|
||||||
services:
|
services:
|
||||||
zammad-backup:
|
zammad-backup:
|
||||||
image: ghcr.io/zammad/zammad:7.2.2
|
image: ghcr.io/zammad/zammad:7.1.2
|
||||||
command: ["zammad-backup"]
|
command: ["zammad-backup"]
|
||||||
volumes:
|
volumes:
|
||||||
- zammad-backup:/var/tmp/zammad
|
- zammad-backup:/var/tmp/zammad
|
||||||
|
|||||||
+4
-8
@@ -45,6 +45,7 @@ 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:7.1.2
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
@@ -68,7 +69,7 @@ x-shared:
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
zammad-elasticsearch:
|
zammad-elasticsearch:
|
||||||
image: elasticsearch:9.5.5
|
image: elasticsearch:9.4.4
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
@@ -92,7 +93,6 @@ services:
|
|||||||
|
|
||||||
zammad-init:
|
zammad-init:
|
||||||
<<: *zammad-service
|
<<: *zammad-service
|
||||||
image: ghcr.io/zammad/zammad:7.2.2
|
|
||||||
command: ["zammad-init"]
|
command: ["zammad-init"]
|
||||||
depends_on:
|
depends_on:
|
||||||
- zammad-postgresql
|
- zammad-postgresql
|
||||||
@@ -113,7 +113,6 @@ services:
|
|||||||
|
|
||||||
app:
|
app:
|
||||||
<<: *zammad-service
|
<<: *zammad-service
|
||||||
image: ghcr.io/zammad/zammad:7.2.2
|
|
||||||
command: ["zammad-nginx"]
|
command: ["zammad-nginx"]
|
||||||
#expose:
|
#expose:
|
||||||
# - 8080
|
# - 8080
|
||||||
@@ -135,7 +134,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=4.4.0+7.2.2"
|
- "coop-cloud.${STACK_NAME}.version=4.1.1+7.1.2"
|
||||||
- "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"]
|
||||||
@@ -177,7 +176,6 @@ services:
|
|||||||
|
|
||||||
zammad-railsserver:
|
zammad-railsserver:
|
||||||
<<: *zammad-service
|
<<: *zammad-service
|
||||||
image: ghcr.io/zammad/zammad:7.2.2
|
|
||||||
command: ["zammad-railsserver"]
|
command: ["zammad-railsserver"]
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
test: ["CMD", "curl", "-f", "http://localhost:3000"]
|
||||||
@@ -195,7 +193,7 @@ services:
|
|||||||
memory: 2G
|
memory: 2G
|
||||||
|
|
||||||
zammad-redis:
|
zammad-redis:
|
||||||
image: redis:8.10.2-alpine
|
image: redis:8.10.0-alpine
|
||||||
deploy:
|
deploy:
|
||||||
restart_policy:
|
restart_policy:
|
||||||
condition: on-failure
|
condition: on-failure
|
||||||
@@ -210,7 +208,6 @@ services:
|
|||||||
|
|
||||||
zammad-scheduler:
|
zammad-scheduler:
|
||||||
<<: *zammad-service
|
<<: *zammad-service
|
||||||
image: ghcr.io/zammad/zammad:7.2.2
|
|
||||||
command: ["zammad-scheduler"]
|
command: ["zammad-scheduler"]
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: 'grep -a "background-worker.rb" -r /proc/[0-9]*/cmdline'
|
test: 'grep -a "background-worker.rb" -r /proc/[0-9]*/cmdline'
|
||||||
@@ -221,7 +218,6 @@ services:
|
|||||||
|
|
||||||
zammad-websocket:
|
zammad-websocket:
|
||||||
<<: *zammad-service
|
<<: *zammad-service
|
||||||
image: ghcr.io/zammad/zammad:7.2.2
|
|
||||||
command: ["zammad-websocket"]
|
command: ["zammad-websocket"]
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: 'ruby -rsocket -e "s = TCPSocket.new(''localhost'', 6042); s.close"'
|
test: 'ruby -rsocket -e "s = TCPSocket.new(''localhost'', 6042); s.close"'
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
|
||||||
"extends": [
|
|
||||||
"config:recommended"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user