From 5fff8569b6ab8f12eecb19b7e6e6f47dc1c8d3e2 Mon Sep 17 00:00:00 2001
From: Nikola <40897274+0nikola1@users.noreply.github.com>
Date: Fri, 16 Dec 2022 10:42:04 +0100
Subject: [PATCH] 0nikola1 patch octoprint proxy (#89)

* Update and rename config.json to config.yaml

* Update run.sh

* FIxed addon startup issue
---
 octoprint-proxy/config.json | 31 -------------------------------
 octoprint-proxy/config.yaml | 31 +++++++++++++++++++++++++++++++
 octoprint-proxy/run.sh      |  4 ++--
 3 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 octoprint-proxy/config.json
 create mode 100644 octoprint-proxy/config.yaml

diff --git a/octoprint-proxy/config.json b/octoprint-proxy/config.json
deleted file mode 100644
index 11832cd5..00000000
--- a/octoprint-proxy/config.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "OctoPrint Proxy",
-  "version": "1.0.0",
-  "slug": "octoprint_proxy",
-  "description": "Access OctoPrint from within Home Assistant",
-  "url": "https://github.com/MaxWinterstein/homeassistant-addons/",
-  "ingress": true,
-  "ingress_port": 80,
-  "panel_title": "OctoPrint",
-  "panel_icon": "mdi:printer-3d-nozzle",
-  "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
-  "startup": "application",
-  "boot": "auto",
-  "options": {
-    "octoprint_host": "octopi",
-    "octoprint_port": "443",
-    "ssl": {
-      "enabled": true,
-      "verify": false
-    }
-  },
-  "schema": {
-    "octoprint_host": "str",
-    "octoprint_port": "port",
-    "ssl": {
-      "enabled": "bool",
-      "verify": "bool"
-    }
-  },
-  "hassio_api": false
-}
diff --git a/octoprint-proxy/config.yaml b/octoprint-proxy/config.yaml
new file mode 100644
index 00000000..df69cf66
--- /dev/null
+++ b/octoprint-proxy/config.yaml
@@ -0,0 +1,31 @@
+name: OctoPrint Proxy
+version: 1.0.1
+slug: octoprint_proxy
+description: Access OctoPrint from within Home Assistant
+url: https://github.com/MaxWinterstein/homeassistant-addons/
+ingress: true
+ingress_port: 80
+panel_title: OctoPrint
+panel_icon: mdi:printer-3d-nozzle
+arch:
+- armhf
+- armv7
+- aarch64
+- amd64
+- i386
+startup: application
+boot: auto
+init: false
+options:
+  octoprint_host: octopi
+  octoprint_port: '443'
+  ssl:
+    enabled: true
+    verify: false
+schema:
+  octoprint_host: str
+  octoprint_port: port
+  ssl:
+    enabled: bool
+    verify: bool
+hassio_api: false
diff --git a/octoprint-proxy/run.sh b/octoprint-proxy/run.sh
index 1f921811..1d603f36 100644
--- a/octoprint-proxy/run.sh
+++ b/octoprint-proxy/run.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bashio
+#!/usr/bin/with-contenv bashio
 set -e
 
 bashio::log.info "Setting octoprint host: $(bashio::config octoprint_host)"
@@ -27,4 +27,4 @@ fi
 bashio::log.info "Server line: $(cat /haproxy.cfg | grep 'server octoprint')"
 
 bashio::log.info "Starting haproxy"
-haproxy -W -db -f /haproxy.cfg
\ No newline at end of file
+haproxy -W -db -f /haproxy.cfg