From 268f55d829320d26629a2d8e5ee22fd785267059 Mon Sep 17 00:00:00 2001
From: 3wc <3wc.git@doesthisthing.work>
Date: Wed, 9 Sep 2020 01:01:15 +0200
Subject: [PATCH] =?UTF-8?q?Use=20upstream=20auto-config=20=F0=9F=98=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .envrc.sample      |  5 +++--
 compose.yml        | 23 +++++++----------------
 entrypoint.sh.tmpl | 20 --------------------
 3 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 entrypoint.sh.tmpl

diff --git a/.envrc.sample b/.envrc.sample
index 4dff76f..a1fd65b 100644
--- a/.envrc.sample
+++ b/.envrc.sample
@@ -2,5 +2,6 @@ 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 DB_ROOT_PASSWORD_VERSION=v1
+export DB_PASSWORD_VERSION=v1
+export ADMIN_PASSWORD_VERSION=v1
diff --git a/compose.yml b/compose.yml
index 4f33db4..688405f 100644
--- a/compose.yml
+++ b/compose.yml
@@ -9,10 +9,15 @@ services:
       - db_password
       - admin_password
     environment:
-      - MYSQL_HOST=mariadb
-      - MYSQL_DATABASE=nextcloud
       - DOMAIN=${DOMAIN}
       - STACK_NAME=${STACK_NAME}
+      - MYSQL_HOST=mariadb
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+      - MYSQL_PASSWORD_FILE=/run/secrets/db_password
+      - NEXTCLOUD_ADMIN_USER=admin
+      - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
+      - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
     volumes:
       - nextapps:/var/www/html/custom_apps:cached
       - nextdata:/var/www/html/data:cached
@@ -26,12 +31,6 @@ services:
       timeout: 10s
       retries: 10
       start_period: 1m
-    configs:
-      - source: entrypoint_conf
-        target: /docker-entrypoint.sh
-        mode: 0555
-        user: www-data
-        group: www-data
     deploy:
       restart_policy:
         condition: on-failure
@@ -43,8 +42,6 @@ services:
         - "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"
-    #entrypoint: ["setpriv", "--reuid=www-data", "--regid=www-data", "--init-groups", "/docker-entrypoint.sh"]
-    entrypoint: ["tail", "-f", "/dev/null"]
 
   mariadb:
     image: "mariadb:10.5"
@@ -82,9 +79,3 @@ networks:
   proxy:
     external: true
   internal:
-
-configs:
-  entrypoint_conf:
-    name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_CONF_VERSION}
-    file: entrypoint.sh.tmpl
-    template_driver: golang
diff --git a/entrypoint.sh.tmpl b/entrypoint.sh.tmpl
deleted file mode 100644
index f202c81..0000000
--- a/entrypoint.sh.tmpl
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -x
-
-SUDO="setpriv --reuid=www-data --regid=www-data --init-groups"
-OCC="php /var/www/html/occ"
-
-if ! $SUDO $OCC status | grep -q 'installed: true'; then
-	$SUDO $OCC --no-ansi -n maintenance:install \
-		--database "mysql" \
-		--database-name "nextcloud" \
-		--database-host "mariadb" \
-		--database-user "nextcloud" \
-		--database-pass "$(tr -d '\n' < /run/secrets/db_password)" \
-		--admin-pass "$(tr -d '\n' < /run/secrets/admin_password)"
-
-fi
-
-$SUDO php $OCC config:system:set trusted_domains 1 --value={{ env "DOMAIN" }}
-
-/entrypoint.sh apache2-foreground