From 6ad288fb7eb33dd0ead8262ce790a78447a790ce Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Tue, 8 Sep 2020 02:38:09 +0200
Subject: [PATCH] Updaate for current docker swarm wisdom

---
 .drone.yml    | 21 ---------------------
 .envrc.sample |  7 +++----
 README.md     | 14 +++++++++++---
 compose.yml   | 16 ++++++++--------
 helpers.sh    |  6 ------
 5 files changed, 22 insertions(+), 42 deletions(-)
 delete mode 100644 .drone.yml
 delete mode 100755 helpers.sh

diff --git a/.drone.yml b/.drone.yml
deleted file mode 100644
index b84d70c..0000000
--- a/.drone.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-kind: pipeline
-name: deploy to swarm.autonomic.zone
-steps:
-  - name: deployment
-    image: decentral1se/drone-stack:19.03.8
-    settings:
-      compose: compose.yml
-      host: tcp://swarm.autonomic.zone:2376
-      stack_name: nextcloud
-      tlsverify: true
-    environment:
-      PLUGIN_CACERT:
-        from_secret: docker_cacert
-      PLUGIN_CERT:
-        from_secret: docker_cert
-      PLUGIN_KEY:
-        from_secret: docker_key
-trigger:
-  branch:
-    - main
diff --git a/.envrc.sample b/.envrc.sample
index 70b3080..4dff76f 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -1,7 +1,6 @@
-export PASSWORD_STORE_DIR=$(pwd)/../../Infrastructure/infrastructure/credentials/password-store
+export DOMAIN=nextcloud.example.com
+export STACK_NAME=nextcloud
+export LETS_ENCRYPT_ENV=production
 
 export DB_ROOT_PASSWD_VERSION=v1
 export DB_PASSWD_VERSION=v1
-export DOMAIN=nextcloud.swarm.autonomic.zone
-export STACK_NAME=nextcloud
-export LETS_ENCRYPT_ENV=production
diff --git a/README.md b/README.md
index 93a21a1..b48f630 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,14 @@
-nextcloud.test.autonomic.zone
+Nextcloud
 ---
 
-[![Build Status](https://drone.autonomic.zone/api/badges/autonomic-cooperative/nextcloud.test.autonomic.zone/status.svg?ref=refs/heads/main)](https://drone.autonomic.zone/autonomic-cooperative/nextcloud.test.autonomic.zone)
-
 Fully automated luxury Nextcloud via docker-swarm.
+
+1. Set up Docker Swarm and [`abra`][abra]
+2. Deploy [`compose-stacks/traefik`][compose-traefik]
+3. `cp .envrc.sample .envrc`
+4. Edit `.envrc` - be sure to change `$DOMAIN` to something that resolves to
+   your Docker swarm box
+5. `direnv allow` (or `. .envrc`)
+6. `abra secret_generate db_password v1 && abra secret_generate db_root_password v2`
+7. `abra deploy`
+8. Open the domain you configured and finish the set-up
diff --git a/compose.yml b/compose.yml
index 2293d02..539ae81 100644
--- a/compose.yml
+++ b/compose.yml
@@ -14,6 +14,7 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_password
       - DOMAIN=${DOMAIN}
+      - STACK_NAME=${STACK_NAME}
     volumes:
       - nextcloud:/var/www/html
       - nextapps:/var/www/html/custom_apps:cached
@@ -28,12 +29,11 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.docker.network=proxy"
-        - "traefik.http.routers.nextcloud.tls=true"
-        - "traefik.http.services.nextcloud.loadbalancer.server.port=80"
-        - "traefik.http.routers.nextcloud.rule=Host(`${DOMAIN}`)"
-        - "traefik.http.routers.nextcloud.tls.certresolver=${LETS_ENCRYPT_ENV}"
-        #- "traefik.http.routers.nextcloud.tls.certresolver=staging"
-        - "traefik.http.routers.nextcloud.entrypoints=web-secure"
+        - "traefik.http.routers.${STACK_NAME}.tls=true"
+        - "traefik.http.services.${STACK_NAME}.loadbalancer.server.port=80"
+        - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
+        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
 
   mariadb:
     image: "mariadb:10.5"
@@ -53,10 +53,10 @@ services:
 secrets:
   db_root_password:    
     external: true 
-    name: ${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_root_password_${DB_ROOT_PASSWORD_VERSION}
   db_password:    
     external: true 
-    name: ${STACK_NAME}_db_passwd_${DB_ROOT_PASSWD_VERSION}
+    name: ${STACK_NAME}_db_password_${DB_ROOT_PASSWORD_VERSION}
 
 volumes:
   nextcloud:
diff --git a/helpers.sh b/helpers.sh
deleted file mode 100755
index 399b7eb..0000000
--- a/helpers.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-create-secrets () {
-  pwgen -n 32 1  | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" -
-  pwgen -n 32 1  | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" -
-}