From d6523d8341b42b5c9d76aac9a4eb9e038ab88781 Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Mon, 26 May 2025 14:05:57 -0400 Subject: [PATCH 1/3] Add default abra.sh --- abra.sh | 2 ++ 1 file changed, 2 insertions(+) create mode 100755 abra.sh diff --git a/abra.sh b/abra.sh new file mode 100755 index 0000000..13b5452 --- /dev/null +++ b/abra.sh @@ -0,0 +1,2 @@ +# Set any config versions here +# Docs: https://docs.coopcloud.tech/maintainers/handbook/#manage-configs -- 2.47.2 From 874a5e1aa5c53ac4b512ff1f69e8e903ed75488f Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Mon, 26 May 2025 14:06:28 -0400 Subject: [PATCH 2/3] Fix auto-recipes-catalogue-json which moved to toolshed --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 47080d2..8139990 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,7 +16,8 @@ steps: environment: DOMAIN: example.swarm-test.autonomic.zone # UPDATE ME STACK_NAME: example_com # UPDATE ME - LETS_ENCRYPT_ENV: production + LETS_ENCRYPT_ENV: staging + # Also set any config versions from abra.sh trigger: branch: - main @@ -32,7 +33,7 @@ steps: from_secret: drone_abra-bot_token fork: true repositories: - - coop-cloud/auto-recipes-catalogue-json + - toolshed/auto-recipes-catalogue-json trigger: event: tag -- 2.47.2 From dd6a48608a3e071498fa38e0f7d7cbb031be1319 Mon Sep 17 00:00:00 2001 From: Mac Chaffee Date: Mon, 26 May 2025 14:06:53 -0400 Subject: [PATCH 3/3] Fix deprecated traefik labels, add more instructions --- compose.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/compose.yml b/compose.yml index a2c3805..b3d59e1 100644 --- a/compose.yml +++ b/compose.yml @@ -1,9 +1,7 @@ --- -version: "3.8" - services: app: - image: nginx:1.20.0 + image: nginx:1.27.5 networks: - proxy deploy: @@ -17,9 +15,14 @@ services: - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" ## Redirect from EXTRA_DOMAINS to DOMAIN #- "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.SSLHost=${DOMAIN}" + ## Redirect HTTP to HTTPS + # - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https" + # - "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true" + ## When you're ready for release, run "abra recipe sync " to set this - "coop-cloud.${STACK_NAME}.version=" + ## Enable backups: https://docs.coopcloud.tech/maintainers/handbook/#how-do-i-configure-backuprestore + # - "backupbot.backup=true" + # - "backupbot.backup.path=/some/path" healthcheck: test: ["CMD", "curl", "-f", "http://localhost"] interval: 30s -- 2.47.2