diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/daemon.json b/global/overlay/etc/puppet/modules/net/files/cisoassistant/daemon.json deleted file mode 100644 index 63f418f..0000000 --- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/daemon.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "iptables": false -} diff --git a/global/overlay/etc/puppet/modules/net/files/cisoassistant/rotate-certs.sh b/global/overlay/etc/puppet/modules/net/files/cisoassistant/rotate-certs.sh deleted file mode 100644 index 53cd9d8..0000000 --- a/global/overlay/etc/puppet/modules/net/files/cisoassistant/rotate-certs.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -cd /etc/dehydrated/certs/cisoas-sto4-prod-1.sunet.se - -latest_csr=$(ls -t cert-*.csr | head -n 1) -latest_cert=$(ls -t cert-*.pem | head -n 1) -latest_key=$(ls -t privkey-*.pem | head -n 1) - -ln -sf "$latest_csr" cert.csr -ln -sf "$latest_cert" cert.pem -ln -sf "$latest_key" key.pem diff --git a/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp b/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp index 10862b6..ab808bf 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/cisoassistant.pp @@ -24,12 +24,6 @@ class net::cisoassistant { * => $params, } } -# file { '/etc/docker/daemon.json': -# mode => '0744', -# owner => 'root', -# group => 'root', -# content => file('net/cisoassistant/daemon.json'), -# } # file { '/opt/cisoas/ciso-assistant-community/enterprise/docker-compose.yml': # mode => '0744', # owner => 'root', @@ -47,17 +41,6 @@ class net::cisoassistant { weekday => 'Saturday', ok_criteria => ['exit_status=0', 'max_age=10d'], } - file { '/opt/cisoas/ciso-assistant-community/enterprise/rotate-certs.sh': - mode => '0744', - owner => 'root', - group => 'root', - content => file('net/cisoassistant/rotate-certs.sh'), - } - sunet::scriptherder::cronjob { 'Rotate le certificates': - cmd => '/opt/cisoas/ciso-assistant-community/enterprise/rotate-certs.sh', - hour => '1', - ok_criteria => ['exit_status=0', 'max_age=48h'], - } # file { '/opt/cisoas/ciso-assistant-community/enterprise/Caddyfile': # mode => '0744', # owner => 'root', diff --git a/global/overlay/etc/puppet/modules/net/manifests/open_1022.pp b/global/overlay/etc/puppet/modules/net/manifests/open_1022.pp index 6038b48..5cfd974 100644 --- a/global/overlay/etc/puppet/modules/net/manifests/open_1022.pp +++ b/global/overlay/etc/puppet/modules/net/manifests/open_1022.pp @@ -1,6 +1,7 @@ class net::open_1022 { sunet::misc::ufw_allow { 'allow_ssh_1022': - from => $mgmt_addresses, + from => ['130.242.125.68'], port => '1022', + proto => 'udp' } }