🔨 Refactor of init scripts

hassio-addons · Apr 20, 2019 · 0b4f6da · 0b4f6da
1 parent e96798e
commit 0b4f6da
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 23 deletions.
diff --git a/tasmoadmin/rootfs/etc/cont-init.d/10-requirements.sh b/tasmoadmin/rootfs/etc/cont-init.d/10-requirements.sh
diff --git a/tasmoadmin/rootfs/etc/cont-init.d/12-migrate.sh b/tasmoadmin/rootfs/etc/cont-init.d/12-migrate.sh
diff --git a/...oadmin/rootfs/etc/cont-init.d/11-nginx.sh → tasmoadmin/rootfs/etc/cont-init.d/nginx.sh b/...oadmin/rootfs/etc/cont-init.d/11-nginx.sh → tasmoadmin/rootfs/etc/cont-init.d/nginx.sh
@@ -6,6 +6,8 @@
 declare certfile
 declare keyfile
 
+bashio::config.require.ssl
+
 if bashio::config.true 'ssl'; then
     rm /etc/nginx/nginx.conf
     mv /etc/nginx/nginx-ssl.conf /etc/nginx/nginx.conf

diff --git a/...tfs/etc/cont-init.d/13-persistent-data.sh → ...dmin/rootfs/etc/cont-init.d/tasmoadmin.sh b/...tfs/etc/cont-init.d/13-persistent-data.sh → ...dmin/rootfs/etc/cont-init.d/tasmoadmin.sh
@@ -1,8 +1,23 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
 # Community Hass.io Add-ons: TasmoAdmin
-# Ensures data is store in a persistent location
+# Configures TasmoAdmin
 # ==============================================================================
+
+# Migrate from older installations
+if bashio::fs.directory_exists "/data/sonweb"; then
+    bashio::log.info 'Migrating data from sonweb to tasmoadmin...'
+
+    # Rename data folder
+    mv /data/sonweb /data/tasmoadmin
+
+    # Ensure file permissions
+    chown -R nginx:nginx /data/tasmoadmin
+    find /data/tasmoadmin -not -perm 0644 -type f -exec chmod 0644 {} \;
+    find /data/tasmoadmin -not -perm 0755 -type d -exec chmod 0755 {} \;
+fi
+
+# Ensure persistant storage exists
 if ! bashio::fs.directory_exists "/data/tasmoadmin"; then
     bashio::log.debug 'Data directory not initialized, doing that now...'