feat: Ingress addition

emby/CHANGELOG.md

@@ -1,11 +1,15 @@
+- Beta: inclusion of Ingress (please report issues)
 
 ## 4.7.0.35 (16-04-2022)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.34 (12-04-2022)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.33 (07-04-2022)
+
 - Update to latest version from linuxserver/docker-emby
 
 ## 4.7.0.32 (23-03-2022)

emby/Dockerfile

@@ -53,7 +53,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
     && chmod -R 755 /etc/cont-init.d || printf '%s\n' "${MODULES}" >/MODULESFILE
 
 # Manual apps
-ENV PACKAGES=""
+ENV PACKAGES="nginx"
 
 # Automatic apps & bashio
 RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash) >/dev/null; fi \

emby/README.md

@@ -18,20 +18,14 @@ _Thanks to everyone having starred my repo! To star it click on the image below,
 
 ## About
 
-Forked to add latest beta versions, smb and local hdd mount.
-
-- Inital version : https://github.com/petersendev/hassio-addons
-- CIFS code : https://github.com/dianlight/hassio-addons
-
-Ingress cannot be added as case url is not accepted by the app, although it is a requirement for ingress
-
 [emby](https://emby.media/) organizes video, music, live TV, and photos from personal media libraries and streams them to smart TVs, streaming boxes and mobile devices. This container is packaged as a standalone emby Media Server.
 
 This addon is based on the [docker image](https://github.com/linuxserver/docker-emby) from linuxserver.io.
+Inital addon version : https://github.com/petersendev/hassio-addons
 
 ## Configuration
 
-Webui can be found at `<your-ip>:8096`.
+Webui can be found at `<your-ip>:8096`, or within Home Assistant through Ingress.
 
 ```yaml
 GUID: user

emby/apparmor.txt

@@ -40,7 +40,6 @@ profile addon_db21ed7f_emby_nas flags=(attach_disconnected,mediate_deleted) {
   # Files required
   /dev/sda1 mrwkl,
   /dev/sdb1 mrwkl,
-  /dev/mmcblk0p1 mrwkl,
   /dev/ttyUSB0 mrwkl,
   /dev/* mrwkl,
   /tmp/** mrkwl,

emby/config.json

@@ -60,6 +60,8 @@
     "/dev/nvme2"
   ],
   "host_network": true,
+  "ingress": true,
+  "ingress_stream": true,
   "map": [
     "config:rw",
     "share:rw",
@@ -72,6 +74,7 @@
     "PUID": 0,
     "silent": true
   },
+  "panel_icon": "mdi:emby",
   "ports": {
     "1900/udp": null,
     "7359/udp": null,
@@ -104,7 +107,7 @@
   "startup": "services",
   "upstream": "4.7.0.35",
   "url": "https://github.com/alexbelgium/hassio-addons/tree/master/emby",
-  "version": "4.7.0.35",
+  "version": "4.7.0.35-ingressbeta",
   "video": true,
   "webui": "http://[HOST]:[PORT:8096]"
-}
+}

emby/rootfs/etc/cont-init.d/32-nginx.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/with-contenv bashio
+
+#################
+# NGINX SETTING #
+#################
+declare port
+declare certfile
+declare ingress_interface
+declare ingress_port
+declare keyfile
+
+echo "Adapting for ingress"
+ingress_port=$(bashio::addon.ingress_port)
+ingress_interface=$(bashio::addon.ip_address)
+sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
+sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
+
+# Allow uppercase url
+echo "Allowing case sensitive url"
+grep -rl toLowerCase /app/emby/dashboard-ui/app.js | xargs sed -i 's/toLowerCase()/toString()/g'
+grep -rl toLowerCase /app/emby/dashboard-ui/network | xargs sed -i 's/toLowerCase()/toString()/g'

emby/rootfs/etc/nginx/includes/mime.types

@@ -0,0 +1,96 @@
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

emby/rootfs/etc/nginx/includes/proxy_params.conf

@@ -0,0 +1,16 @@
+proxy_http_version          1.1;
+proxy_ignore_client_abort   off;
+proxy_read_timeout          86400s;
+proxy_redirect              off;
+proxy_send_timeout          86400s;
+proxy_max_temp_file_size    0;
+
+proxy_hide_header X-Frame-Options;
+proxy_set_header Accept-Encoding "";
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Host $http_host;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $scheme;
+proxy_set_header X-NginX-Proxy true;
+proxy_set_header X-Real-IP $remote_addr; 

emby/rootfs/etc/nginx/includes/resolver.conf

@@ -0,0 +1 @@
+resolver 127.0.0.11;

emby/rootfs/etc/nginx/includes/server_params.conf

@@ -0,0 +1,6 @@
+root            /dev/null;
+server_name     $hostname;
+
+add_header X-Content-Type-Options nosniff;
+add_header X-XSS-Protection "1; mode=block";
+add_header X-Robots-Tag none;

emby/rootfs/etc/nginx/includes/ssl_params.conf

@@ -0,0 +1,9 @@
+ssl_protocols TLSv1.2;
+ssl_prefer_server_ciphers on;
+ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
+ssl_ecdh_curve secp384r1;
+ssl_session_timeout  10m;
+ssl_session_cache shared:SSL:10m;
+ssl_session_tickets off;
+ssl_stapling on;
+ssl_stapling_verify on;

emby/rootfs/etc/nginx/includes/upstream.conf

@@ -0,0 +1,3 @@
+upstream backend {
+    server 127.0.0.1:8096;
+}

emby/rootfs/etc/nginx/nginx.conf

@@ -0,0 +1,78 @@
+
+# Run nginx in foreground.
+daemon off;
+
+# This is run inside Docker.
+user root;
+
+# Pid storage location.
+pid /var/run/nginx.pid;
+
+# Set number of worker processes.
+worker_processes auto;
+
+# Enables the use of JIT for regular expressions to speed-up their processing.
+pcre_jit on;
+
+# Write error log to Hass.io add-on log.
+error_log /proc/1/fd/1 error;
+
+# Load allowed environment vars
+env HASSIO_TOKEN;
+
+# Load dynamic modules.
+include /etc/nginx/modules/*.conf;
+
+# Max num of simultaneous connections by a worker process.
+events {
+    worker_connections 8192;
+}
+
+http {
+    include /etc/nginx/includes/mime.types;
+
+    # https://emby.media/community/index.php?/topic/93074-how-to-emby-with-nginx-with-windows-specific-tips-and-csp-options/
+    server_names_hash_bucket_size 64;
+    gzip_disable            "msie6";
+	gzip_comp_level         6;
+	gzip_min_length         1100;
+ 	gzip_buffers            16 8k;
+	gzip_proxied            any;
+	gzip_types
+	    text/plain
+	    text/css
+	    text/js
+	    text/xml
+	    text/javascript
+	    application/javascript
+	    application/x-javascript
+	    application/json
+	    application/xml
+	    application/rss+xml
+	    image/svg+xml;
+    proxy_connect_timeout 1h;
+
+    log_format hassio '[$time_local] $status '
+                        '$http_x_forwarded_for($remote_addr) '
+                        '$request ($http_user_agent)';
+
+    access_log              /proc/1/fd/1 hassio;
+    client_max_body_size    4G;
+    default_type            application/octet-stream;
+    gzip                    on;
+    keepalive_timeout       65;
+    sendfile                on;
+    server_tokens           off;
+    tcp_nodelay             on;
+    tcp_nopush              on;
+
+    map $http_upgrade $connection_upgrade {
+        default upgrade;
+        ''      close;
+    }
+
+    include /etc/nginx/includes/resolver.conf;
+    include /etc/nginx/includes/upstream.conf;
+
+    include /etc/nginx/servers/*.conf;
+}

emby/rootfs/etc/nginx/servers/ingress.conf

@@ -0,0 +1,30 @@
+   server {
+    listen %%interface%%:%%port%% default_server;
+    include /etc/nginx/includes/server_params.conf;
+    include /etc/nginx/includes/proxy_params.conf;
+
+    # https://emby.media/community/index.php?/topic/104238-playback-error-no-compatible-streams-are-currently-available/&do=findComment&comment=1097946
+    proxy_buffering off;
+
+    location / {
+      # Proxy pass
+      proxy_pass http://127.0.0.1:8096;
+
+      # Allow downloading fragments
+      proxy_set_header Range $http_range;
+      proxy_set_header If-Range $http_if_range;
+
+      # Next three lines allow websockets
+      proxy_http_version 1.1;
+      proxy_set_header Upgrade $http_upgrade;
+      proxy_set_header Connection "upgrade";
+
+      proxy_hide_header X-Powered-By;
+      add_header X-Xss-Protection "1; mode=block";
+      add_header X-Content-Type-Options "nosniff";
+      add_header Strict-Transport-Security "max-age=2592000; includeSubdomains";
+      add_header X-Frame-Options "SAMEORIGIN";
+      add_header 'Referrer-Policy' 'no-referrer';
+      }
+
+}

emby/rootfs/etc/services.d/nginx/finish

@@ -0,0 +1,8 @@
+#!/usr/bin/execlineb -S0
+# ==============================================================================
+# Take down the S6 supervision tree when Nginx fails
+# ==============================================================================
+if { s6-test ${1} -ne 0 }
+if { s6-test ${1} -ne 256 }
+
+s6-svscanctl -t /var/run/s6/services

emby/rootfs/etc/services.d/nginx/run

@@ -0,0 +1,10 @@
+#!/usr/bin/with-contenv bashio
+# shellcheck shell=bash
+# ==============================================================================
+
+# Wait for app to become available
+bashio::net.wait_for 8096 localhost 900
+
+bashio::log.info "Starting NGinx..."
+
+exec nginx