avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-01-10 09:51:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ingress addition

Browse Source
This commit is contained in:
Alexandre
2022-03-18 09:27:43 +01:00
parent d7a2b5924d
commit 1b67e6963b
14 changed files with 305 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jellyfin/CHANGELOG.md
View File

@@ -1,21 +1,29 @@
- Addition of ingress
## 10.7.7-1-ls155 (17-03-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.7.7-1-ls154 (11-03-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.7.7-1-ls153 (05-03-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.7.7-1-ls152 (24-02-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.7.7-1-ls151 (17-02-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.7.7-1-ls150 (20-01-2022)
- Update to latest version from linuxserver/docker-jellyfin
## 10.7.7-1-ls149 (15-01-2022)
- Update to latest version from linuxserver/docker-jellyfin

2
jellyfin/Dockerfile
View File

@@ -46,7 +46,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 \

23
jellyfin/config.json
View File

@@ -1,10 +1,6 @@
{
"apparmor": true,
"arch": [
"aarch64",
"amd64",
"armv7"
],
"arch": ["aarch64", "amd64", "armv7"],
"boot": "auto",
"description": "A Free Software Media System that puts you in control of managing and streaming your media.",
"devices": [
@@ -54,18 +50,15 @@
],
"host_dbus": true,
"host_network": true,
"map": [
"config:rw",
"share:rw",
"media:rw",
"ssl"
],
"ingress": true,
"map": ["config:rw", "share:rw", "media:rw", "ssl"],
"name": "Jellyfin NAS",
"options": {
"PGID": 0,
"PUID": 0,
"data_location": "/config/addons_config/jellyfin"
},
"panel_icon": "mdi:BilliardsRack",
"ports": {
"1900/udp": null,
"7359/udp": null,
@@ -78,11 +71,7 @@
"8096/tcp": "web interface",
"8920/tcp": "https web interface (optional)"
},
"privileged": [
"SYS_ADMIN",
"DAC_READ_SEARCH",
"NET_ADMIN"
],
"privileged": ["SYS_ADMIN", "DAC_READ_SEARCH", "NET_ADMIN"],
"schema": {
"PGID": "int",
"PUID": "int",
@@ -99,7 +88,7 @@
"startup": "services",
"upstream": "10.7.7-1-ls155",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "10.7.7-1-ls155",
"version": "10.7.7-1-ls155-ingress",
"video": true,
"webui": "http://[HOST]:[PORT:8096]"
}

35
jellyfin/rootfs/etc/cont-init.d/32-ingress.sh Normal file
View File

@@ -0,0 +1,35 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
#################
# NGINX SETTING #
#################
declare port
declare certfile
declare ingress_interface
declare ingress_port
declare keyfile
port=$(bashio::addon.port 80)
if bashio::var.has_value "${port}"; then
bashio::config.require.ssl
if bashio::config.true 'ssl'; then
certfile=$(bashio::config 'certfile')
keyfile=$(bashio::config 'keyfile')
mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf
sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf
sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf
else
mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
fi
fi
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
# JELLYFIN_PublishedServerUrl

96
jellyfin/rootfs/etc/nginx/includes/mime.types Normal file
View File

@@ -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;
}

15
jellyfin/rootfs/etc/nginx/includes/proxy_params.conf Normal file
View File

@@ -0,0 +1,15 @@
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_set_header Accept-Encoding "";
proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade;
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;

1
jellyfin/rootfs/etc/nginx/includes/resolver.conf Normal file
View File

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

5
jellyfin/rootfs/etc/nginx/includes/server_params.conf Normal file
View File

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

9
jellyfin/rootfs/etc/nginx/includes/ssl_params.conf Normal file
View File

@@ -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;

3
jellyfin/rootfs/etc/nginx/includes/upstream.conf Normal file
View File

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

56
jellyfin/rootfs/etc/nginx/nginx.conf Normal file
View File

@@ -0,0 +1,56 @@
# 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 1;
# 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 512;
}
http {
include /etc/nginx/includes/mime.types;
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;
}

52
jellyfin/rootfs/etc/nginx/servers/ingress.conf Normal file
View File

@@ -0,0 +1,52 @@
server {
listen %%interface%%:%%port%% default_server;
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
client_max_body_size 0;
server_name jellyfin.*;
root /usr/share/jellyfin/web;
index index.html;
# Security / XSS Mitigation Headers
add_header X-Frame-Options "SAMEORIGIN";
add_header X-XSS-Protection "1; mode=block";
add_header X-Content-Type-Options "nosniff";
location = / {
return 302 http://$host/web/;
#return 302 https://$host/web/;
}
location /web/ {
add_header Access-Control-Allow-Origin *;
proxy_pass http://127.0.0.1:8096/web/index.html;
proxy_buffering off;
proxy_read_timeout 30;
proxy_pass_request_headers on;
proxy_set_header Connection "Upgrade";
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Protocol $scheme;
proxy_set_header X-Forwarded-Host $http_host;
proxy_set_header Connection $http_connection;
}
location /socket {
# Proxy Jellyfin Websockets traffic
proxy_pass http://127.0.0.1:8096;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Protocol $scheme;
proxy_set_header X-Forwarded-Host $http_host;
}
}

8
jellyfin/rootfs/etc/services.d/nginx/finish Normal file
View File

@@ -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

10
jellyfin/rootfs/etc/services.d/nginx/run Normal file
View File

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