templates/docker-compose/proxy/nextcloud.conf - port-forwarding for pico

experimental, untested!

snackpot.yml

@@ -6,11 +6,9 @@
     postgres_password: "{{lookup('passwordstore', 'servers/snackpot/postgres_db.password')}}"
     postgres_db_user: postgres
     nextcloud_hostname: nc.noodlefactory.co.uk
-    nextcloud_base_dir: /var/www/html
-    nextcloud_data_dir: /var/www/data
-    nextcloud_ext_dir: /var/www/ext
     nextcloud_db_user: nextcloud
     nextcloud_db: nextcloud
+    jellyfin_hostname: jf.noodlefactory.co.uk
     letsencrypt_email: webmaster@noodlefactory.co.uk
     docker_compose_base_dir: /opt/docker-compose
     firewall_ports:
@@ -61,21 +59,21 @@
       vars:
         ufw_allow: "{{ firewall_ports }}"
         
-    # - include_role:
-    #     name: mrlesmithjr.netplan
-    #     apply: { become: true, tags: [netplan, network] }
-    #   tags: netplan, network
-    #   vars:
-    #     netplan_enabled: true
-    #     netplan_configuration:
-    #       network:
-    #         version: 2
-    #         ethernets:
-    #           enp3s0:
-    #             addresses: [192.168.0.55/24]
-    #             gateway4: 192.168.0.1
-    #             nameservers:
-    #               addresses: [192.168.0.1]
+    - include_role:
+        name: mrlesmithjr.netplan
+        apply: { become: true, tags: [netplan, network] }
+      tags: netplan, network
+      vars:
+        netplan_enabled: true
+        netplan_configuration:
+          network:
+            version: 2
+            ethernets:
+              enp3s0:
+                addresses: [192.168.0.55/24]
+                gateway4: 192.168.0.1
+                nameservers:
+                  addresses: [192.168.0.1]
     
     - include_role:
         name: docker_compose

templates/docker-compose/docker-compose.yml

@@ -19,8 +19,20 @@ volumes:
   mopidy_data:
 
 networks:
+  # This is for proxied containers
   proxy-tier:
-    
+  # This is for containers which need to be host mode
+  lan:
+    name: lan
+    driver: macvlan
+    driver_opts:
+      parent: enp3s0 # our ethernet interface
+    ipam:
+      config:
+        - gateway: 192.168.0.1
+          subnet: 192.168.0.0/24
+          ip_range: 192.168.0.240/29 # addresses 240-248 (6 usable)
+
 services:
 
   postgres:
@@ -124,9 +136,13 @@ services:
       - jellyfin_config:/config
       - jellyfin_cache:/cache
       - minidlna_data:/media
-    network_mode: host
-    environment:
-      - JELLYFIN_PublishedServerUrl=http://snackpot.local
+    networks:
+      proxy-tier:
+      default:
+      lan: # Static ip for the container on the macvlan net
+        ipv4_address: 192.168.0.241
+    env_file:
+      - jellyfin.env
       
   minidlna:
     image: vladgh/minidlna:latest
@@ -134,7 +150,10 @@ services:
     volumes:
       - minidlna_state:/minidlna
       - minidlna_data:/media:ro
-    network_mode: host
+    networks:
+      default:
+      lan: # Static ip for the container on the macvlan net
+        ipv4_address: 192.168.0.242
     environment:
       - UPID=2000
       - UGID=2000
@@ -156,6 +175,8 @@ services:
       - mopidy_data:/data
       # Add local music folder
       - minidlna_data:/music:ro
+    networks:
+      default:
     devices:
       - /dev/snd
     restart: always
@@ -164,8 +185,10 @@ services:
     build: ./upmpdcli
     depends_on:
       - mopidy
-    # Host mode needed for advertisement
-    network_mode: host
+    networks:
+      default:
+      lan: # Static ip for the container on the macvlan net
+        ipv4_address: 192.168.0.243
     restart: always
 
       # Next three services adapted from

templates/docker-compose/jellyfin.env.j2

@@ -0,0 +1,4 @@
+VIRTUAL_HOST={{ jellyfin_hostname }}
+JELLYFIN_PublishedServerUrl=https://{{ jellyfin_hostname }}/
+LETSENCRYPT_HOST={{ jellyfin_hostname }}
+LETSENCRYPT_EMAIL={{ letsencrypt_email }}

templates/docker-compose/proxy/nextcloud.conf

@@ -0,0 +1,6 @@
+location ^~ /sites/ {
+    proxy_set_header X-Forwarded-Host $host:$server_port;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Server $host;
+    proxy_pass http://web/index.php/apps/cms_pico/pico_proxy/;
+}

templates/docker-compose/upmpdcli/Dockerfile

@@ -1,8 +1,9 @@
-FROM alpine:3.13
+FROM alpine:3.15
 
 RUN apk update \
   && apk upgrade \
   && apk add --no-cache \
+  --repository http://dl-cdn.alpinelinux.org/alpine/edge/community \
   --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing \
   python3 \
   openssl \

templates/docker-compose/upmpdcli/upmpdcli.conf

@@ -8,6 +8,7 @@
 #upnpiface =
 #upnpip = 
 # upnpport =
+upnpip = 192.168.0.243
 
 # media renderer parameters
 friendlyname = Snackpot
@@ -25,4 +26,4 @@ checkcontentformat = 0
 #mpdport = 6600
 #mpdpassword =
 #ownqueue = 1
-
+mpdhost = mopidy