diff --git a/picard/rootfs/etc/cont-init.d/10-requirements.sh b/picard/rootfs/etc/cont-init.d/10-requirements.sh deleted file mode 100644 index 835e65d51..000000000 --- a/picard/rootfs/etc/cont-init.d/10-requirements.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# This files check if all user configuration requirements are met -# ============================================================================== - -# Check authentication requirements, if enabled -if bashio::config.true 'authentication_required'; then - if ! bashio::config.has_value 'username'; then - bashio::exit.nok 'Transmission authentication is enabled, but no username was specified' - fi - - if ! bashio::config.has_value 'password'; then - bashio::exit.nok 'Transmission authentication is enabled, but no password was specified' - fi -fi - -# Check OpenVPN requirements, if enabled -if bashio::config.true 'openvpn_enabled'; then - if ! bashio::config.has_value 'openvpn_username'; then - bashio::exit.nok 'OpenVPN is enabled, but no username was specified' - fi - - if ! bashio::config.has_value 'openvpn_password'; then - bashio::exit.nok 'OpenVPN is enabled, but no password was specified' - fi - - if ! bashio::fs.file_exists "/config/openvpn/$(bashio::config 'openvpn_config').ovpn"; then - bashio::exit.nok "The configured /config/openvpn/$(bashio::config 'openvpn_config').ovpn file is not found" - fi -fi diff --git a/picard/rootfs/etc/cont-init.d/20-transmission-configuration.sh b/picard/rootfs/etc/cont-init.d/20-transmission-configuration.sh deleted file mode 100644 index 2a66d60fe..000000000 --- a/picard/rootfs/etc/cont-init.d/20-transmission-configuration.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== - -declare CONFIG -declare authentication_required -declare username -declare password - -if ! bashio::fs.directory_exists '/data/transmission'; then - mkdir '/data/transmission' -fi - -if ! bashio::fs.file_exists '/data/transmission/settings.json'; then - echo "{}" > /data/transmission/settings.json -fi - -CONFIG=$( /data/transmission/settings.json diff --git a/picard/rootfs/etc/cont-init.d/21-openvpn-configuration.sh b/picard/rootfs/etc/cont-init.d/21-openvpn-configuration.sh deleted file mode 100644 index d840cbaec..000000000 --- a/picard/rootfs/etc/cont-init.d/21-openvpn-configuration.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== - -declare openvpn_config -declare openvpn_username -declare openvpn_password - -if bashio::config.true 'openvpn_enabled'; then - - openvpn_config=$(bashio::config 'openvpn_config') - - cp "/config/openvpn/${openvpn_config}.ovpn" /etc/openvpn/config.ovpn - - openvpn_username=$(bashio::config 'openvpn_username') - echo "${openvpn_username}" > /etc/openvpn/credentials - openvpn_password=$(bashio::config 'openvpn_password') - echo "${openvpn_password}" >> /etc/openvpn/credentials - - sed -i 's/auth-user-pass.*/auth-user-pass \/etc\/openvpn\/credentials/g' /etc/openvpn/config.ovpn - - sed -i "1a\/etc/openvpn/up-transmission.sh \"\${4}\" &\n" /etc/openvpn/up.sh - -fi diff --git a/picard/rootfs/etc/cont-init.d/30-nginx.sh b/picard/rootfs/etc/cont-init.d/30-nginx.sh deleted file mode 100644 index 54aff315b..000000000 --- a/picard/rootfs/etc/cont-init.d/30-nginx.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -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 diff --git a/picard/rootfs/etc/nginx/includes/mime.types b/picard/rootfs/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/picard/rootfs/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/picard/rootfs/etc/nginx/includes/proxy_params.conf b/picard/rootfs/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index ec2660161..000000000 --- a/picard/rootfs/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 "gzip"; -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/picard/rootfs/etc/nginx/includes/resolver.conf b/picard/rootfs/etc/nginx/includes/resolver.conf deleted file mode 100644 index 6485af141..000000000 --- a/picard/rootfs/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11; diff --git a/picard/rootfs/etc/nginx/includes/server_params.conf b/picard/rootfs/etc/nginx/includes/server_params.conf deleted file mode 100644 index 09c06543e..000000000 --- a/picard/rootfs/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/picard/rootfs/etc/nginx/includes/ssl_params.conf b/picard/rootfs/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f1500599..000000000 --- a/picard/rootfs/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/picard/rootfs/etc/nginx/includes/upstream.conf b/picard/rootfs/etc/nginx/includes/upstream.conf deleted file mode 100644 index b1ca473d3..000000000 --- a/picard/rootfs/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:9091; -} diff --git a/picard/rootfs/etc/nginx/nginx.conf b/picard/rootfs/etc/nginx/nginx.conf deleted file mode 100644 index 7e5bc6f7c..000000000 --- a/picard/rootfs/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/picard/rootfs/etc/nginx/servers/ingress.conf b/picard/rootfs/etc/nginx/servers/ingress.conf deleted file mode 100644 index 48526c7d0..000000000 --- a/picard/rootfs/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,23 +0,0 @@ -server { - listen %%interface%%:%%port%% default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - location / { - proxy_read_timeout 300; - proxy_pass_header X-Transmission-Session-Id; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Server $host; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://backend/transmission/web/; - } - - location /rpc { - proxy_pass http://backend/transmission/rpc; - } - - location /upload { - proxy_pass http://backend/transmission/upload; - } -} diff --git a/picard/rootfs/etc/openvpn/up-transmission.sh b/picard/rootfs/etc/openvpn/up-transmission.sh deleted file mode 100644 index 63d34eb0f..000000000 --- a/picard/rootfs/etc/openvpn/up-transmission.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -declare CONFIG - -CONFIG=$( /data/transmission/settings.json - -exec /usr/bin/transmission-daemon --foreground --config-dir /data/transmission diff --git a/picard/rootfs/etc/services.d/nginx/finish b/picard/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index a7cb83bb5..000000000 --- a/picard/rootfs/etc/services.d/nginx/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/execlineb -S0 -# ============================================================================== -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -if -n { s6-test $# -ne 0 } -if -n { s6-test ${1} -eq 256 } - -s6-svscanctl -t /var/run/s6/services diff --git a/picard/rootfs/etc/services.d/nginx/run b/picard/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 1835f90b9..000000000 --- a/picard/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== - -# Wait for transmission to become available -bashio::net.wait_for 9091 - -bashio::log.info "Starting NGinx..." - -exec nginx diff --git a/picard/rootfs/etc/services.d/transmission/finish b/picard/rootfs/etc/services.d/picard/finish similarity index 100% rename from picard/rootfs/etc/services.d/transmission/finish rename to picard/rootfs/etc/services.d/picard/finish diff --git a/picard/rootfs/etc/services.d/picard/run b/picard/rootfs/etc/services.d/picard/run new file mode 100644 index 000000000..a651240a8 --- /dev/null +++ b/picard/rootfs/etc/services.d/picard/run @@ -0,0 +1,7 @@ +#!/usr/bin/with-contenv bashio +# ============================================================================== +# Runs Picard +# ============================================================================== +bashio::log.info "Starting Picard..." + +exec /usr/bin/picard --foreground --config-dir /data/picard diff --git a/picard/rootfs/etc/services.d/transmission/run b/picard/rootfs/etc/services.d/transmission/run deleted file mode 100644 index 01cfabd71..000000000 --- a/picard/rootfs/etc/services.d/transmission/run +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Runs Transmission -# ============================================================================== -bashio::log.info "Starting Transmission..." - -if bashio::config.true 'openvpn_enabled'; then - exec /usr/sbin/openvpn --config /etc/openvpn/config.ovpn --script-security 2 --up /etc/openvpn/up.sh --down /etc/openvpn/down.sh -else - exec /usr/bin/transmission-daemon --foreground --config-dir /data/transmission -fi