From 4cde5121b7112d3ec13a4f9e3c01a0cee5aae038 Mon Sep 17 00:00:00 2001
From: Christian Galo <christian.galo@outlook.com>
Date: Fri, 8 Sep 2023 06:15:14 +0000
Subject: [PATCH] =?UTF-8?q?=C2=BFAbra=3F=20No.=20=C2=A1Cierre!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                                    | 23 -------------------
 .env.sample                                   | 21 -----------------
 .gitignore                                    |  1 +
 abra.sh                                       |  1 -
 compose.smtpauth.yml => compose.smtpauth.yaml |  5 +---
 compose.yml => compose.yaml                   | 12 ++--------
 6 files changed, 4 insertions(+), 59 deletions(-)
 delete mode 100644 .drone.yml
 delete mode 100644 .env.sample
 create mode 100644 .gitignore
 delete mode 100644 abra.sh
 rename compose.smtpauth.yml => compose.smtpauth.yaml (77%)
 rename compose.yml => compose.yaml (86%)

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index 942c76f..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm-test.autonomic.zone
-steps:
-  - name: deployment
-    image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
-    settings:
-      host: swarm-test.autonomic.zone
-      stack: discourse
-      generate_secrets: true
-      purge: true
-      deploy_key:
-        from_secret: drone_ssh_swarm_test
-      networks:
-        - proxy
-    environment:
-      DOMAIN: discourse.swarm-test.autonomic.zone
-      STACK_NAME: discourse
-      LETS_ENCRYPT_ENV: production
-      SECRET_DB_PASSWORD_VERSION: v1
-trigger:
-  branch:
-    - main
diff --git a/.env.sample b/.env.sample
deleted file mode 100644
index fd54e8f..0000000
--- a/.env.sample
+++ /dev/null
@@ -1,21 +0,0 @@
-TYPE=discourse
-
-DOMAIN=discourse.example.com
-## Domain aliases
-#EXTRA_DOMAINS=', `www.discourse.example.com`'
-LETS_ENCRYPT_ENV=production
-
-# Outgoing email
-#DISCOURSE_SMTP_HOST=
-#DISCOURSE_SMTP_PORT=
-#DISCOURSE_SMTP_USER=
-#DISCOURSE_SMTP_PROTOCOL=
-#DISCOURSE_SMTP_AUTH=
-# Set this if you send e-mails from a different domain than noreply@$DOMAIN
-#DISCOURSE_NOTIFICATION_EMAIL=$SMTP_USER
-
-# SMTP authentication
-#COMPOSE_FILE="compose.yml:compose.smtpauth.yml"
-#SECRET_SMTP_PASSWORD_VERSION=v1
-
-SECRET_DB_PASSWORD_VERSION=v1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2eea525
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.env
\ No newline at end of file
diff --git a/abra.sh b/abra.sh
deleted file mode 100644
index 1c66304..0000000
--- a/abra.sh
+++ /dev/null
@@ -1 +0,0 @@
-export DB_ENTRYPOINT_VERSION=v1
diff --git a/compose.smtpauth.yml b/compose.smtpauth.yaml
similarity index 77%
rename from compose.smtpauth.yml
rename to compose.smtpauth.yaml
index 8b23f8d..61bdcfb 100644
--- a/compose.smtpauth.yml
+++ b/compose.smtpauth.yaml
@@ -1,6 +1,3 @@
----
-version: "3.8"
-
 services:
   app:
     environment:
@@ -17,4 +14,4 @@ services:
 secrets:
   smtp_password:
     external: true
-    name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
+    name: ${STACK_NAME}_smtp_password
diff --git a/compose.yml b/compose.yaml
similarity index 86%
rename from compose.yml
rename to compose.yaml
index 80cbc39..224da4f 100644
--- a/compose.yml
+++ b/compose.yaml
@@ -1,6 +1,3 @@
----
-version: "3.8"
-
 services:
   app:
     image: bitnami/discourse:3.0.6
@@ -39,11 +36,6 @@ services:
         - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
         - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
         - "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}"
-        - "coop-cloud.${STACK_NAME}.version=0.5.0+3.0.6"
     # healthcheck:
     #   test: ["CMD", "curl", "-f", "http://localhost:3000"]
     #   interval: 30s
@@ -114,7 +106,7 @@ services:
 secrets:
   db_password:
     external: true
-    name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
+    name: ${STACK_NAME}_db_password
 
 volumes:
   postgresql_data:
@@ -128,6 +120,6 @@ networks:
 
 configs:
   db_entrypoint:
-    name: ${STACK_NAME}_db_entrypoint_${DB_ENTRYPOINT_VERSION}
+    name: ${STACK_NAME}_db_entrypoint
     file: entrypoint.postgres.sh.tmpl
     template_driver: golang