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

Fix ssl https://github.com/alexbelgium/hassio-addons/issues/782

Browse Source
This commit is contained in:
Alexandre
2023-04-11 10:33:47 +02:00
parent f93de1fb9a
commit 9bd7fffb14
14 changed files with 266 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mealie/CHANGELOG.md
View File

@@ -1,18 +1,24 @@
- Fix : ssl (https://github.com/alexbelgium/hassio-addons/issues/782)
- Implemented healthcheck
## v1.0.0-beta-1 (07-01-2023)
- Update to latest version from hay-kot/mealie
## 1.0.1 (03-01-2023)
- Migrates data to cp -r /data/* /config/addons_config/mealie_data/ to enable usage of new addons
- Migrates data to cp -r /data/\* /config/addons_config/mealie_data/ to enable usage of new addons
- WARNING : update to supervisor 2022.11 before installing
- Optional passing of env variables by adding them in a config.yml file (see readme)
- Breaking change : amd64 updated to mealie 1.0
- You'll lose your database : first do a backup from within mealie, then restore after upgrading
## 1.0.0 (18-06-2022)
- Update to latest version from hay-kot/mealie
## 1.0.0.1 (26-05-2022)
- Update to latest version from hay-kot/mealie
- Add codenotary sign

17
mealie/Dockerfile
View File

@@ -27,9 +27,13 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
S6_SERVICES_GRACETIME=0
ENV FRONTEND_PORT=9925
# Correct data path
# hadolint ignore=DL4006
RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g'
RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' && \
# Sets port to 9925 as default port
sed -i "s|yarn start -p 3000|yarn start -p 9925|g" /app/run.sh
##################
# 3 Install apps #
@@ -55,7 +59,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
&& chmod -R 755 /etc/cont-init.d
# Manual apps
ENV PACKAGES="jq curl bash"
ENV PACKAGES="nginx"
# Automatic apps & bashio
# hadolint ignore=SC2015
@@ -72,17 +76,10 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
RUN \
# Add custom instructions to run.sh on armv7
if [ -f /app/run.sh ]; then \
sed -i '1d' /app/run.sh \
&& cat /app/run.sh >> /run.txt \
&& cat /run.txt > /app/run.sh \
&& chmod +x /app/run.sh; \
# Add custom instructions to run.sh on other aarch
elif [ -f /app/mealie/run.sh ]; then \
sed -i '1d' /app/mealie/run.sh \
&& cat /app/mealie/run.sh >> /run.txt \
&& cat /run.txt > /app/mealie/run.sh \
&& chmod +x /app/mealie/run.sh; fi
&& chmod +x /app/run.sh
############
# 5 Labels #

4
mealie/config.json
View File

@@ -44,6 +44,6 @@
},
"slug": "mealie",
"url": "https://github.com/alexbelgium/hassio-addons",
"version": "v1.0.0-beta-1",
"version": "v1.0.0-beta-2",
"webui": "[PROTO:ssl]://[HOST]:[PORT:3000]"
}
}

70
mealie/rootfs/caddy.txt
View File

@@ -1,70 +0,0 @@
:%%port%% {
@proxied path /api/* /docs /openapi.json
@static {
file
path *.ico *.css *.js *.gif *.jpg *.jpeg *.png *.svg *.woff *.woff2 *.webp
}
encode gzip zstd
# Handles Recipe Images / Assets
handle_path /api/media/recipes/* {
header Access-Control-Allow-Origin *
header X-Content-Type-Options nosniff
header X-Robots-Tag none
header -X-Frame-Options
header Accept-Encoding ""
header Connection $connection_upgrade
header Upgrade $http_upgrade
header Host $http_host
header X-Forwarded-For $proxy_add_x_forwarded_for
header X-Forwarded-Proto $scheme
header X-NginX-Proxy true
header X-External-Path $http_x_ingress_path
header X-Real-IP $remote_addr
header @static Cache-Control max-age=31536000
root * /app/data/recipes/
file_server
}
handle @proxied {
header Access-Control-Allow-Origin *
header X-Content-Type-Options nosniff
header X-Robots-Tag none
header -X-Frame-Options
header Accept-Encoding ""
header Connection $connection_upgrade
header Upgrade $http_upgrade
header Host $http_host
header X-Forwarded-For $proxy_add_x_forwarded_for
header X-Forwarded-Proto $scheme
header X-NginX-Proxy true
header X-Real-IP $remote_addr
header X-External-Path $http_x_ingress_path;
rewrite * {Referer}{uri}
reverse_proxy http://127.0.0.1:9000
}
handle {
header Access-Control-Allow-Origin *
header X-Content-Type-Options nosniff
header X-Robots-Tag none
header -X-Frame-Options
header Accept-Encoding ""
header Connection $connection_upgrade
header Upgrade $http_upgrade
header Host $http_host
header X-Forwarded-For $proxy_add_x_forwarded_for
header X-Forwarded-Proto $scheme
header X-NginX-Proxy true
header X-Real-IP $remote_addr
header X-External-Path $http_x_ingress_path;
header @static Cache-Control max-age=31536000
root * /app/dist
try_files {path}.html {path} /
file_server
}
}

19
mealie/rootfs/etc/cont-init.d/31-nginx.sh Normal file
View File

@@ -0,0 +1,19 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
if bashio::config.true 'ssl'; then
# Validate ssl
bashio::config.require.ssl
# Adapt nginx template
certfile=$(bashio::config 'certfile')
keyfile=$(bashio::config 'keyfile')
sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/ssl.conf
sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/ssl.conf
else
sed -i "/ssl/d" /etc/nginx/servers/ssl.conf
fi

96
mealie/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;
}

16
mealie/rootfs/etc/nginx/includes/proxy_params.conf Normal file
View File

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

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

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

6
mealie/rootfs/etc/nginx/includes/server_params.conf Normal file
View File

@@ -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
mealie/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
mealie/rootfs/etc/nginx/includes/upstream.conf Normal file
View File

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

78
mealie/rootfs/etc/nginx/nginx.conf Normal file
View File

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

22
mealie/rootfs/etc/nginx/servers/ssl.conf Normal file
View File

@@ -0,0 +1,22 @@
server {
listen 3000 default_server;
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
ssl_certificate /ssl/%%certfile%%;
ssl_certificate_key /ssl/%%keyfile%%;
location / {
# Proxy pass
proxy_pass http://127.0.0.1:9925;
# Next three lines allow websockets
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
}
}

29
mealie/rootfs/run.txt
View File

@@ -19,22 +19,6 @@ for SCRIPTS in /etc/cont-init.d/*; do
/."$SCRIPTS" || echo "$SCRIPTS: exiting $?"
done
################
# MODIFY IMAGE #
################
#Sets caddyfile to 9925 as default port
if [ -f /app/Caddyfile ]; then
sed -i "s/80/9925/g" /app/Caddyfile
echo "Caddyfile adapted"
fi
#Sets caddyfile to 9925 as default port
if [ -f /app/frontend/Caddyfile ]; then
sed -i "s/3000/9925/g" /app/frontend/Caddyfile
echo "Caddyfile adapted"
fi
####################
# Export variables #
####################
@@ -123,19 +107,6 @@ touch /config/addons_config/mealie_data/.secret
chmod -R 777 /config/addons_config/mealie_data
cp -r /data/* /config/addons_config/mealie_data/
#######
# SSL #
#######
bashio::config.require.ssl
if bashio::config.true 'ssl'; then
bashio::log.info "Configuring ssl"
CERTFILE=$(bashio::config 'certfile')
KEYFILE=$(bashio::config 'keyfile')
if [ -f /app/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/Caddyfile; fi
if [ -f /app/frontend/Caddyfile ]; then sed -i "7 i tls /ssl/$CERTFILE /ssl/$KEYFILE" /app/frontend/Caddyfile; fi
fi
bashio::log.info "Starting app"
fi