From 5595907433b9061c60ba87290824a0c2a5aba6e7 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Mon, 28 Dec 2020 21:24:32 +0100
Subject: [PATCH] optimized mailu paths

---
 roles/docker-mailu/Readme.md                       |  8 ++++----
 roles/docker-mailu/files/mailu.service             |  2 +-
 roles/docker-mailu/tasks/main.yml                  | 14 ++++++++++----
 roles/docker-mailu/templates/docker-compose.yml.j2 |  8 ++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/roles/docker-mailu/Readme.md b/roles/docker-mailu/Readme.md
index 5fde078d..be893759 100644
--- a/roles/docker-mailu/Readme.md
+++ b/roles/docker-mailu/Readme.md
@@ -2,11 +2,11 @@
 
 ## setup
 
-### volumes
+### delete data
 To delete all volumes and data execute:
 
 ```bash
-  rm -vr /mailu/; docker volume rm $(docker volume ls -q | grep mailu_)
+  rm -vr /etc/mailu/; docker volume rm $(docker volume ls -q | grep mailu_)
 ```
 Be careful!
 
@@ -25,10 +25,10 @@ to verify that there aren't port conflicts
 Before you can use Mailu, you must create the primary administrator user account. This should be admin@{{hostname}}. Use the following command, changing PASSWORD to your liking:
 
 ```bash
-  docker-compose -p mailu exec admin flask mailu admin admin {{hostname}} PASSWORD
+  docker-compose -p mailu exec admin flask mailu admin {{admin}} {{hostname}} PASSWORD
 ```
 
-### user management
+### cli user management
 How to manage users is described here: https://mailu.io/master/cli.html
 
 ### Up
diff --git a/roles/docker-mailu/files/mailu.service b/roles/docker-mailu/files/mailu.service
index 72d72da7..54ed4193 100644
--- a/roles/docker-mailu/files/mailu.service
+++ b/roles/docker-mailu/files/mailu.service
@@ -4,7 +4,7 @@ After=network.target docker.service
 
 [Service]
 Type=simple
-WorkingDirectory=/mailu
+WorkingDirectory=/usr/local/bin/mailu
 ExecStart=/bin/docker-compose up
 ExecStop=/bin/docker-compose down
 
diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml
index 55f61a76..5e8cd029 100644
--- a/roles/docker-mailu/tasks/main.yml
+++ b/roles/docker-mailu/tasks/main.yml
@@ -7,18 +7,24 @@
   template: src=domain.conf.j2 dest=/etc/nginx/conf.d/{{domain}}.conf
   notify: restart nginx
 
-- name: "create mailu dir"
+- name: "create /etc/mailu/"
   file:
-    path: "/mailu"
+    path: "/etc/mailu"
+    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=/mailu/docker-compose.yml
+  template: src=docker-compose.yml.j2 dest=/usr/local/bin/mailu/docker-compose.yml
   notify: restart mailu
 
 - name: add mailu.env
-  template: src=mailu.env.j2 dest=/mailu/mailu.env
+  template: src=mailu.env.j2 dest=/usr/local/bin/mailu/mailu.env
   notify: restart mailu
 
 - name: "install mailu service"
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index d0f79f47..6bc5173d 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -38,7 +38,7 @@ services:
       - "{{ ip4_address }}:993:993"
     volumes:
       - "/etc/letsencrypt:/certs/letsencrypt:ro"
-      - "/mailu/overrides/nginx:/overrides"
+      - "/etc/mailu/overrides/nginx:/overrides"
       - "front_certs:/certs"
   admin:
     image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.8}
@@ -55,7 +55,7 @@ services:
     env_file: mailu.env
     volumes:
       - "dovecot_mail:/mail"
-      - "/mailu/overrides:/overrides"
+      - "/etc/mailu/overrides:/overrides"
     depends_on:
       - front
 
@@ -64,7 +64,7 @@ services:
     restart: always
     env_file: mailu.env
     volumes:
-      - "/mailu/overrides:/overrides"
+      - "/etc/mailu/overrides:/overrides"
       - "smtp_queue:/queue"
     depends_on:
       - front
@@ -76,7 +76,7 @@ services:
     volumes:
       - "filter:/var/lib/rspamd"
       - "dkim:/dkim"
-      - "/mailu/overrides/rspamd:/etc/rspamd/override.d"
+      - "/etc/mailu/overrides/rspamd:/etc/rspamd/override.d"
     depends_on:
       - front