diff --git a/renovate.json b/renovate.json index 8139008f..d36e7fef 100644 --- a/renovate.json +++ b/renovate.json @@ -29,13 +29,20 @@ // https://docs.renovatebot.com/presets-default/#automergestablenonmajor { "groupName": "all stable non-major dependencies", - "groupSlug": "all-stable-minor-patch", + "groupSlug": "all-stable-minor", "matchCurrentVersion": "!/^0/", "matchUpdateTypes": [ - "minor", - "patch" + "minor" + ], + "excludePackageNames": [ + "git.hamburg.ccc.de/ccchh/oci-images/keycloak" ] }, + { + "matchUpdateTypes": ["patch"], + "matchCurrentVersion": "!/^0/", + "automerge": true + }, { "matchDatasources": ["docker"], "matchPackageNames": ["docker.io/pretix/standalone"], diff --git a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone index e5c1d251..c501167f 100644 --- a/resources/chaosknoten/auth-dns/zones/ccchh.net.zone +++ b/resources/chaosknoten/auth-dns/zones/ccchh.net.zone @@ -134,10 +134,6 @@ octopi A 10.89.212.31 ;cisco-slm248p A 10.89.208.27 -waybackproxy A 10.89.212.33 - -alnair A 10.89.210.23 - TXT "Sun SparcStation 4 Retro" ; ; Public Club Services diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index 7a109e8c..2a7ffdd8 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 @@ -80,12 +80,9 @@ services: - LIST_ATTRIBUTES=chaos@lists.hamburg.ccc.de:mailinglist-chaos,intern@lists.hamburg.ccc.de:mailinglist-intern - MAILMAN_API_PASSWORD={{ secret__lists__rest_password }} - MAILMAN_API_URL=http://mailman-core:8001/3.1 - - MANUAL_SUBSCRIBER_LISTS=/manual-subscriber-lists image: git.hamburg.ccc.de/ccchh/mailman-subscription-sync:latest networks: mailman: - volumes: - - /home/chaos/mailman-manual-subscriber-lists:/manual-subscriber-lists networks: mailman: