From 8d926529c5600779f305b55b355171a98db71880 Mon Sep 17 00:00:00 2001 From: Christian Galo Date: Wed, 24 May 2023 21:08:18 +0000 Subject: [PATCH] remove extras and make compose.yml compliant. --- .drone.yml | 32 ----------- .env.sample | 104 ------------------------------------ .gitignore | 1 - abra.sh | 3 -- compose.compy.yml | 7 --- compose.foodsoft.yml | 7 --- compose.gandi.yml | 15 ------ compose.gitea.yml | 7 --- compose.matrix.yml | 7 --- compose.minio.yml | 9 ---- compose.mssql.yml | 10 ---- compose.mumble.yml | 9 ---- compose.ovh.yml | 21 -------- compose.peertube.yml | 7 --- compose.ssb.yml | 7 --- compose.yml => compose.yaml | 10 +--- 16 files changed, 2 insertions(+), 254 deletions(-) delete mode 100644 .drone.yml delete mode 100644 .env.sample delete mode 100644 .gitignore delete mode 100644 abra.sh delete mode 100644 compose.compy.yml delete mode 100644 compose.foodsoft.yml delete mode 100644 compose.gandi.yml delete mode 100644 compose.gitea.yml delete mode 100644 compose.matrix.yml delete mode 100644 compose.minio.yml delete mode 100644 compose.mssql.yml delete mode 100644 compose.mumble.yml delete mode 100644 compose.ovh.yml delete mode 100644 compose.peertube.yml delete mode 100644 compose.ssb.yml rename compose.yml => compose.yaml (86%) diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index ab0a005..0000000 --- a/.drone.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -kind: pipeline -name: deploy to swarm-test.autonomic.zone -steps: - - name: deployment - image: decentral1se/stack-ssh-deploy:latest - settings: - host: swarm-test.autonomic.zone - stack: traefik - deploy_key: - from_secret: drone_ssh_swarm_test - environment: - DOMAIN: traefik.swarm-test.autonomic.zone - STACK_NAME: traefik - LETS_ENCRYPT_ENV: production - LETS_ENCRYPT_EMAIL: helo@autonomic.zone - TRAEFIK_YML_VERSION: v4 - FILE_PROVIDER_YML_VERSION: v3 - ENTRYPOINT_VERSION: v1 -trigger: - branch: - - master ---- -kind: pipeline -name: recipe release -steps: - - name: release a new version - image: thecoopcloud/drone-abra:latest - settings: - command: recipe traefik release - deploy_key: - from_secret: abra_bot_deploy_key diff --git a/.env.sample b/.env.sample deleted file mode 100644 index 18728a3..0000000 --- a/.env.sample +++ /dev/null @@ -1,104 +0,0 @@ -TYPE=traefik - -DOMAIN={{ .Domain }} -LETS_ENCRYPT_ENV=production - -LETS_ENCRYPT_EMAIL=certs@example.com -# DASHBOARD_ENABLED=true -# WARN, INFO etc. -LOG_LEVEL=WARN - -# This is here so later lines can extend it; you likely don't wanna edit -COMPOSE_FILE="compose.yml" - -##################################################################### -# General settings # -##################################################################### - -## Host-mode networking -#COMPOSE_FILE="$COMPOSE_FILE:compose.host.yml" - -## "Headless mode" (no domain configured) -#COMPOSE_FILE="$COMPOSE_FILE:compose.headless.yml" - -##################################################################### -# Automatic DNS set-up for Letsencrypt # -##################################################################### - -## Enable dns challenge (for wildcard domains) -## https://doc.traefik.io/traefik/https/acme/#dnschallenge -#LETS_ENCRYPT_DNS_CHALLENGE_ENABLED=1 -#LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER=ovh - -## OVH, https://ovh.com -#COMPOSE_FILE="$COMPOSE_FILE:compose.ovh.yml" -#OVH_ENABLED=1 -#OVH_APPLICATION_KEY= -#OVH_ENDPOINT= -#SECRET_OVH_APP_SECRET_VERSION=v1 -#SECRET_OVH_CONSUMER_KEY=v1 - -## Gandi, https://gandi.net -## note(3wc): only "V5" (new) API is supported, so far -#COMPOSE_FILE="$COMPOSE_FILE:compose.gandi.yml" -#GANDI_ENABLED=1 -#SECRET_GANDIV5_API_KEY_VERSION=v1 - -##################################################################### -# Keycloak log-in # -##################################################################### - -## Enable Keycloak -#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml" -#KEYCLOAK_MIDDLEWARE_ENABLED=1 -#KEYCLOAK_TFA_SERVICE=traefik-forward-auth_app -#KEYCLOAK_MIDDLEWARE_2_ENABLED=1 -#KEYCLOAK_TFA_SERVICE_2=traefik-forward-auth_app - -##################################################################### -# Prometheus metrics # -##################################################################### - -## Enable prometheus metrics collection -## used used by the coop-cloud monitoring stack -#METRICS_ENABLED=1 - -##################################################################### -# Additional services # -##################################################################### - -## SMTP port 587 -#COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml" -#SMTP_ENABLED=1 - -## Compy -#COMPOSE_FILE="$COMPOSE_FILE:compose.compy.yml" -#COMPY_ENABLED=1 - -## Gitea SSH -# COMPOSE_FILE="$COMPOSE_FILE:compose.gitea.yml" -# GITEA_SSH_ENABLED=1 - -## Foodsoft SMTP -# COMPOSE_FILE="$COMPOSE_FILE:compose.foodsoft.yml" -# FOODSOFT_SMTP_ENABLED=1 - -## Peertube RTMP -#COMPOSE_FILE="$COMPOSE_FILE:compose.peertube.yml" -#PEERTUBE_RTMP_ENABLED=1 - -## Secure Scuttlebutt MUXRPC -#COMPOSE_FILE="$COMPOSE_FILE:compose.ssb.yml" -#SSB_MUXRPC_ENABLED=1 - -## MSSQL -#COMPOSE_FILE="$COMPOSE_FILE:compose.mssql.yml" -#MSSQL_ENABLED=1 - -## Mumble -#COMPOSE_FILE="$COMPOSE_FILE:compose.mumble.yml" -#MUMBLE_ENABLED=1 - -## Matrix -#COMPOSE_FILE="$COMPOSE_FILE:compose.matrix.yml" -#MATRIX_FEDERATION_ENABLED=1 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 7a6353d..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.envrc diff --git a/abra.sh b/abra.sh deleted file mode 100644 index db45b30..0000000 --- a/abra.sh +++ /dev/null @@ -1,3 +0,0 @@ -export TRAEFIK_YML_VERSION=v14 -export FILE_PROVIDER_YML_VERSION=v6 -export ENTRYPOINT_VERSION=v2 diff --git a/compose.compy.yml b/compose.compy.yml deleted file mode 100644 index 65fd49c..0000000 --- a/compose.compy.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - app: - environment: - - COMPY_ENABLED - ports: - - "9999:9999" diff --git a/compose.foodsoft.yml b/compose.foodsoft.yml deleted file mode 100644 index 8ac770d..0000000 --- a/compose.foodsoft.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - app: - environment: - - FOODSOFT_SMTP_ENABLED - ports: - - "2525:2525" diff --git a/compose.gandi.yml b/compose.gandi.yml deleted file mode 100644 index 42e8c14..0000000 --- a/compose.gandi.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: "3.8" - -services: - app: - environment: - - GANDIV5_API_KEY_FILE=/run/secrets/gandiv5_api_key - - LETS_ENCRYPT_DNS_CHALLENGE_ENABLED - - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER - secrets: - - gandiv5_api_key - -secrets: - gandiv5_api_key: - name: ${STACK_NAME}_gandiv5_api_key_${SECRET_GANDIV5_API_KEY_VERSION} - external: true diff --git a/compose.gitea.yml b/compose.gitea.yml deleted file mode 100644 index bf58bb3..0000000 --- a/compose.gitea.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - app: - environment: - - GITEA_SSH_ENABLED - ports: - - "2222:2222" diff --git a/compose.matrix.yml b/compose.matrix.yml deleted file mode 100644 index 558898d..0000000 --- a/compose.matrix.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - app: - environment: - - MATRIX_FEDERATION_ENABLED - ports: - - "8448:8448" diff --git a/compose.minio.yml b/compose.minio.yml deleted file mode 100644 index 44dceb1..0000000 --- a/compose.minio.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -version: "3.8" - -services: - app: - environment: - - MINIO_CONSOLE_ENABLED - ports: - - "9001:9001" diff --git a/compose.mssql.yml b/compose.mssql.yml deleted file mode 100644 index 0779664..0000000 --- a/compose.mssql.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "3.8" -services: - app: - environment: - - MSSQL_ENABLED - ports: - - target: 1433 - published: 1433 - protocol: tcp - mode: host diff --git a/compose.mumble.yml b/compose.mumble.yml deleted file mode 100644 index e2ea8bd..0000000 --- a/compose.mumble.yml +++ /dev/null @@ -1,9 +0,0 @@ -version: "3.8" -services: - app: - environment: - - MUMBLE_ENABLED - ports: - - "64738:64738/udp" - # note (3wc): see https://github.com/docker/compose/issues/7627 - - "64737-64739:64737-64739/tcp" diff --git a/compose.ovh.yml b/compose.ovh.yml deleted file mode 100644 index e9580c2..0000000 --- a/compose.ovh.yml +++ /dev/null @@ -1,21 +0,0 @@ -version: "3.8" - -services: - app: - environment: - - OVH_APPLICATION_KEY - - OVH_APPLICATION_SECRET_FILE=/run/secrets/ovh_app_secret - - OVH_CONSUMER_KEY_FILE=/run/secrets/ovh_consumer_key - - OVH_ENABLED - - OVH_ENDPOINT - secrets: - - ovh_app_secret - - ovh_consumer_key - -secrets: - ovh_app_secret: - name: ${STACK_NAME}_ovh_app_secret_${SECRET_OVH_APP_SECRET_VERSION} - external: true - ovh_consumer_key: - name: ${STACK_NAME}_ovh_consumer_key_${SECRET_OVH_CONSUMER_KEY} - external: true diff --git a/compose.peertube.yml b/compose.peertube.yml deleted file mode 100644 index fe515a7..0000000 --- a/compose.peertube.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - app: - environment: - - PEERTUBE_RTMP_ENABLED - ports: - - "1935:1935" diff --git a/compose.ssb.yml b/compose.ssb.yml deleted file mode 100644 index 76520f3..0000000 --- a/compose.ssb.yml +++ /dev/null @@ -1,7 +0,0 @@ -version: "3.8" -services: - app: - environment: - - SSB_MUXRPC_ENABLED - ports: - - "8008:8008" diff --git a/compose.yml b/compose.yaml similarity index 86% rename from compose.yml rename to compose.yaml index 25d7f71..eb1aeda 100644 --- a/compose.yml +++ b/compose.yaml @@ -1,12 +1,6 @@ ---- -version: "3.8" - services: app: - image: "traefik:v2.8.1" - # 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 + image: "traefik:v2.10.1" ports: - "80:80" - "443:443" @@ -68,4 +62,4 @@ configs: template_driver: golang volumes: - letsencrypt: + letsencrypt: \ No newline at end of file