From 66ff8d3660660eb8cbb5684326cb60a8e9222fbc Mon Sep 17 00:00:00 2001
From: Florent VINCENT <diroots@no-log.org>
Date: Mon, 16 Mar 2020 08:14:40 +0000
Subject: [PATCH] Revert "Merge branch 'account-deletion' into 'develop'"

This reverts merge request !59
---
 ansible.yml                                         | 1 -
 group_vars/all                                      | 1 -
 scripts/postinstall.sh                              | 8 +++++---
 templates/docker-compose/01-docker-compose-base.yml | 7 +------
 templates/nginx/sites-enabled/nextcloud.conf        | 3 ---
 5 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ansible.yml b/ansible.yml
index 6aff86d..cb694ad 100644
--- a/ansible.yml
+++ b/ansible.yml
@@ -88,7 +88,6 @@
       - { path: '/mnt/repo-base/config-dynamic/letsencrypt/autorenew', owner: root }
       - { path: '/mnt/repo-base/config-dynamic/nginx/sites-enabled', owner: root }
       - { path: '/mnt/repo-base/volumes/accounts/', owner: www-data }
-      - { path: '/mnt/repo-base/volumes/create-account/', owner: 900 }
 
   # NOTE: This does not delete files that have been deleted from the repo, need to do that manually.
   - name: copy static config files
diff --git a/group_vars/all b/group_vars/all
index 951bca0..73572a6 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -1,5 +1,4 @@
 # MUST SPECIFY
-# TODO: need to do something about these variables so they are not committed to git
 domain: ""
 additional_domains: []
 contact_email: "<user-email>"
diff --git a/scripts/postinstall.sh b/scripts/postinstall.sh
index ed373e4..94716e5 100755
--- a/scripts/postinstall.sh
+++ b/scripts/postinstall.sh
@@ -1,15 +1,17 @@
 #!/usr/bin/env bash
 set -ex
 
-# TODO: it looks like this script is executed twice when installing with ansible
-
 source /mnt/repo-base/scripts/base.sh
 
 echo -e "\nHack: restart everything to ensure that database and nextcloud are initialized"
 docker-compose restart
 
 printf "$(date): Waiting for Nextcloud to finish installation"
-sleep 300
+# sleep for 300 seconds
+for i in {0..300}; do
+  sleep 1
+  printf "."
+done
 
 # Create Nextcloud mysql database and user
 docker-compose exec -T mariadb mysql --user=root --password="$MYSQL_ROOT_PASSWORD" \
diff --git a/templates/docker-compose/01-docker-compose-base.yml b/templates/docker-compose/01-docker-compose-base.yml
index 27a9b1d..4abf423 100644
--- a/templates/docker-compose/01-docker-compose-base.yml
+++ b/templates/docker-compose/01-docker-compose-base.yml
@@ -134,7 +134,7 @@ services:
       - /mnt/repo-base/config-dynamic/automx/automx.conf:/etc/automx.conf
 
   create-account:
-    image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.1.0
+    image: registry.gitlab.e.foundation:5000/e/infra/docker-create-account:1.0.1
     container_name: create-account
     restart: always
     environment:
@@ -143,11 +143,6 @@ services:
       - POSTFIXADMIN_SSH_PASSWORD=${POSTFIXADMIN_SSH_PASSWORD}
       - DOMAIN=${DOMAIN}
       - CREATE_ACCOUNT_PASSWORD=${CREATE_ACCOUNT_PASSWORD}
-      - SMTP_HOST=${SMTP_HOST}
-      - SMTP_FROM=${SMTP_FROM}
-      - SMTP_PASSWORD=${SMTP_PW}
-    volumes:
-      - /mnt/repo-base/volumes/create-account:/data
     networks:
       - serverbase
     depends_on:
diff --git a/templates/nginx/sites-enabled/nextcloud.conf b/templates/nginx/sites-enabled/nextcloud.conf
index 39be267..38e8dcc 100644
--- a/templates/nginx/sites-enabled/nextcloud.conf
+++ b/templates/nginx/sites-enabled/nextcloud.conf
@@ -92,7 +92,4 @@ server {
         add_header Referrer-Policy no-referrer;
         access_log off;
     }
-    location ~ /(delete-account|delete-account-form|confirm-delete-account) {
-        proxy_pass http://create-account:9000;
-    }
 }
-- 
GitLab