Rework IDH phase 1

salt/idh/defaults.yaml

@@ -40,7 +40,7 @@ idh:
       http.enabled: true
       http.port: 80
       http.skin: nasLogin
-      http.skin.list:
+      http.skinlist":
         - desc: Plain HTML Login
           name: basicLogin
         - desc: Synology NAS Login
@@ -48,7 +48,7 @@ idh:
       httpproxy.enabled: true
       httpproxy.port: 8080
       httpproxy.skin: squid
-      httproxy.skin.list:
+      httpproxy.skinlist:
         - desc: Squid
           name: squid
         - desc: Microsoft ISA Server Web Proxy

salt/idh/opencanary_config.map.jinja

@@ -2,11 +2,7 @@
 
 {% set IDH_PORTGROUPS = {} %}
 
-{% import_yaml "idh/defaults/defaults.yaml" as IDHCONFIG with context %}
-{% for service in idh_services %}
-      {% import_yaml "idh/defaults/" ~ service ~ ".defaults.yaml" as SERVICECONFIG with context %}
-      {% do salt['defaults.merge'](IDHCONFIG, SERVICECONFIG, in_place=True) %}
-{% endfor %}
+{% import_yaml "idh/defaults.yaml" as IDHCONFIG with context %}
 
 {% set OPENCANARYCONFIG = salt['pillar.get']('idh:opencanary:config', default=IDHCONFIG.idh.opencanary.config, merge=True) %}
 {% set OPENSSH = salt['pillar.get']('idh:openssh', default=IDHCONFIG.idh.openssh, merge=True) %}

salt/idh/soc_idh.yaml

@@ -80,14 +80,14 @@ idh:
         description:
         advanced: True
         helplink: idh.html
-      http.skin.list: &skinlistOptions
+      http.skinlist: &skinlistOptions
         description: List of skins to use for the service.
-        advanced: Ture
+        advanced: True
         helpLink: idh.html
       httpproxy.enabled: *serviceOptions
       httpproxy.port: *portOptions
       httpproxy.skin: *skinOptions
-      httproxy.skin.list: *skinlistOptions
+      httpproxy.skinlist: *skinlistOptions
       mssql.enabled: *serviceOptions
       mssql.version: &versionOptions
         description: Specify the version the service should present.