Cleanup before testing
This commit is contained in:
Fredrik Baberg
parent
1f9136ec26
commit
9d88248cf2
@ -1,6 +1,6 @@
|
|||||||
ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye"
|
ARG BUILD_FROM="ghcr.io/home-assistant/amd64-base-debian:bullseye"
|
||||||
FROM ${BUILD_FROM}
|
FROM ${BUILD_FROM}
|
||||||
ARG OCTOPRINT_VERSION="1.8.0"
|
ARG OCTOPRINT_VERSION="1.8.6"
|
||||||
|
|
||||||
ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION}
|
ENV OCTOPRINT_VERSION=${OCTOPRINT_VERSION}
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
name: "3DPrinter-OctoPrint"
|
name: "3DPrinter-OctoPrint"
|
||||||
version: "2022.10.03"
|
version: "2022.11.0"
|
||||||
slug: "3dprinter-octoprint"
|
slug: "3dprinter-octoprint"
|
||||||
description: "OctoPrint as an addon, no additional bells and whistles."
|
description: "OctoPrint as an addon, no additional bells and whistles."
|
||||||
url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"
|
url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint"
|
||||||
@ -26,7 +26,9 @@ ports_description:
|
|||||||
options:
|
options:
|
||||||
camera_url: "http://b7aa59c4-camera-mjpg-streamer/"
|
camera_url: "http://b7aa59c4-camera-mjpg-streamer/"
|
||||||
recovery: false
|
recovery: false
|
||||||
|
reverse_proxy_test: false
|
||||||
schema:
|
schema:
|
||||||
camera_url: "url?"
|
camera_url: "url?"
|
||||||
recovery: "bool"
|
recovery: "bool"
|
||||||
|
reverse_proxy_test: "bool"
|
||||||
tmpfs: true
|
tmpfs: true
|
||||||
|
|||||||
@ -1,3 +1,4 @@
|
|||||||
|
# This file is a placeholder and will be replaced on
|
||||||
{
|
{
|
||||||
debug
|
debug
|
||||||
log {
|
log {
|
||||||
@ -5,4 +6,4 @@
|
|||||||
output file /var/log/caddy.log
|
output file /var/log/caddy.log
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
import configs/*.caddy
|
# import configs/*.caddy
|
||||||
|
|||||||
@ -28,7 +28,7 @@ if [ ! -f /data/config/octoprint/config.yaml ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO: Check if user exists before setting password.
|
# TODO: Check if user already exists before setting password.
|
||||||
{ # Make sure Ingress user for OctoPrint exists.
|
{ # Make sure Ingress user for OctoPrint exists.
|
||||||
bashio::log.notice "Ensure Ingress user (homeassistant) exist."
|
bashio::log.notice "Ensure Ingress user (homeassistant) exist."
|
||||||
new_password=$(date +%s | sha256sum | base64 | head -c 32 ; echo)
|
new_password=$(date +%s | sha256sum | base64 | head -c 32 ; echo)
|
||||||
|
|||||||
@ -10,6 +10,8 @@ bashio::var.json \
|
|||||||
port "^$(bashio::addon.ingress_port)" \
|
port "^$(bashio::addon.ingress_port)" \
|
||||||
ingress_entry "$(bashio::addon.ingress_entry)" \
|
ingress_entry "$(bashio::addon.ingress_entry)" \
|
||||||
camera_host "$(bashio::config 'camera_url')" \
|
camera_host "$(bashio::config 'camera_url')" \
|
||||||
|
recovery "$(bashio::config 'recovery')" \
|
||||||
|
reverse_proxy_test "$(bashio::config 'reverse_proxy_test')" \
|
||||||
| tempio \
|
| tempio \
|
||||||
-template /usr/share/tempio/Caddyfile.gtpl \
|
-template /usr/share/tempio/Caddyfile.gtpl \
|
||||||
-out /etc/caddy/Caddyfile
|
-out /etc/caddy/Caddyfile
|
||||||
|
|||||||
@ -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;
|
|
||||||
}
|
|
||||||
@ -1,17 +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;
|
|
||||||
|
|
||||||
proxy_set_header X-Scheme $scheme;
|
|
||||||
@ -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;
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
ssl_protocols TLSv1.2 TLSv1.3;
|
|
||||||
ssl_prefer_server_ciphers off;
|
|
||||||
ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384;
|
|
||||||
ssl_session_timeout 10m;
|
|
||||||
ssl_session_cache shared:SSL:10m;
|
|
||||||
ssl_session_tickets off;
|
|
||||||
ssl_stapling on;
|
|
||||||
ssl_stapling_verify on;
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
upstream octoprint {
|
|
||||||
server 127.0.0.1:5000;
|
|
||||||
}
|
|
||||||
@ -1,51 +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 the add-on log.
|
|
||||||
# error_log /proc/1/fd/1 error;
|
|
||||||
error_log /var/log/nginx/error.log debug;
|
|
||||||
|
|
||||||
# Max num of simultaneous connections by a worker process.
|
|
||||||
events {
|
|
||||||
worker_connections 512;
|
|
||||||
}
|
|
||||||
|
|
||||||
http {
|
|
||||||
include /etc/nginx/includes/mime.types;
|
|
||||||
|
|
||||||
access_log off;
|
|
||||||
client_max_body_size 0;
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Should get port used, taken from https://stackoverflow.com/questions/60616564/how-to-configure-nginx-x-forwarded-port-to-be-the-originally-request-port
|
|
||||||
map $http_x_forwarded_port $port {
|
|
||||||
default $remote_port;
|
|
||||||
"~^(.*)$" $1;
|
|
||||||
}
|
|
||||||
|
|
||||||
include /etc/nginx/includes/upstream.conf;
|
|
||||||
include /etc/nginx/servers/*.conf;
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
server {
|
|
||||||
listen {{ .interface }}:{{ .port }} default_server;
|
|
||||||
|
|
||||||
# include /etc/nginx/includes/server_params.conf;
|
|
||||||
# include /etc/nginx/includes/proxy_params.conf;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
proxy_pass http://octoprint/;
|
|
||||||
proxy_set_header Host $http_host;
|
|
||||||
# proxy_set_header Upgrade $http_upgrade;
|
|
||||||
# proxy_set_header Connection "upgrade";
|
|
||||||
# proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
# proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
# proxy_set_header X-Scheme $scheme;
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
|
|
||||||
client_max_body_size 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 500 502 503 504 /50x.html;
|
|
||||||
location = /50x.html {
|
|
||||||
root html;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
server {
|
|
||||||
listen {{ .interface }}:{{ .port }} default_server;
|
|
||||||
server_name $hostname;
|
|
||||||
|
|
||||||
location / {
|
|
||||||
allow 172.30.32.2;
|
|
||||||
deny all;
|
|
||||||
|
|
||||||
proxy_pass http://octoprint/;
|
|
||||||
proxy_pass_request_headers on;
|
|
||||||
proxy_set_header Host $host;
|
|
||||||
proxy_set_header Upgrade $http_upgrade;
|
|
||||||
proxy_set_header Connection "upgrade";
|
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
|
||||||
proxy_set_header X-Forwarded-For 172.30.32.2;
|
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
|
||||||
proxy_set_header X-Forwarded-Host $http_host;
|
|
||||||
proxy_set_header X-Scheme $scheme;
|
|
||||||
proxy_set_header X-Script-Name {{ .ingress_entry }};
|
|
||||||
proxy_http_version 1.1;
|
|
||||||
client_max_body_size 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
location /webcam/ {
|
|
||||||
proxy_pass {{ .camera_host }};
|
|
||||||
}
|
|
||||||
|
|
||||||
error_page 500 502 503 504 /50x.html;
|
|
||||||
location = /50x.html {
|
|
||||||
root html;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# The following headers/settings are currently not used.
|
|
||||||
# proxy_set_header X-Forwarded-For 172.30.32.2; # Autologin since using Home Assistant Ingress.
|
|
||||||
# proxy_set_header X-Forwarded-Server $host;
|
|
||||||
# proxy_set_header X-Forwarded-Port $port;
|
|
||||||
@ -15,6 +15,9 @@
|
|||||||
{{ if .recovery }}
|
{{ if .recovery }}
|
||||||
rewrite / /recovery
|
rewrite / /recovery
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
{{ if .reverse_proxy_test }}
|
||||||
|
rewrite / /reverse_proxy_test
|
||||||
|
{{ end }}
|
||||||
reverse_proxy @ingress 127.0.0.1:80 {
|
reverse_proxy @ingress 127.0.0.1:80 {
|
||||||
header_up X-Script-Name {{ .ingress_entry }}
|
header_up X-Script-Name {{ .ingress_entry }}
|
||||||
header_up -Origin
|
header_up -Origin
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user