From 8400d583f83a56766d228acf2e6a7dffdd678ae9 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 13 Nov 2021 18:25:20 +0100 Subject: [PATCH] remove nginx --- emby/Dockerfile | 1 - emby/config.json | 6 -- emby/root/etc/cont-init.d/93-nginx.sh | 23 ----- emby/root/etc/nginx/includes/mime.types | 96 ------------------- .../root/etc/nginx/includes/proxy_params.conf | 15 --- emby/root/etc/nginx/includes/resolver.conf | 1 - .../etc/nginx/includes/server_params.conf | 6 -- emby/root/etc/nginx/includes/ssl_params.conf | 9 -- emby/root/etc/nginx/includes/upstream.conf | 3 - emby/root/etc/nginx/nginx.conf | 56 ----------- emby/root/etc/nginx/servers/.gitkeep | 1 - emby/root/etc/nginx/templates/ingress.gtpl | 17 ---- emby/root/etc/nginx/templates/ssl.gtpl | 18 ---- emby/root/etc/services.d/nginx/finish | 9 -- emby/root/etc/services.d/nginx/run | 8 -- 15 files changed, 269 deletions(-) delete mode 100644 emby/root/etc/cont-init.d/93-nginx.sh delete mode 100644 emby/root/etc/nginx/includes/mime.types delete mode 100644 emby/root/etc/nginx/includes/proxy_params.conf delete mode 100644 emby/root/etc/nginx/includes/resolver.conf delete mode 100644 emby/root/etc/nginx/includes/server_params.conf delete mode 100644 emby/root/etc/nginx/includes/ssl_params.conf delete mode 100644 emby/root/etc/nginx/includes/upstream.conf delete mode 100644 emby/root/etc/nginx/nginx.conf delete mode 100644 emby/root/etc/nginx/servers/.gitkeep delete mode 100644 emby/root/etc/nginx/templates/ingress.gtpl delete mode 100644 emby/root/etc/nginx/templates/ssl.gtpl delete mode 100644 emby/root/etc/services.d/nginx/finish delete mode 100644 emby/root/etc/services.d/nginx/run diff --git a/emby/Dockerfile b/emby/Dockerfile index 1f9096411..81abc0e48 100644 --- a/emby/Dockerfile +++ b/emby/Dockerfile @@ -19,7 +19,6 @@ RUN \ keyutils \ samba \ smbclient \ - nginx \ \ ################## # Install bashio # diff --git a/emby/config.json b/emby/config.json index 95a808161..00b8ce913 100644 --- a/emby/config.json +++ b/emby/config.json @@ -33,9 +33,6 @@ "map": ["config:rw", "share:rw", "media:rw", "ssl:rw"], "name": "Emby NAS", "options": { - "ssl": false, - "certfile": "fullchain.pem", - "keyfile": "privkey.pem", "PUID": 0, "PGID": 0, "silent": true @@ -54,9 +51,6 @@ }, "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"], "schema": { - "ssl": "bool", - "certfile": "str", - "keyfile": "str", "PUID": "int", "PGID": "int", "TZ": "str?", diff --git a/emby/root/etc/cont-init.d/93-nginx.sh b/emby/root/etc/cont-init.d/93-nginx.sh deleted file mode 100644 index 3aa931d1a..000000000 --- a/emby/root/etc/cont-init.d/93-nginx.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/with-contenv bashio - -############### -# SSL SETTING # -############### - -if bashio::config.true 'ssl'; then - protocol=https - certfile=$(bashio::config 'certfile') - keyfile=$(bashio::config 'keyfile') - # Self generate if not found - if [ ! -f /ssl/$certfile ] && [ ! -f /ssl/$keyfile ]; then - bashio::log.info "No ssl certificates found. Auto generating ones..." - SUBJECT="/C=US/ST=CA/L=Carlsbad/O=Linuxserver.io/OU=LSIO Server/CN=*" - openssl req -new -x509 -days 3650 -nodes -out /ssl/$certfile -keyout /ssl/$keyfile -subj "$SUBJECT" - fi - address=$(bashio::addon.ip_address) - sed -i "s|%%interface%%|$address|g" /etc/nginx/templates/ssl.gtpl - sed -i "s|%%certfile%%|/ssl/$certfile|g" /etc/nginx/templates/ssl.gtpl - sed -i "s|%%certkey%%|/ssl/$keyfile|g" /etc/nginx/templates/ssl.gtpl - mv /etc/nginx/templates/ssl.gtpl /etc/nginx/servers/ssl.conf - bashio::log.info "ssl configured, emby will be accessible through https instead of http" -fi diff --git a/emby/root/etc/nginx/includes/mime.types b/emby/root/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/emby/root/etc/nginx/includes/mime.types +++ /dev/null @@ -1,96 +0,0 @@ -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; -} diff --git a/emby/root/etc/nginx/includes/proxy_params.conf b/emby/root/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index 1990d4959..000000000 --- a/emby/root/etc/nginx/includes/proxy_params.conf +++ /dev/null @@ -1,15 +0,0 @@ -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; diff --git a/emby/root/etc/nginx/includes/resolver.conf b/emby/root/etc/nginx/includes/resolver.conf deleted file mode 100644 index 6485af141..000000000 --- a/emby/root/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11; diff --git a/emby/root/etc/nginx/includes/server_params.conf b/emby/root/etc/nginx/includes/server_params.conf deleted file mode 100644 index 09c06543e..000000000 --- a/emby/root/etc/nginx/includes/server_params.conf +++ /dev/null @@ -1,6 +0,0 @@ -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; diff --git a/emby/root/etc/nginx/includes/ssl_params.conf b/emby/root/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f1500599..000000000 --- a/emby/root/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,9 +0,0 @@ -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; diff --git a/emby/root/etc/nginx/includes/upstream.conf b/emby/root/etc/nginx/includes/upstream.conf deleted file mode 100644 index a640ef18c..000000000 --- a/emby/root/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:8096; -} diff --git a/emby/root/etc/nginx/nginx.conf b/emby/root/etc/nginx/nginx.conf deleted file mode 100644 index 7e5bc6f7c..000000000 --- a/emby/root/etc/nginx/nginx.conf +++ /dev/null @@ -1,56 +0,0 @@ -# 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; -} diff --git a/emby/root/etc/nginx/servers/.gitkeep b/emby/root/etc/nginx/servers/.gitkeep deleted file mode 100644 index 85ad51be5..000000000 --- a/emby/root/etc/nginx/servers/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -Without requirements or design, programming is the art of adding bugs to an empty text file. (Louis Srygley) diff --git a/emby/root/etc/nginx/templates/ingress.gtpl b/emby/root/etc/nginx/templates/ingress.gtpl deleted file mode 100644 index f7dc63ce6..000000000 --- a/emby/root/etc/nginx/templates/ingress.gtpl +++ /dev/null @@ -1,17 +0,0 @@ -server { - listen {{ .interface }}:{{ .port }} default_server; - server_name vue.torrent; - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - location / { - root /vuetorrent/public/; - } - - location /api { - proxy_pass {{ .protocol }}://backend; - http2_push_preload on; - client_max_body_size 10M; - } - -} diff --git a/emby/root/etc/nginx/templates/ssl.gtpl b/emby/root/etc/nginx/templates/ssl.gtpl deleted file mode 100644 index c03903ab1..000000000 --- a/emby/root/etc/nginx/templates/ssl.gtpl +++ /dev/null @@ -1,18 +0,0 @@ -server { - listen %%interface%%:8096 ssl; - server_name emby; - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - include /etc/nginx/includes/ssl_params.conf; - ssl_certificate %%certfile%%; - ssl_certificate_key %%certkey%%; - -location ^~ / { - proxy_pass http://backend; -} - -location ^~ /embywebsocket { - proxy_pass http://backend; -} - -} diff --git a/emby/root/etc/services.d/nginx/finish b/emby/root/etc/services.d/nginx/finish deleted file mode 100644 index 23d85af4b..000000000 --- a/emby/root/etc/services.d/nginx/finish +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Home Assistant Community Add-on: Bitwarden -# 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 diff --git a/emby/root/etc/services.d/nginx/run b/emby/root/etc/services.d/nginx/run deleted file mode 100644 index 3c1b64a9e..000000000 --- a/emby/root/etc/services.d/nginx/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Runs the Nginx daemon -# ============================================================================== -bashio::net.wait_for 8096 -bashio::log.info "Starting NGinx..." - -exec nginx