From 7588a58d88545397cebcab7dfd55694b6cb6b593 Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@addons.community>
Date: Sun, 21 Apr 2019 09:02:35 +0200
Subject: [PATCH] :hammer: Refactor of init scripts

---
 phlex/rootfs/etc/cont-init.d/10-requirements.sh        | 8 --------
 phlex/rootfs/etc/cont-init.d/{30-nginx.sh => nginx.sh} | 3 ++-
 phlex/rootfs/etc/cont-init.d/{20-phlex.sh => phlex.sh} | 0
 3 files changed, 2 insertions(+), 9 deletions(-)
 delete mode 100644 phlex/rootfs/etc/cont-init.d/10-requirements.sh
 rename phlex/rootfs/etc/cont-init.d/{30-nginx.sh => nginx.sh} (96%)
 rename phlex/rootfs/etc/cont-init.d/{20-phlex.sh => phlex.sh} (100%)

diff --git a/phlex/rootfs/etc/cont-init.d/10-requirements.sh b/phlex/rootfs/etc/cont-init.d/10-requirements.sh
deleted file mode 100644
index 9fdcf9f..0000000
--- a/phlex/rootfs/etc/cont-init.d/10-requirements.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# Community Hass.io Add-ons: Phlex
-# This files check if all user configuration requirements are met
-# ==============================================================================
-
-# Check SSL requirements, if enabled
-bashio::config.require.ssl 'ssl' 'certfile' 'keyfile'
\ No newline at end of file
diff --git a/phlex/rootfs/etc/cont-init.d/30-nginx.sh b/phlex/rootfs/etc/cont-init.d/nginx.sh
similarity index 96%
rename from phlex/rootfs/etc/cont-init.d/30-nginx.sh
rename to phlex/rootfs/etc/cont-init.d/nginx.sh
index f4f7ec3..116cdcd 100644
--- a/phlex/rootfs/etc/cont-init.d/30-nginx.sh
+++ b/phlex/rootfs/etc/cont-init.d/nginx.sh
@@ -3,10 +3,11 @@
 # Community Hass.io Add-ons: Phlex
 # Configures NGINX for use with Phlex
 # ==============================================================================
-
 declare certfile
 declare keyfile
 
+bashio::config.require.ssl
+
 # Enable SSL
 if bashio::config.true 'ssl'; then
     rm /etc/nginx/nginx.conf
diff --git a/phlex/rootfs/etc/cont-init.d/20-phlex.sh b/phlex/rootfs/etc/cont-init.d/phlex.sh
similarity index 100%
rename from phlex/rootfs/etc/cont-init.d/20-phlex.sh
rename to phlex/rootfs/etc/cont-init.d/phlex.sh