Refactored folder structure

roles/docker-mailu/handlers/main.yml

@@ -2,7 +2,7 @@
 - name: recreate mailu
   command:
     cmd: docker-compose -p mailu up -d --force-recreate
-    chdir: /usr/local/bin/mailu/
+    chdir: /home/administrator/docker-compose/mailu/
 - name: "restart deploy-letsencrypt-mailu.service"
   systemd:
     name: deploy-letsencrypt-mailu.service

roles/docker-mailu/tasks/main.yml

@@ -9,6 +9,18 @@
   template: src=roles/native-docker-reverse-proxy/templates/domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
   notify: restart nginx
 
+- name: "create /home/administrator/docker-compose/mailu"
+  file:
+    path: "/home/administrator/docker-compose/mailu"
+    state: directory
+    mode: 0755
+
+- name: "create /home/administrator/scripts/mailu"
+  file:
+    path: "/home/administrator/scripts/mailu"
+    state: directory
+    mode: 0755
+
 - name: "create /etc/mailu/"
   file:
     path: "/etc/mailu"
@@ -21,22 +33,16 @@
     state: directory
     mode: 0755
 
-- name: "create /usr/local/bin/mailu/"
-  file:
-    path: "/usr/local/bin/mailu"
-    state: directory
-    mode: 0755
-
 - name: add docker-compose.yml
-  template: src=docker-compose.yml.j2 dest=/usr/local/bin/mailu/docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/mailu/docker-compose.yml
   notify: recreate mailu
 
 - name: add mailu.env
-  template: src=mailu.env.j2 dest=/usr/local/bin/mailu/mailu.env
+  template: src=mailu.env.j2 dest=/home/administrator/docker-compose/mailu/mailu.env
   notify: recreate mailu
 
 - name: add deploy-letsencrypt-mailu.sh
-  template: src=deploy-letsencrypt-mailu.sh.j2 dest=/usr/local/bin/mailu/deploy-letsencrypt-mailu.sh
+  template: src=deploy-letsencrypt-mailu.sh.j2 dest=/home/administrator/scripts/mailu/deploy-letsencrypt-mailu.sh
 
 - name: configure deploy-letsencrypt-mailu.service
   template: src=deploy-letsencrypt-mailu.service.j2 dest=/etc/systemd/system/deploy-letsencrypt-mailu.service

roles/docker-mailu/templates/deploy-letsencrypt-mailu.service.j2

@@ -4,4 +4,4 @@ OnFailure=systemd-email@%n.service
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/bash /usr/local/bin/mailu/deploy-letsencrypt-mailu.sh
+ExecStart=/usr/bin/bash /home/administrator/scripts/mailu/deploy-letsencrypt-mailu.sh

roles/docker-mailu/templates/docker-compose.yml.j2

@@ -17,6 +17,8 @@ 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
 

roles/docker-nextcloud/tasks/main.yml

@@ -7,23 +7,22 @@
   notify: restart nginx
 
 # @todo rename
-- name: "create /usr/local/bin/docker-nextcloud/"
+- name: "create /home/administrator/volumes/docker/nextcloud/"
   file:
-    path: "/usr/local/bin/docker-nextcloud"
+    path: "/home/administrator/volumes/docker/nextcloud"
     state: directory
     mode: 0755
 
 - name: configure nginx.conf
-  template: src=templates/nginx.conf.j2 dest=/usr/local/bin/docker-nextcloud/nginx.conf
+  template: src=templates/nginx.conf.j2 dest=/home/administrator/volumes/docker/nextcloud/nginx.conf
   notify: restart nginx
 
-# @todo rename
-- name: "create /usr/local/bin/nextcloud/"
+- name: "create /home/administrator/docker-compose/nextcloud/"
   file:
-    path: "/usr/local/bin/nextcloud"
+    path: "/home/administrator/docker-compose/nextcloud/"
     state: directory
     mode: 0755
 
 - name: add docker-compose.yml
-  template: src=docker-compose.yml.j2 dest=/usr/local/bin/nextcloud/docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/home/administrator/docker-compose/nextcloud/docker-compose.yml
   notify: recreate nextcloud

roles/docker-nextcloud/templates/docker-compose.yml.j2

@@ -41,7 +41,7 @@ services:
     depends_on:
       - application
     volumes:
-        - /usr/local/bin/docker-nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro
+        - /home/administrator/volumes/docker/nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro
     volumes_from:
       - application
   redis:

roles/docker-wordpress/README.md

@@ -15,3 +15,6 @@ cat > wp-config.php << EOF
 #content
 EOF
 ```
+
+## multiside
+- https://multilingualpress.de/doku/wordpress-multisite-installieren-einrichten/

roles/native-docker/meta/main.yml

@@ -1,2 +1,3 @@
 dependencies:
   - native-docker-volume-backup
+  - native-user-administrator

roles/native-docker/tasks/main.yml

@@ -5,5 +5,21 @@
     state: present
   notify: docker restart
 
+- name: "create /home/administrator/docker-compose/"
+  file:
+    path: "/home/administrator/docker-compose"
+    state: directory
+    mode: 0700
+    owner: administrator
+    group: administrator
+
+- name: "create /home/administrator/volumes/docker"
+  file:
+    path: "/home/administrator/volumes/docker"
+    state: directory
+    mode: 0700
+    owner: administrator
+    group: administrator
+
 - name: flush docker service
   meta: flush_handlers

roles/native-user-administrator/tasks/main.yml

@@ -24,3 +24,19 @@
     owner: root
     group: root
   notify: sshd restart
+
+- name: "create /home/administrator/scripts/"
+  file:
+    path: "/home/administrator/scripts"
+    state: directory
+    owner: administrator
+    group: administrator
+    mode: 0700
+
+- name: "create /home/administrator/volumes/"
+  file:
+    path: "/home/administrator/volumes"
+    state: directory
+    owner: administrator
+    group: administrator
+    mode: 0700