Merge pull request 'Fix some errors and deprecations, add abra.sh' (#3) from mac-chaffee/example:main into main

Reviewed-on: coop-cloud/example#3
Reviewed-by: decentral1se <decentral1se@noreply.git.coopcloud.tech>

.drone.yml

@@ -3,53 +3,37 @@ kind: pipeline
 name: deploy to swarm-test.autonomic.zone
 steps:
   - name: deployment
-    image: decentral1se/stack-ssh-deploy:latest
+    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
     settings:
       host: swarm-test.autonomic.zone
-      stack: {{ .Name }}
+      stack: example_com  # UPDATE ME
+      generate_secrets: true
       purge: true
       deploy_key:
         from_secret: drone_ssh_swarm_test
+      networks:
+        - proxy
     environment:
-      DOMAIN: {{ .Name }}.swarm-test.autonomic.zone
+      DOMAIN: example.swarm-test.autonomic.zone # UPDATE ME
-      LETS_ENCRYPT_ENV: production
+      STACK_NAME: example_com  # UPDATE ME
-
+      LETS_ENCRYPT_ENV: staging
-  - name: notify coopcloud-dev on failure
+      # Also set any config versions from abra.sh
-    image: plugins/matrix
-    settings:
-      homeserver: https://matrix.autonomic.zone
-      roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
-      userid: "@autono-bot:autonomic.zone"
-      accesstoken:
-        from_secret: autono_bot_access_token
-    depends_on:
-    - deployment
-  when:
-    status:
-      - failure
 trigger:
   branch:
     - main
-
 ---
 kind: pipeline
-name: recipe release
+name: generate recipe catalogue
 steps:
   - name: release a new version
-    image: decentral1se/drone-abra:latest
-    settings:
-      command: recipe {{ .Name }} release
-      deploy_key:
-        from_secret: abra_bot_deploy_key
-
-  - name: trigger downstream builds
     image: plugins/downstream
     settings:
-      server: https://drone.autonomic.zone
+      server: https://build.coopcloud.tech
       token:
-        from_secret: decentral1se_token
+        from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - coop-cloud/auto-apps-json
+        - toolshed/auto-recipes-catalogue-json
-    depends_on:
+
-      - release a new version
+trigger:
+  event: tag

.env.sample

@@ -4,4 +4,5 @@ DOMAIN={{ .Name }}.example.com
 
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.{{ .Name }}.example.com`'
+
 LETS_ENCRYPT_ENV=production

README.md

@@ -4,27 +4,21 @@
 
 <!-- metadata -->
 
-- **Category**:
+* **Category**: {{ .Category }}
-- **Status**:
+* **Status**: {{ .Status }}
-- **Image**:
+* **Image**: {{ .Image }}
-- **Healthcheck**:
+* **Healthcheck**: {{ .Healthcheck }}
-- **Backups**:
+* **Backups**: {{ .Backups }}
-- **Email**:
+* **Email**: {{ .Email }}
-- **Tests**:
+* **Tests**: {{ .Tests }}
-- **SSO**:
+* **SSO**: {{ .SSO }}
 
 <!-- endmetadata -->
 
-## Basic usage
+## Quick start
 
-1. Set up Docker Swarm and [`abra`]
+* `abra app new {{ .Name }} --secrets`
-2. Deploy [`coop-cloud/traefik`]
+* `abra app config <app-name>`
-3. `abra app new ${REPO_NAME} --secrets` (optionally with `--pass` if you'd like
+* `abra app deploy <app-name>`
-   to save secrets in `pass`)
-4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
-   your Docker swarm box
-5. `abra app YOURAPPDOMAIN deploy`
-6. Open the configured domain in your browser to finish set-up
 
-[`abra`]: https://git.coopcloud.tech/coop-cloud/abra
+For more, see [`docs.coopcloud.tech`](https://docs.coopcloud.tech).
-[`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik

abra.sh

@@ -0,0 +1,2 @@
+# Set any config versions here
+# Docs: https://docs.coopcloud.tech/maintainers/handbook/#manage-configs

compose.yml

@@ -1,9 +1,7 @@
 ---
-version: "3.8"
-
 services:
   app:
-    image: nginx:1.19.2
+    image: nginx:1.27.5
     networks:
       - proxy
     deploy:
@@ -17,8 +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"
+        ## Redirect HTTP to HTTPS
-        #- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
+        # - "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 <name>" 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