Merge branch 'sabnzbd' of mdn/ansible into master

roles/mediaserver/tasks/main.yml

@@ -31,17 +31,27 @@
     recurse: yes
   tags: setup
 
+- name: Create sabnzbd conf folder
+  file:
+    state: directory
+    path: /opt/docker/mediaserver/sabnzbd_config/openvpn
+    recurse: yes
+  tags: setup
+
 - name: Place ovpn files
   unarchive:
     src: ovpn.tar.gz
-    dest: /opt/docker/mediaserver/config/openvpn
+    dest: "{{ item }}"
+  loop:
+    - /opt/docker/mediaserver/config/openvpn
+    - /opt/docker/mediaserver/sabnzbd_config/openvpn
   tags: setup, delugevpn
 
 - name: Create dashy config folder
   file:
     state: directory
     path: /opt/docker/mediaserver/dashy_config
-  tags: setup,dashy
+  tags: setup, dashy
 
 - name: Place dashy config file
   copy:

roles/mediaserver/templates/docker-compose.yaml.j2

@@ -35,21 +35,36 @@ services:
         image: binhex/arch-delugevpn:2.1.1-1-01
         restart: unless-stopped
 
-        #    sonarr:
+    arch-sabnzbdvpn:
-        #      image: lscr.io/linuxserver/sonarr
+        cap_add:
-        #      container_name: sonarr
+            - NET_ADMIN
-        #      environment:
+        ports:
-        #        - PUID=1000
+            - '8080:8080'
-        #        - PGID=1000
+            - '8090:8090'
-        #        - TZ=Europe/London
+            - '8119:8118'
-        #      volumes:
+        container_name: sabnzbdvpn
-        #        - ./sonarr_config:/config
+        volumes:
-        #        - /mnt/nfs/martin/TV:/tv #optional
+            - '/mnt/nfs/martin/Downloads:/downloads'
-        #          #- /mnt/nfs/martin/deluge/data:/data/incomplete #optional
+            - './sabnzbd_config:/config'
-        #        - /mnt/nfs/martin/Downloads:/downloads
+            - '/etc/localtime:/etc/localtime:ro'
-        #      ports:
+        environment:
-        #        - 8989:8989
+            - VPN_ENABLED=yes
-        #      restart: unless-stopped
+            - VPN_USER=p3754227
+            - VPN_PASS=xsZtFdAofY
+            - VPN_PROV=pia
+            - VPN_CLIENT=openvpn
+            - STRICT_PORT_FORWARD=yes
+            - ENABLE_PRIVOXY=yes
+            - LAN_NETWORK=192.168.178.0/24
+            - 'NAME_SERVERS=84.200.69.80,37.235.1.174,1.1.1.1,37.235.1.177,84.200.70.40,1.0.0.1'
+            - VPN_INPUT_PORTS=1234
+            - VPN_OUTPUT_PORTS=5678
+            - DEBUG=false
+            - UMASK=000
+            - PUID=0
+            - PGID=0
+        image: binhex/arch-sabnzbdvpn:3.6.0-2-01
+        restart: unless-stopped
 
     sonarr:
       image: mdhiggins/sonarr-sma
@@ -164,9 +179,13 @@ services:
       image: containrrr/watchtower
       volumes:
         - /var/run/docker.sock:/var/run/docker.sock
+        - /etc/localtime:/etc/localtime:ro
       environment:
-        - WATCHTOWER_SCHEDULE="0 0 4 * * *"
+        - WATCHTOWER_SCHEDULE=0 0 4 * * *
-        - WATCHTOWER_CLEANUP="true"
+        - WATCHTOWER_CLEANUP=true
+        - WATCHTOWER_TIMEOUT=30s
+        - WATCHTOWER_INCLUDE_RESTARTING=true
+        - WATCHTOWER_ROLLING_RESTART=true
         - TZ="Europe/Berlin"
       restart: unless-stopped
 
@@ -184,3 +203,4 @@ services:
       #      ports:
       #        - 8787:8787
       #      restart: unless-stopped 
+...