From 8947e3a528f4deea685a97b2ee6a989e2182a0ed Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sun, 5 Jul 2020 02:34:56 +0200
Subject: [PATCH] Add default, shorten start check and remove outdated cruft

---
 compose.yml | 4 ++--
 helpers.sh  | 8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/compose.yml b/compose.yml
index 33db8dd1..9198f19e 100644
--- a/compose.yml
+++ b/compose.yml
@@ -30,7 +30,7 @@ services:
       interval: 15s
       timeout: 10s
       retries: 10
-      start_period: 30s
+      start_period: 15s
     deploy:
       update_config:
         failure_action: rollback
@@ -41,7 +41,7 @@ services:
         - "traefik.http.routers.gitea.rule=Host(`${DOMAIN}`)"
         - "traefik.http.routers.gitea.entrypoints=web-secure"
         - "traefik.http.services.gitea.loadbalancer.server.port=3000"
-        - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV}"
+        - "traefik.http.routers.gitea.tls.certresolver=${LETS_ENCRYPT_ENV:production}"
 
         - "traefik.tcp.routers.gitea-ssh.rule=HostSNI(`*`)"
         - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh"
diff --git a/helpers.sh b/helpers.sh
index 0e529d60..72f75d41 100755
--- a/helpers.sh
+++ b/helpers.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-create-secrets () {
-  pwgen -n 32 1  | docker secret create "${STACK_NAME}_db_passwd_${DB_PASSWD_VERSION}" -
-  pwgen -n 32 1  | docker secret create "${STACK_NAME}_db_root_passwd_${DB_ROOT_PASSWD_VERSION}" -
-  pwgen -n 105 1 | docker secret create "${STACK_NAME}_internal_token_${INTERNAL_TOKEN_VERSION}" -
-  pwgen -n 43 1  | docker secret create "${STACK_NAME}_jwt_secret_${JWT_SECRET_VERSION}" -
-  pwgen -n 64 1  | docker secret create "${STACK_NAME}_secret_key_${SECRET_KEY_VERSION}" -
-}
-
 create-admin () {
   container=$(docker container ls -f "name=${STACK_NAME}_gitea" -q)
   docker exec "$container" \