Rework IDH phase 1

This commit is contained in:
Mike Reeves
2023-03-21 11:23:31 -04:00
parent 9ca9b9d4da
commit bd17121834
3 changed files with 6 additions and 10 deletions

View File

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

View File

@@ -2,11 +2,7 @@
{% set IDH_PORTGROUPS = {} %} {% set IDH_PORTGROUPS = {} %}
{% import_yaml "idh/defaults/defaults.yaml" as IDHCONFIG with context %} {% import_yaml "idh/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 %}
{% set OPENCANARYCONFIG = salt['pillar.get']('idh:opencanary:config', default=IDHCONFIG.idh.opencanary.config, merge=True) %} {% 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) %} {% set OPENSSH = salt['pillar.get']('idh:openssh', default=IDHCONFIG.idh.openssh, merge=True) %}

View File

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