Configurator 3.1 (#563)

* Add options to configurator

* set chmod

* Fix style

* Update version

configurator/CHANGELOG.md

@@ -1,9 +1,13 @@
 # Changelog
 
+## 3.1
+- Add options `dirsfirst` and `enforce_basepath`
+
 ## 3.0
 - Update Python to version 3.7
 - Update Configurator to version 0.3.5
 - Migrate Add-on to new Ingress
+- Pin Home Assistant requirements to 0.91.1
 
 ## 2.1
 - Update python version

configurator/Dockerfile

@@ -13,7 +13,7 @@ RUN apk add --no-cache \
   && pip install hass-configurator==${CONFIGURATOR_VERSION}
 
 # Copy data
-COPY configurator.conf /etc/
-COPY run.sh /
+COPY data/configurator.conf /etc/
+COPY data/run.sh /
 
 CMD ["/run.sh"]

configurator/config.json

@@ -1,6 +1,6 @@
 {
   "name": "Configurator",
-  "version": "3.0",
+  "version": "3.1",
   "slug": "configurator",
   "description": "Browser-based configuration file editor for Home Assistant.",
   "url": "https://home-assistant.io/addons/configurator",
@@ -21,7 +21,13 @@
   "ports": {
     "8080/tcp": null
   },
-  "options": {},
-  "schema": {},
+  "options": {
+    "dirsfirst": false,
+    "enforce_basepath": false
+  },
+  "schema": {
+    "dirsfirst": "bool",
+    "enforce_basepath": "bool"
+  },
   "image": "homeassistant/{arch}-addon-configurator"
 }

configurator/data/configurator.conf

@@ -3,7 +3,7 @@
     "PORT": 80,
     "GIT": true,
     "BASEPATH": "/config",
-    "ENFORCE_BASEPATH": false,
+    "ENFORCE_BASEPATH": %%ENFORCE_BASEPATH%%,
     "SSL_CERTIFICATE": null,
     "SSL_KEY": null,
     "IGNORE_SSL": false,
@@ -17,7 +17,7 @@
     "BANNED_IPS": [],
     "BANLIMIT": 0,
     "IGNORE_PATTERN": [],
-    "DIRSFIRST": false,
+    "DIRSFIRST": %%DIRSFIRST%%,
     "SESAME": null,
     "SESAME_TOTP_SECRET": null,
     "VERIFY_HOSTNAME": null,

configurator/data/run.sh

@@ -1,15 +1,22 @@
 #!/usr/bin/env bashio
+set -e
 
+DIRSFIRST=$(bashio::config 'dirsfirst')
+ENFORCE_BASEPATH=$(bashio::config 'enforce_basepath')
 WAIT_PIDS=()
 
 # Setup and run Frontend
 sed -i "s/%%PORT%%/8080/g" /etc/nginx/nginx-ingress.conf
 sed -i "s/%%PORT_INGRESS%%/8099/g" /etc/nginx/nginx-ingress.conf
+
 nginx -c /etc/nginx/nginx-ingress.conf &
 WAIT_PIDS+=($!)
 
 # Setup and run configurator
 sed -i "s/%%TOKEN%%/${HASSIO_TOKEN}/g" /etc/configurator.conf
+sed -i "s/%%DIRSFIRST%%/${DIRSFIRST}/g" /etc/configurator.conf
+sed -i "s/%%ENFORCE_BASEPATH%%/${ENFORCE_BASEPATH}/g" /etc/configurator.conf
+
 hass-configurator /etc/configurator.conf &
 WAIT_PIDS+=($!)