From 4d932daf534664d51289bb4fce4d1946d590dce0 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 22:01:00 +0100 Subject: [PATCH 1/8] [fix] code --- caddy/Caddyfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 5888a80..2c63e33 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -41,7 +41,7 @@ handle @wiki { import omv 8088 } - @code host wiki.quodatum.duckdns.org + @code host code.quodatum.duckdns.org handle @code { import n2 8444 } @@ -76,6 +76,6 @@ xu4.local { import auth encode zstd gzip - root link + root links file_server browse } From 0ab4db1af6d9a7da9286a4e312bba5664ee1ee18 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 22:10:37 +0100 Subject: [PATCH 2/8] [fix] wiki --- caddy/Caddyfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 2c63e33..f7b9799 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -39,7 +39,7 @@ } @wiki host wiki.quodatum.duckdns.org handle @wiki { - import omv 8088 + import n2 8088 } @code host code.quodatum.duckdns.org handle @code { From 4eafe24fb60eb2d98110749cb20dec9b0bacacda Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 22:15:50 +0100 Subject: [PATCH 3/8] [fix] add n2plus --- caddy/Caddyfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index f7b9799..cabaa8f 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -11,7 +11,9 @@ (n2) { reverse_proxy 192.168.1.4:{args.0} } - +(n2plus) { + reverse_proxy 192.168.1.10:{args.0} +} # DNS (duckdns) { tls { @@ -43,7 +45,7 @@ } @code host code.quodatum.duckdns.org handle @code { - import n2 8444 + import n2plus 8444 } # Fallback for otherwise unhandled domains handle { From 96ec3d3505283373d23fb298f9f2b992ff8337c6 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 22:50:59 +0100 Subject: [PATCH 4/8] [add] emby --- caddy/Caddyfile | 2 +- emby/cache/.gitignore | 8 ++++++++ emby/config/.gitignore | 8 ++++++++ emby/docker-compose.yml | 23 +++++++++++++++++++++++ gerbera/docker-compose.yml | 1 - 5 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 emby/cache/.gitignore create mode 100644 emby/config/.gitignore create mode 100644 emby/docker-compose.yml diff --git a/caddy/Caddyfile b/caddy/Caddyfile index cabaa8f..4ca55ce 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -52,7 +52,7 @@ abort } } -# orlop +# orlop ------------------------------------ *.orlop.duckdns.org { import duckdns @jellyfin host jellyfin.orlop.duckdns.org diff --git a/emby/cache/.gitignore b/emby/cache/.gitignore new file mode 100644 index 0000000..1e04ba0 --- /dev/null +++ b/emby/cache/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# Ignore all files in this dir... +* + +# ... except for this one. +!.gitignore diff --git a/emby/config/.gitignore b/emby/config/.gitignore new file mode 100644 index 0000000..1e04ba0 --- /dev/null +++ b/emby/config/.gitignore @@ -0,0 +1,8 @@ +# .gitignore sample +################### + +# Ignore all files in this dir... +* + +# ... except for this one. +!.gitignore diff --git a/emby/docker-compose.yml b/emby/docker-compose.yml new file mode 100644 index 0000000..c414518 --- /dev/null +++ b/emby/docker-compose.yml @@ -0,0 +1,23 @@ +version: "2.3" +services: + emby: + image: emby/embyserver + container_name: embyserver + runtime: nvidia # Expose NVIDIA GPUs + network_mode: host # Enable DLNA and Wake-on-Lan + environment: + - UID=1000 # The UID to run emby as (default: 2) + - GID=100 # The GID to run emby as (default 2) + - GIDLIST=100 # A comma-separated list of additional GIDs to run emby as (default: 2) + volumes: + - ./config:/config + - ./cache:/cache + - /srv/dev-disk-by-uuid-45e2e732-9e00-4a82-a7cc-9c743e033671/datastore/music:/music + - /srv/dev-disk-by-uuid-45e2e732-9e00-4a82-a7cc-9c743e033671/datastore/PicasaStarter/pictures/Pictures:/photos + ports: + - 8097:8096 # HTTP port + - 8920:8920 # HTTPS port + devices: + - /dev/dri:/dev/dri # VAAPI/NVDEC/NVENC render nodes + - /dev/vchiq:/dev/vchiq # MMAL/OMX on Raspberry Pi + restart: unless-stopped diff --git a/gerbera/docker-compose.yml b/gerbera/docker-compose.yml index 2ac9a5a..b13a096 100644 --- a/gerbera/docker-compose.yml +++ b/gerbera/docker-compose.yml @@ -5,7 +5,6 @@ services: gerbera: image: gerbera/gerbera:1.9.2 container_name: gerbera - restart: always volumes: - "/mnt/media/pictures:/media/pictures:ro" - "./videos:/media/videos:ro" From 25e339f7da898b80c96c974580c862625a69b904 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 22:58:50 +0100 Subject: [PATCH 5/8] [fix] network --- emby/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/emby/docker-compose.yml b/emby/docker-compose.yml index c414518..b47b190 100644 --- a/emby/docker-compose.yml +++ b/emby/docker-compose.yml @@ -4,7 +4,8 @@ services: image: emby/embyserver container_name: embyserver runtime: nvidia # Expose NVIDIA GPUs - network_mode: host # Enable DLNA and Wake-on-Lan + # network_mode: host # Enable DLNA and Wake-on-Lan + # https://forums.docker.com/t/docker-errors-invalidargument-host-network-mode-is-incompatible-with-port-bindings/103492/14 environment: - UID=1000 # The UID to run emby as (default: 2) - GID=100 # The GID to run emby as (default 2) From f4d11de25aac1041d07d73fc835049602255764e Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 23:00:28 +0100 Subject: [PATCH 6/8] [fix] nvidia --- emby/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emby/docker-compose.yml b/emby/docker-compose.yml index b47b190..89e9617 100644 --- a/emby/docker-compose.yml +++ b/emby/docker-compose.yml @@ -3,7 +3,7 @@ services: emby: image: emby/embyserver container_name: embyserver - runtime: nvidia # Expose NVIDIA GPUs + #runtime: nvidia # Expose NVIDIA GPUs # network_mode: host # Enable DLNA and Wake-on-Lan # https://forums.docker.com/t/docker-errors-invalidargument-host-network-mode-is-incompatible-with-port-bindings/103492/14 environment: From 5efad62be1adfe6b30b3e282445dfcaaecd02746 Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 23:01:17 +0100 Subject: [PATCH 7/8] [fix] vchiq --- emby/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emby/docker-compose.yml b/emby/docker-compose.yml index 89e9617..4576a5b 100644 --- a/emby/docker-compose.yml +++ b/emby/docker-compose.yml @@ -20,5 +20,5 @@ services: - 8920:8920 # HTTPS port devices: - /dev/dri:/dev/dri # VAAPI/NVDEC/NVENC render nodes - - /dev/vchiq:/dev/vchiq # MMAL/OMX on Raspberry Pi + #- /dev/vchiq:/dev/vchiq # MMAL/OMX on Raspberry Pi restart: unless-stopped From 174063efa342942109a1645886a991a2415e2bcd Mon Sep 17 00:00:00 2001 From: Andy Bunce Date: Thu, 31 Mar 2022 23:03:06 +0100 Subject: [PATCH 8/8] [add] emby --- caddy/Caddyfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/caddy/Caddyfile b/caddy/Caddyfile index 4ca55ce..6bf36d0 100644 --- a/caddy/Caddyfile +++ b/caddy/Caddyfile @@ -59,6 +59,10 @@ handle @jellyfin { import omv 8096 } + @emby host emby.orlop.duckdns.org + handle @emby { + import omv 8097 + } # Fallback for otherwise unhandled domains handle { abort