swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed related to SC-2266

Browse source
This commit is contained in:
Maria Haider 2024-05-16 13:56:00 +02:00
parent 8fd3ab799e
commit cb72857800
Signed by: mariah
GPG key ID: 7414A760CA747E57
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -540,6 +540,8 @@ natpub-test-1.komreg.net:
eupub-1.komreg.net: eupub-1.komreg.net:
autoupdate: autoupdate:
infra_ca_rp:
monitor_infra_cert: false
md_publisher: md_publisher:
keyname: eupub-1.komreg.net_infra keyname: eupub-1.komreg.net_infra
signer_ip_adress: '94.176.224.198' signer_ip_adress: '94.176.224.198'
@ -554,6 +556,8 @@ eupub-1.komreg.net:
eupub-test-1.komreg.net: eupub-test-1.komreg.net:
autoupdate: autoupdate:
infra_ca_rp:
monitor_infra_cert: false
md_publisher: md_publisher:
keyname: eupub-test-1.komreg.net_infra keyname: eupub-test-1.komreg.net_infra
signer_ip_adress: '89.45.237.138' signer_ip_adress: '89.45.237.138'
@ -676,6 +680,8 @@ natpub-test-2.komreg.net:
eupub-2.komreg.net: eupub-2.komreg.net:
autoupdate: autoupdate:
infra_ca_rp:
monitor_infra_cert: false
md_publisher: md_publisher:
keyname: eupub-2.komreg.net_infra keyname: eupub-2.komreg.net_infra
signer_ip_adress: '94.176.224.70' signer_ip_adress: '94.176.224.70'
@ -690,6 +696,8 @@ eupub-2.komreg.net:
eupub-test-2.komreg.net: eupub-test-2.komreg.net:
autoupdate: autoupdate:
infra_ca_rp:
monitor_infra_cert: false
md_publisher: md_publisher:
keyname: eupub-test-2.komreg.net_infra keyname: eupub-test-2.komreg.net_infra
signer_ip_adress: '89.45.236.73' signer_ip_adress: '89.45.236.73'
@ -735,9 +743,13 @@ p1.komreg.net:
valid_until: 7 valid_until: 7
xml_dir: role xml_dir: role
validate_cert: '/var/www/html/qa.swedenconnect.se.cert' validate_cert: '/var/www/html/qa.swedenconnect.se.cert'
imagetag: v2024-04-08-01
infra_cert_from_this_class: false
p2.qa.komreg.net: p2.qa.komreg.net:
sunet_iaas_cloud: sunet_iaas_cloud:
infra_ca_rp:
monitor_infra_cert: false
autoupdate: autoupdate:
md_publisher: md_publisher:
keyname: p2.qa.komreg.net_infra keyname: p2.qa.komreg.net_infra
@ -960,6 +972,8 @@ demw-2.sveidas.se:
eid::dockerhost: eid::dockerhost:
version: '5:23.0.6-1~ubuntu.20.04~focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
docker_repo: stable docker_repo: stable
infra_ca_rp:
monitor_infra_cert: false
konsulter: konsulter:
autoupdate: autoupdate:
eidas_connector: eidas_connector:
@ -1057,6 +1071,8 @@ log-1.sveidas.se:
'^eidas-node-[0-9]+\.qa\.sveidas\.se$': '^eidas-node-[0-9]+\.qa\.sveidas\.se$':
konsulter: konsulter:
sunet_iaas_cloud: sunet_iaas_cloud:
infra_ca_rp:
monitor_infra_cert: false
autoupdate: autoupdate:
eid::dockerhost: eid::dockerhost:
version: '5:23.0.6-1~ubuntu.20.04~focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
@ -1073,6 +1089,8 @@ log-1.sveidas.se:
'^eidas-connector-[0-9]+\.test\.sveidas\.se$': '^eidas-connector-[0-9]+\.test\.sveidas\.se$':
sunet_iaas_cloud: sunet_iaas_cloud:
infra_ca_rp:
monitor_infra_cert: false
eid::dockerhost: eid::dockerhost:
version: '5:23.0.6-1~ubuntu.20.04~focal' version: '5:23.0.6-1~ubuntu.20.04~focal'
konsulter: konsulter:

4
global/overlay/etc/puppet/manifests/cosmos-site.pp
View file

@ -16,8 +16,8 @@ class autoupdate {
class jumphosts {} class jumphosts {}
class infra_ca_rp { class infra_ca_rp (Boolean $monitor_infra_cert = true,){
sunet::ici_ca::rp { 'infra': } sunet::ici_ca::rp { 'infra': monitor_infra_cert => $monitor_infra_cert}
} }
# you need a default node, all nodes need ssh + ufw # you need a default node, all nodes need ssh + ufw