From 5c5e3dfed785868f6ff75ae720c5fa23c68e4a5f Mon Sep 17 00:00:00 2001
From: Jan Zernisch <jan.zernisch@invision.de>
Date: Fri, 24 Mar 2023 13:12:33 +0100
Subject: [PATCH] fixed config bugs

---
 roles/homeserver/tasks/npm.yml | 28 ++++++++++++++++++++++++----
 roles/homeserver/vars/main.yml |  7 ++++++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/roles/homeserver/tasks/npm.yml b/roles/homeserver/tasks/npm.yml
index 6834f46..71c9da0 100644
--- a/roles/homeserver/tasks/npm.yml
+++ b/roles/homeserver/tasks/npm.yml
@@ -1,4 +1,20 @@
 ---
+- name: Create NPM directories if it does not exist
+  become: false
+  ansible.builtin.file:
+    path: /home/{{ user['name'] }}/docker/npm/{{ item }}
+    state: directory
+    mode: '0755'
+  loop: '{{ npm_folder }}'
+
+- name: Create docker network 'npm_internal'
+  community.docker.docker_network:
+    name: npm_internal
+
+- name: Create docker network 'proxy'
+  community.docker.docker_network:
+    name: proxy
+
 - name: Create NPM DB Container
   community.docker.docker_container:
     name: nginx_proxy_manager_db
@@ -11,7 +27,9 @@
       MYSQL_USER: "{{ NPM_MYSQL_USER | string }}"
       MYSQL_PASSWORD: "{{ NPM_MYSQL_PASS | string }}"
     volumes:
-      - ./db:/var/lib/mysql
+      - /home/{{ user['name'] }}/docker/npm/db:/var/lib/mysql
+    networks:
+      - name: npm_internal
 
 - name: Create NPM Container
   community.docker.docker_container:
@@ -30,7 +48,9 @@
       DB_MYSQL_USER: "{{ NPM_MYSQL_USER | string }}"
       DB_MYSQL_PASSWORD: "{{ NPM_MYSQL_PASS | string }}"
       DB_MYSQL_NAME: "{{ NPM_MYSQL_DB | string }}"
-
     volumes:
-      - './data:/data'
-      - ./letsencrypt:/etc/letsencrypt
+      - /home/{{ user['name'] }}/docker/npm/data:/data
+      - /home/{{ user['name'] }}/docker/npm/letsencrypt:/etc/letsencrypt
+    networks:
+      - name: npm_internal
+      - name: proxy
diff --git a/roles/homeserver/vars/main.yml b/roles/homeserver/vars/main.yml
index 8b13e93..595543c 100644
--- a/roles/homeserver/vars/main.yml
+++ b/roles/homeserver/vars/main.yml
@@ -1,4 +1,9 @@
-NPM_MYSQL_HOST: db
+npm_folder:
+ - data
+ - db
+ - letsencrypt
+
+NPM_MYSQL_HOST: 'nginx_proxy_manager_db'
 NPM_MYSQL_PORT: '3306'
 NPM_MYSQL_DB: npm
 NPM_MYSQL_USER: npm