Skip to content
This repository has been archived by the owner on Sep 25, 2022. It is now read-only.

Commit

Permalink
Adding ingress for forked-daapd - #14
Browse files Browse the repository at this point in the history
  • Loading branch information
Kevin Lemonnier committed Jun 14, 2020
1 parent 2c6e7c3 commit a9436ff
Show file tree
Hide file tree
Showing 16 changed files with 261 additions and 4 deletions.
3 changes: 2 additions & 1 deletion forked-daapd/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ FROM base AS runner
ARG BUILD_ARCH
COPY --from=builder /tmp/forked-daapd-install /
RUN apt-get update -y && apt-get install -y --no-install-recommends \
${RUN_DEPS} \
${RUN_DEPS} nginx \
&& if [ ! "$BUILD_ARCH" = "aarch64" ] ; then \
apt-get install -y --no-install-recommends \
${RUN_DEPS_NO_AARCH64}; \
Expand All @@ -145,6 +145,7 @@ RUN sed -i -e 's/\(uid.*=.*\)/uid = "root"/g' forked-daapd.conf \
&& sed -i "s/\(timing_port =\).*/\1 3691/" forked-daapd.conf \
&& sed -i "/type\ =/ s/#/ /" forked-daapd.conf \
&& sed -i 's/\(type =\).*/\1 "pulseaudio"/' forked-daapd.conf
RUN mkdir -p /var/log/nginx && ln -sf /dev/stdout /var/log/nginx/access.log && ln -sf /dev/stderr /var/log/nginx/error.log

# Copy root filesystem
COPY rootfs /
Expand Down
2 changes: 1 addition & 1 deletion forked-daapd/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"url": "https://github.com/ulrar/addon-forked-daapd",
"webui": "http://[HOST]:[PORT:3689]/",
"stage": "experimental",
"ingress": false,
"ingress": true,
"ingress_port": 1337,
"ingress_entry": "/",
"startup": "application",
Expand Down
2 changes: 1 addition & 1 deletion forked-daapd/rootfs/etc/cont-init.d/forked-daapd.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# JPD Hass.io Add-ons: forked-daapd server
# Ulrar Hass.io Add-ons: forked-daapd server
# Configures the forked-daapd Server
# ==============================================================================

Expand Down
16 changes: 16 additions & 0 deletions forked-daapd/rootfs/etc/cont-init.d/nginx.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# Ulrar Hass.io Add-ons: forked-daapd server
# Configures the forked-daapd Server
# ==============================================================================

declare ingress_interface
declare ingress_port
declare ingress_entry

ingress_port=$(bashio::addon.ingress_port)
ingress_interface=$(bashio::addon.ip_address)
ingress_entry=$(bashio::addon.ingress_entry)
sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/nginx/servers/ingress.conf
96 changes: 96 additions & 0 deletions forked-daapd/rootfs/etc/nginx/includes/mime.types
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 15 additions & 0 deletions forked-daapd/rootfs/etc/nginx/includes/proxy_params.conf
View file
Original file line number Diff line number Diff line change
@@ -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 change: 1 addition & 0 deletions forked-daapd/rootfs/etc/nginx/includes/resolver.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
resolver 172.30.32.2;
6 changes: 6 additions & 0 deletions forked-daapd/rootfs/etc/nginx/includes/server_params.conf
View file
Original file line number Diff line number Diff line change
@@ -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;
9 changes: 9 additions & 0 deletions forked-daapd/rootfs/etc/nginx/includes/ssl_params.conf
View file
Original file line number Diff line number Diff line change
@@ -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;
4 changes: 4 additions & 0 deletions forked-daapd/rootfs/etc/nginx/includes/upstream.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
upstream backend
{
server 127.0.0.1:3689;
}
1 change: 1 addition & 0 deletions forked-daapd/rootfs/etc/nginx/modules/subs.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load_module "modules/ngx_http_subs_filter_module.so";
61 changes: 61 additions & 0 deletions forked-daapd/rootfs/etc/nginx/nginx.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# 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 the add-on log.
error_log /proc/1/fd/1 error;

# Load allowed environment vars
env SUPERVISOR_TOKEN;
env DISABLE_HA_AUTHENTICATION;

# 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 homeassistant '[$time_local] $status '
'$http_x_forwarded_for($remote_addr) '
'$request ($http_user_agent)';

access_log /proc/1/fd/1 homeassistant;
client_max_body_size 4G;
default_type application/octet-stream;
gzip on;
keepalive_timeout 65;
# lua_shared_dict auths 16k;
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;
}
22 changes: 22 additions & 0 deletions forked-daapd/rootfs/etc/nginx/servers/ingress.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
server
{
listen %%interface%%:%%port%% default_server;

include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;

location /
{
allow 172.30.32.2;
deny all;

proxy_pass http://backend/;
subs_filter_types '*';
subs_filter 'href="/"' 'href="index.html"' r;
subs_filter 'href="?/(.+?)"?(\s|>)' 'href="$1"$2' r;
subs_filter 'src="?/(.+?)"?(\s|>)' 'src="$1"$2' r;
subs_filter '/(api|admin)/' '$1/' r;
subs_filter '/admin.html' 'admin.html';
subs_filter '\/artwork' 'artwork';
}
}
2 changes: 1 addition & 1 deletion forked-daapd/rootfs/etc/services.d/forked-daapd/run
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# JPD Hass.io Add-ons: forked-daapd server
# Ulrar Hass.io Add-ons: forked-daapd server
# Runs the forked-daapd Server
# ==============================================================================
# shellcheck disable=SC1091
Expand Down
11 changes: 11 additions & 0 deletions forked-daapd/rootfs/etc/services.d/nginx/finish
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# Ulrar Hass.io Add-ons: forked-daapd server
# Runs the forked-daapd Server
# ==============================================================================
# shellcheck disable=SC1091

if -n { s6-test $# -ne 0 }
if -n { s6-test ${1} -eq 256 }

s6-svscanctl -t /var/run/s6/services
14 changes: 14 additions & 0 deletions forked-daapd/rootfs/etc/services.d/nginx/run
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/usr/bin/with-contenv bashio
# ==============================================================================
# Ulrar Hass.io Add-ons: forked-daapd server
# Runs the forked-daapd Server
# ==============================================================================
# shellcheck disable=SC1091
declare -a options

# Wait for Forked-Daapd to become available
bashio::net.wait_for 3689

bashio::log.info "Starting Nginx..."

exec nginx "${options[@]}"

0 comments on commit a9436ff

Please sign in to comment.