From 622fe5665a108a8cd9c12c0b0608cd32c4df12dc Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@arxes-tolina.de>
Date: Tue, 24 Aug 2021 11:34:09 +0200
Subject: [PATCH] SMARCH-81: bugfix: fixed installation path (webdav ->
 dev-webdav-01)

---
 roles/webdav/tasks/main.yaml | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/roles/webdav/tasks/main.yaml b/roles/webdav/tasks/main.yaml
index d8fd35a..8d9f8dd 100644
--- a/roles/webdav/tasks/main.yaml
+++ b/roles/webdav/tasks/main.yaml
@@ -15,24 +15,24 @@
 
 - name: "Check if webdav/docker-compose.yml exists"
   stat:
-    path: '{{ service_base_path }}/webdav/docker-compose.yml'
+    path: '{{ service_base_path }}/{{ service_name }}/docker-compose.yml'
   register: check_docker_compose_file
 
 - name: "Stop webdav"
   shell: docker-compose down
   args:
-    chdir: '{{ service_base_path }}/webdav'
+    chdir: '{{ service_base_path }}/{{ service_name }}'
   when: check_docker_compose_file.stat.exists
   ignore_errors: yes
 
-- name: "Deploy docker templates for webdav"
+- name: "Deploy docker templates for {{ service_name }}"
   include_role:
     name: _deploy
     tasks_from: templates
   vars:
     current_config: "_docker"
     current_base_path: "{{ service_base_path }}"
-    current_destination: "webdav"
+    current_destination: "{{ service_name }}"
     current_owner: "{{ docker_owner }}"
     current_group: "{{ docker_group }}"
     current_docker: "{{ webdav_docker }}"
@@ -44,32 +44,21 @@
   vars:
     current_config: "webdav"
     current_base_path: "{{ service_base_path }}"
-    current_destination: "webdav"
+    current_destination: "{{ service_name }}"
     current_owner: "{{ docker_owner }}"
     current_group: "{{ docker_group }}"
 
-- name: "Deploy certificate templates for webdav"
-  include_role:
-    name: _deploy
-    tasks_from: templates
-  vars:
-    current_config: "elastic-certs/certs"
-    current_base_path: "{{ service_base_path }}"
-    current_destination: "webdav/certs"
-    current_owner: "{{ docker_owner }}"
-    current_group: "{{ docker_group }}"
-
-- name: "Update webdav"
+- name: "Update {{ service_name }}"
   shell: docker-compose pull
   args:
-    chdir: '{{ service_base_path }}/webdav'
+    chdir: '{{ service_base_path }}/{{ service_name }}'
   tags:
     - update_deployment
 
-- name: "Start webdav"
+- name: "Start {{ service_name }}"
   shell: docker-compose up -d
   args:
-    chdir: '{{ service_base_path }}/webdav'
+    chdir: '{{ service_base_path }}/{{ service_name }}'
 
 - name: "Send mattermost messsge"
   uri: