One ping less to Google, swap for Quad9

Up version to 2.9.4
chore: publish 2.0.0+v2.9.1 release
2022-11-11 17:02:09 +00:00 · 2022-11-11 16:59:00 +00:00 · 2022-10-18 17:09:44 -04:00 · 2022-10-18 17:06:11 -04:00 · 2022-10-13 16:51:46 +00:00 · 2022-07-14 10:47:58 +02:00
8 changed files with 15 additions and 39 deletions
--- a/.env.sample
+++ b/.env.sample
@ -44,11 +44,6 @@ COMPOSE_FILE="compose.yml"
 #GANDI_ENABLED=1
 #SECRET_GANDIV5_API_KEY_VERSION=v1

-## DigitalOcean, https://digitalocean.com
-#COMPOSE_FILE="$COMPOSE_FILE:compose.digitalocean.yml"
-#DIGITALOCEAN_ENABLED=1
-#SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION=v1
-
 #####################################################################
 # Keycloak log-in                                                   #
 #####################################################################
--- a/README.md
+++ b/README.md
@ -21,6 +21,6 @@
 2. `abra app new traefik`
 3. `abra app YOURAPPDOMAIN config` - be sure to change `DOMAIN` to something that resolves to
   your Docker swarm box
-4. `abra app YOURAPPDOMAIN deploy`
+4. `abra app deploy YOURAPPDOMAIN`

 [`abra`]: https://git.autonomic.zone/autonomic-cooperative/abra
--- a/abra.sh
+++ b/abra.sh
@ -1,3 +1,3 @@
 export TRAEFIK_YML_VERSION=v15
-export FILE_PROVIDER_YML_VERSION=v7
-export ENTRYPOINT_VERSION=v3
+export FILE_PROVIDER_YML_VERSION=v6
+export ENTRYPOINT_VERSION=v2
--- a/compose.digitalocean.yml
+++ b/compose.digitalocean.yml
@ -1,15 +0,0 @@
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - DO_AUTH_TOKEN_FILE=/run/secrets/digitalocean_auth_token
-      - LETS_ENCRYPT_DNS_CHALLENGE_ENABLED
-      - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER
-    secrets:
-      - digitalocean_auth_token
-
-secrets:
-  digitalocean_auth_token:
-    name: ${STACK_NAME}_digitalocean_auth_token_${SECRET_DIGITALOCEAN_AUTH_TOKEN_VERSION}
-    external: true
--- a/compose.headless.yml
+++ b/compose.headless.yml
@ -10,5 +10,5 @@ services:
      labels:
        - "traefik.enable=true"
        - "traefik.http.services.traefik.loadbalancer.server.port=web"
-        - "traefik.http.routers.traefik.entrypoints=web-secure"
-        - "traefik.http.routers.traefik.service=api@internal"
+        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
--- a/compose.yml
+++ b/compose.yml
@ -3,7 +3,7 @@ version: "3.8"

 services:
  app:
-    image: "traefik:v2.5.6"
+    image: "traefik:v2.9.4"
    # Note(decentral1se): *please do not* add any additional ports here.
    # Doing so could break new installs with port conflicts. Please use
    # the usual `compose.$app.yml` approach for any additional ports
@ -40,14 +40,14 @@ services:
        order: start-first
      labels:
        - "traefik.enable=true"
-        - "traefik.http.services.traefik.loadbalancer.server.port=web"
-        - "traefik.http.routers.traefik.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.traefik.entrypoints=web-secure"
-        - "traefik.http.routers.traefik.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        - "traefik.http.routers.traefik.tls.options=default@file"
-        - "traefik.http.routers.traefik.service=api@internal"
-        - "traefik.http.routers.traefik.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.version=1.0.1+v2.5.6"
+        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=web"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.${STACK_NAME}.tls.options=default@file"
+        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
+        - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
+        - "coop-cloud.${STACK_NAME}.version=2.0.1+v2.9.4"

 networks:
  proxy:
--- a/entrypoint.sh.tmpl
+++ b/entrypoint.sh.tmpl
@ -11,8 +11,4 @@ export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
 export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE")
 {{ end }}

-{{ if eq (env "DIGITALOCEAN_ENABLED") "1" }}
-export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
-{{ end }}
-
 /entrypoint.sh "$@"
--- a/traefik.yml.tmpl
+++ b/traefik.yml.tmpl
@ -102,5 +102,5 @@ certificatesResolvers:
        provider: {{ (env "LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER") }}
        resolvers:
          - "1.1.1.1:53"
-          - "8.8.8.8:53"
+          - "9.9.9.9:53"
      {{ end }}
Author	SHA1	Message	Date
javielico	5f25a272cb	One ping less to Google, swap for Quad9	2022-11-11 17:02:09 +00:00
javielico	4c7a272838	Up version to 2.9.4	2022-11-11 16:59:00 +00:00
3wc	2e68186042	chore: publish 2.0.0+v2.9.1 release	2022-10-18 17:09:44 -04:00
3wc	975d8e01a4	Use $STACK_NAME for default router name.. ..instead of hard-coded `traefik`	2022-10-18 17:06:11 -04:00
trav	fcff3a2d6a	syntax minor	2022-10-13 16:51:46 +00:00
decentral1se	981d2a3808	chore: publish 1.1.1+v2.8.1 release	2022-07-14 10:47:58 +02:00
Philipp Rothmann	29eb1058cd	chore: publish 1.1.0+v2.8.0 release	2022-07-01 11:35:28 +02:00