From 4b17e7c37bfaebf6e831f956e94f5c735f644693 Mon Sep 17 00:00:00 2001
From: Maria Haider <mariah@sunet.se>
Date: Fri, 9 May 2025 16:46:35 +0200
Subject: [PATCH] ciso stuffs

---
 .../net/files/cisoassistant/update-cisoas-enterprise.sh      | 4 +---
 .../net/files/cisoassistant/update-cisoas-enterprise_test.sh | 5 ++---
 .../etc/puppet/modules/net/manifests/cisoassistant_test.pp   | 2 +-
 .../puppet/modules/net/templates/cisoassistant/Caddyfile.erb | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise.sh b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise.sh
index d234a63..25b1d1c 100644
--- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise.sh
+++ b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise.sh
@@ -1,5 +1,3 @@
 #! /usr/bin/env bash
 cd /opt/cisoas/ciso-assistant-community/enterprise
-pushd ..
-./update-ciso-assistant.sh enterprise
-popd
+./update-ciso-assistant.sh enterprise
\ No newline at end of file
diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh
index 7851deb..ed84447 100644
--- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh
+++ b/global/overlay/etc/puppet/modules/net/files/cisoassistant/update-cisoas-enterprise_test.sh
@@ -1,4 +1,3 @@
+#! /usr/bin/env bash
 cd /opt/cisoas/
-pushd ..
-./update-ciso-assistant.sh enterprise
-popd
\ No newline at end of file
+./update-ciso-assistant.sh enterprise
\ No newline at end of file
diff --git a/global/overlay/etc/puppet/modules/net/manifests/cisoassistant_test.pp b/global/overlay/etc/puppet/modules/net/manifests/cisoassistant_test.pp
index ad25613..6903359 100644
--- a/global/overlay/etc/puppet/modules/net/manifests/cisoassistant_test.pp
+++ b/global/overlay/etc/puppet/modules/net/manifests/cisoassistant_test.pp
@@ -1,4 +1,4 @@
-class net::cisoassistant_test ($ciso_service_name='') {
+class net::cisoassistant_test ($ciso_service_name='', $ciso_api_service_name='') {
   $nftables_rules = {
     'allow_access_to_cisoassistant' => {
       from  => 'any',
diff --git a/global/overlay/etc/puppet/modules/net/templates/cisoassistant/Caddyfile.erb b/global/overlay/etc/puppet/modules/net/templates/cisoassistant/Caddyfile.erb
index 23d5df8..3bade77 100644
--- a/global/overlay/etc/puppet/modules/net/templates/cisoassistant/Caddyfile.erb
+++ b/global/overlay/etc/puppet/modules/net/templates/cisoassistant/Caddyfile.erb
@@ -2,7 +2,7 @@
     reverse_proxy frontend:3000
     tls /certs/cert.pem /certs/key.pem
 }
-<%= @ciso_service_name %>:9443 {
+<%= @ciso_api_service_name %>:9443 {
     reverse_proxy backend:8000
     tls /certs/cert.pem /certs/key.pem
 }
\ No newline at end of file