From 2d307eae53c82cd879e97aa65aa4d8428440bf71 Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Thu, 3 Nov 2022 03:39:40 +0100 Subject: [PATCH 1/2] Re-add autologin --- 3dprinter-octoprint/config.yaml | 2 +- .../rootfs/etc/cont-init.d/octoprint.sh | 18 +++++++++--------- .../rootfs/root/config/octoprint/config.yaml | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/3dprinter-octoprint/config.yaml b/3dprinter-octoprint/config.yaml index 555e93c..bfde696 100644 --- a/3dprinter-octoprint/config.yaml +++ b/3dprinter-octoprint/config.yaml @@ -1,5 +1,5 @@ name: "3DPrinter-OctoPrint" -version: "2022.11.1" +version: "2022.11.0" slug: "3dprinter-octoprint" description: "OctoPrint as an addon, no additional bells and whistles." url: "https://github.com/fredrikbaberg/home-assistant-addons/tree/main/3dprinter-octoprint" diff --git a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh index 32e0a5d..f2ed904 100644 --- a/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh +++ b/3dprinter-octoprint/rootfs/etc/cont-init.d/octoprint.sh @@ -28,12 +28,12 @@ if [ ! -f /data/config/octoprint/config.yaml ]; then fi fi -# # TODO: Check if user already exists before setting password. -# { # Make sure Ingress user for OctoPrint exists. -# bashio::log.notice "Ensure Ingress user (homeassistant) exist." -# # new_password=$(date +%s | sha256sum | base64 | head -c 32 ; echo) -# new_password=homeassistant -# octoprint --basedir /data/config/octoprint user add homeassistant --password "$new_password" --group users --group admins # 2> /dev/null -# } || { # catch -# bashio::log.warning "Failed to ensure Ingress user exists, may not be able to launch." -# } +# TODO: Check if user already exists before setting password. +{ # Make sure Ingress user for OctoPrint exists. + bashio::log.notice "Ensure Ingress user (homeassistant) exist." + new_password=$(date +%s | sha256sum | base64 | head -c 32 ; echo) + new_password=homeassistant + octoprint --basedir /data/config/octoprint user add homeassistant --password "$new_password" --group users --group admins # 2> /dev/null +} || { # catch + bashio::log.warning "Failed to ensure Ingress user exists, may not be able to launch." +} diff --git a/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml b/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml index 0280ecd..de0d5ff 100644 --- a/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml +++ b/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml @@ -1,10 +1,10 @@ -# accessControl: -# autologinAs: homeassistant -# autologinLocal: true -# localNetworks: -# - 127.0.0.0/8 -# - ::1/128 -# - 172.30.32.2 +accessControl: + autologinAs: homeassistant + autologinLocal: true + localNetworks: + - 127.0.0.0/8 + - ::1/128 + - 172.30.32.2 api: allowCrossOrigin: true folder: From d7f4168bb2aa2412df64167a135a4a77baa35518 Mon Sep 17 00:00:00 2001 From: Fredrik Baberg Date: Thu, 3 Nov 2022 11:53:48 +0100 Subject: [PATCH 2/2] Disable autologin --- 3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml b/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml index de0d5ff..c80746d 100644 --- a/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml +++ b/3dprinter-octoprint/rootfs/root/config/octoprint/config.yaml @@ -4,7 +4,7 @@ accessControl: localNetworks: - 127.0.0.0/8 - ::1/128 - - 172.30.32.2 + # - 172.30.32.2 api: allowCrossOrigin: true folder: