From dc295e151b45b1db63b5518ef8489e120ce97cc4 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sat, 14 Nov 2020 15:59:40 -0600
Subject: [PATCH] Move to my own fork of the idiot webdav container.

---
 ansible/roles/mediaserver/tasks/main.yml           | 14 ++++++++++++++
 .../mediaserver/templates/mediaserver-compose.yml  | 14 ++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/mediaserver/tasks/main.yml b/ansible/roles/mediaserver/tasks/main.yml
index 9a81b50..276c849 100644
--- a/ansible/roles/mediaserver/tasks/main.yml
+++ b/ansible/roles/mediaserver/tasks/main.yml
@@ -39,6 +39,20 @@
 - name: ensure traefik config directory exists
   file: state=directory path=/home/josiah/apps/traefik/ owner=josiah group=josiah mode=0700
 
+- name: ensure the webdav-docker repo exists
+  git:
+    repo: 'https://git.awful.club/hosted/webdav-docker.git'
+    dest: /home/josiah/apps/webdav-docker/
+    version: master
+
+- name: build jlj-webdav image
+  community.general.docker_image:    
+    name: jlj-webdav
+    build: 
+      path: /home/josiah/apps/webdav-docker/latest
+      dockerfile: Dockerfile
+    source: build
+
 - name: ensure mediaserver config directory exists
   file: state=directory path=/home/josiah/apps/mediaserver/ owner=josiah group=josiah mode=0700  
 
diff --git a/ansible/roles/mediaserver/templates/mediaserver-compose.yml b/ansible/roles/mediaserver/templates/mediaserver-compose.yml
index 043e1e7..cc05800 100644
--- a/ansible/roles/mediaserver/templates/mediaserver-compose.yml
+++ b/ansible/roles/mediaserver/templates/mediaserver-compose.yml
@@ -161,7 +161,6 @@ services:
     # https://github.com/v2tec/watchtower#options
     # This schedule applies updates (if available) at midnight.
     command: --cleanup --schedule "0 0 0 * * *"
-    restart: always
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     networks:
@@ -176,27 +175,26 @@ services:
 
   # The main WebDAV container.
   webdav:
-    # https://hub.docker.com/r/bytemark/webdav/
-    image: bytemark/webdav
-    restart: always
+    # https://hub.docker.com/r/bytemark/webdav/    
+    image: jlj-webdav:latest
     networks:
       - pubnet
     volumes:
       # - /home/josiah/apps/webdav/user.passwd:/user.passwd
-      - /home/josiah/sync/:/var/lib/dav/data
+      - /home/josiah/webdav/:/var/lib/dav/
     environment:
       SERVER_NAMES: "hatchery.home.jowj.net"
       LOCATION: "/webdav"
       USERNAME: josiah
-      PASSWORD: "{{ vault_mediaserver_webdav_password }}"
+      PASSWORD: "{{ vault_mediaserver_webdav_password }}" 
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.mediaserver-webdav.rule=Host(`hatchery.home.jowj.net`) && PathPrefix(`/webdav`)"
       - "traefik.http.routers.mediaserver-webdav.service=mediaserver-webdav"
       - "traefik.http.services.mediaserver-webdav.loadbalancer.server.port=80"
       - "traefik.http.routers.mediaserver-webdav.tls.certResolver=mediaserver-resolver"
-      - "traefik.http.routers.mediaserver-webdav.tls=true"        
-      
+      - "traefik.http.routers.mediaserver-webdav.tls=true"
+        
 volumes:
   traefik_acme:
   traefik_logs: