From 73005136362a544ed0ba15ce1f5a989e6279dff9 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Mon, 23 Mar 2026 16:26:56 -0400 Subject: [PATCH] Remove hardcoded path --- salt/idh/enabled.sls | 2 +- salt/idh/opencanary_config.map.jinja | 1 + .../http/opencanary/basicLogin/redirect.html | 29 +++++++++++++++++++ .../http/opencanary/nasLogin/redirect.html | 29 +++++++++++++++++++ 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 salt/idh/skins/http/opencanary/basicLogin/redirect.html create mode 100644 salt/idh/skins/http/opencanary/nasLogin/redirect.html diff --git a/salt/idh/enabled.sls b/salt/idh/enabled.sls index 9c0e22816..295269126 100644 --- a/salt/idh/enabled.sls +++ b/salt/idh/enabled.sls @@ -20,7 +20,7 @@ so-idh: - network_mode: host - binds: - /nsm/idh:/var/tmp:rw - - /opt/so/conf/idh/http-skins:/usr/local/lib/python3.12/site-packages/opencanary/modules/data/http/skin:ro + - /opt/so/conf/idh/http-skins:/opt/opencanary/http-skins:ro - /opt/so/conf/idh/opencanary.conf:/etc/opencanaryd/opencanary.conf:ro {% if DOCKERMERGED.containers['so-idh'].custom_bind_mounts %} {% for BIND in DOCKERMERGED.containers['so-idh'].custom_bind_mounts %} diff --git a/salt/idh/opencanary_config.map.jinja b/salt/idh/opencanary_config.map.jinja index 420cc7f79..ce7abedc6 100644 --- a/salt/idh/opencanary_config.map.jinja +++ b/salt/idh/opencanary_config.map.jinja @@ -28,6 +28,7 @@ {% set HTTPPROXYSKINLIST = OPENCANARYCONFIG.pop('httpproxy_x_skinlist') %} {% do OPENCANARYCONFIG.update({'http_x_skin_x_list': HTTPSKINLIST}) %} {% do OPENCANARYCONFIG.update({'httpproxy_x_skin_x_list': HTTPPROXYSKINLIST}) %} +{% do OPENCANARYCONFIG.update({'http_x_skindir': '/opt/opencanary/http-skins/' ~ OPENCANARYCONFIG['http_x_skin']}) %} {% set OPENSSH = salt['pillar.get']('idh:openssh', default=IDHCONFIG.idh.openssh, merge=True) %} diff --git a/salt/idh/skins/http/opencanary/basicLogin/redirect.html b/salt/idh/skins/http/opencanary/basicLogin/redirect.html new file mode 100644 index 000000000..1386b17f7 --- /dev/null +++ b/salt/idh/skins/http/opencanary/basicLogin/redirect.html @@ -0,0 +1,29 @@ + + + Redirect + + + +
+
+ Click here +
+
+ + + diff --git a/salt/idh/skins/http/opencanary/nasLogin/redirect.html b/salt/idh/skins/http/opencanary/nasLogin/redirect.html new file mode 100644 index 000000000..1386b17f7 --- /dev/null +++ b/salt/idh/skins/http/opencanary/nasLogin/redirect.html @@ -0,0 +1,29 @@ + + + Redirect + + + +
+
+ Click here +
+
+ + +