Merge pull request #18 from fredrikbaberg/dev

Keep config for autologin, but disable for Ingress.

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"

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."
+}

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: