From 8d4d558544fc283bfa25e258c311876146e2af8c Mon Sep 17 00:00:00 2001
From: "Kevin Veen-Birkenbach [aka. Frantz]" <kevin@veen.world>
Date: Thu, 21 Oct 2021 08:19:19 +0200
Subject: [PATCH] Changed paths,versions and set environment variables correct

---
 roles/docker-mailu/handlers/main.yml                   | 3 +++
 roles/docker-mailu/templates/docker-compose.yml.j2     | 2 --
 roles/docker-mailu/templates/mailu.env.j2              | 4 ----
 roles/docker-nextcloud/handlers/main.yml               | 5 ++++-
 roles/docker-nextcloud/templates/docker-compose.yml.j2 | 6 +-----
 roles/docker-wordpress/tasks/main.yml                  | 5 +++--
 roles/docker-yourls/tasks/main.yml                     | 5 +++--
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/roles/docker-mailu/handlers/main.yml b/roles/docker-mailu/handlers/main.yml
index cc346bfb..d94a8b14 100644
--- a/roles/docker-mailu/handlers/main.yml
+++ b/roles/docker-mailu/handlers/main.yml
@@ -3,6 +3,9 @@
   command:
     cmd: docker-compose -p mailu up -d --force-recreate
     chdir: /home/administrator/docker-compose/mailu/
+  environment:
+    COMPOSE_HTTP_TIMEOUT: 120
+    DOCKER_CLIENT_TIMEOUT: 120
 - name: "restart deploy-letsencrypt-mailu.service"
   systemd:
     name: deploy-letsencrypt-mailu.service
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index 0affe6c4..233238c2 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -17,8 +17,6 @@ services:
       MYSQL_USER: "mailu"
       MYSQL_PASSWORD: "{{mailu_database_password}}"
       MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
-      COMPOSE_HTTP_TIMEOUT: 120
-      DOCKER_CLIENT_TIMEOUT: 120
     volumes:
       - database:/var/lib/mysql
 
diff --git a/roles/docker-mailu/templates/mailu.env.j2 b/roles/docker-mailu/templates/mailu.env.j2
index 0a85ad40..d00dfc04 100644
--- a/roles/docker-mailu/templates/mailu.env.j2
+++ b/roles/docker-mailu/templates/mailu.env.j2
@@ -8,10 +8,6 @@
 # Common configuration variables
 ###################################
 
-# TIMEOUTS
-COMPOSE_HTTP_TIMEOUT=300
-DOCKER_CLIENT_TIMEOUT=300
-
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{mailu_secret_key}}
 
diff --git a/roles/docker-nextcloud/handlers/main.yml b/roles/docker-nextcloud/handlers/main.yml
index 73e304d6..05865b06 100644
--- a/roles/docker-nextcloud/handlers/main.yml
+++ b/roles/docker-nextcloud/handlers/main.yml
@@ -2,4 +2,7 @@
 - name: recreate nextcloud
   command:
     cmd: docker-compose -p nextcloud up -d --force-recreate
-    chdir: /usr/local/bin/nextcloud/
+    chdir: /home/administrator/docker-compose/nextcloud/
+  environment:
+    COMPOSE_HTTP_TIMEOUT: 120
+    DOCKER_CLIENT_TIMEOUT: 120
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index 35d0f84e..0f6f035e 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 services:
   application:
@@ -11,8 +11,6 @@ services:
     volumes:
       - data:/var/www/html
     environment:
-      COMPOSE_HTTP_TIMEOUT: 120
-      DOCKER_CLIENT_TIMEOUT: 120
       MYSQL_DATABASE: "nextcloud"
       MYSQL_USER: "nextcloud"
       MYSQL_PASSWORD: "{{nextcloud_database_password}}"
@@ -22,8 +20,6 @@ services:
       driver: journald
     image: mariadb
     environment:
-      COMPOSE_HTTP_TIMEOUT: 120
-      DOCKER_CLIENT_TIMEOUT: 120
       MYSQL_DATABASE: "nextcloud"
       MYSQL_USER: "nextcloud"
       MYSQL_PASSWORD: "{{nextcloud_database_password}}"
diff --git a/roles/docker-wordpress/tasks/main.yml b/roles/docker-wordpress/tasks/main.yml
index 11043409..efea07d6 100644
--- a/roles/docker-wordpress/tasks/main.yml
+++ b/roles/docker-wordpress/tasks/main.yml
@@ -12,6 +12,9 @@
   notify: restart nginx
 
 - name: "setup wordpress"
+  environment:
+    DOCKER_CLIENT_TIMEOUT:  120
+    COMPOSE_HTTP_TIMEOUT:   120
   docker_compose:
     project_name: wordpress
     definition:
@@ -22,8 +25,6 @@
         ports:
           - "127.0.0.1:{{http_port}}:80"
         environment:
-          DOCKER_CLIENT_TIMEOUT:  120
-          COMPOSE_HTTP_TIMEOUT:   120
           WORDPRESS_DB_HOST:      database:3306
           WORDPRESS_DB_USER:      "wordpress"
           WORDPRESS_DB_PASSWORD:  "{{wordpress_database_password}}"
diff --git a/roles/docker-yourls/tasks/main.yml b/roles/docker-yourls/tasks/main.yml
index 105b8d0e..d80ac424 100644
--- a/roles/docker-yourls/tasks/main.yml
+++ b/roles/docker-yourls/tasks/main.yml
@@ -7,6 +7,9 @@
   notify: restart nginx
 
 - name: "setup yourls"
+  environment:
+    DOCKER_CLIENT_TIMEOUT:  120
+    COMPOSE_HTTP_TIMEOUT:   120
   docker_compose:
     project_name: yourls
     definition:
@@ -16,8 +19,6 @@
         ports:
           - "127.0.0.1:{{http_port}}:80"
         environment:
-          DOCKER_CLIENT_TIMEOUT:  120
-          COMPOSE_HTTP_TIMEOUT:   120
           YOURLS_DB_HOST: "database:3306"
           YOURLS_DB_USER: "yourls"
           YOURLS_DB_PASS: "{{yourls_database_password}}"