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

refactor ufw classes

Browse source
This commit is contained in:
Leif Johansson 2019-11-07 10:23:29 +01:00
parent 50a2477166
commit 03d81b317e
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -602,6 +602,8 @@ md-eu1.qa.komreg.net:
saml_metadata: saml_metadata:
filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
url: https://qa.connector.eidas.swedenconnect.se/idp/metadata/sp url: https://qa.connector.eidas.swedenconnect.se/idp/metadata/sp
webserver:
enabled: true
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'qa.demw.eidas.swedenconnect.se': 'qa.demw.eidas.swedenconnect.se':
@ -615,12 +617,13 @@ md-eu1.qa.komreg.net:
konsulter: konsulter:
autoupdate: autoupdate:
eidas_de_middleware_hsm: eidas_de_middleware_hsm:
enabled: true
version: 110-fixes-sc-p11 version: 110-fixes-sc-p11
hostname: demw.eidas.swedenconnect.se hostname: demw.eidas.swedenconnect.se
saml_metadata: saml_metadata:
filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
url: https://connector.eidas.swedenconnect.se/idp/metadata/sp url: https://connector.eidas.swedenconnect.se/idp/metadata/sp
webserver:
enabled: true
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'demw.eidas.swedenconnect.se': 'demw.eidas.swedenconnect.se':
@ -634,12 +637,13 @@ md-eu1.qa.komreg.net:
konsulter: konsulter:
autoupdate: autoupdate:
eidas_de_middleware_hsm: eidas_de_middleware_hsm:
enabled: false
version: 110-fixes-sc-p11 version: 110-fixes-sc-p11
hostname: demw.eidas.swedenconnect.se hostname: demw.eidas.swedenconnect.se
saml_metadata: saml_metadata:
filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml filename: /opt/eidas-middleware/configuration/serviceprovider-metadata/connector-metadata.xml
url: https://connector.eidas.swedenconnect.se/idp/metadata/sp url: https://connector.eidas.swedenconnect.se/idp/metadata/sp
webserver:
enabled: false
sunet::frontend::register_sites: sunet::frontend::register_sites:
sites: sites:
'demw.eidas.swedenconnect.se': 'demw.eidas.swedenconnect.se':

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

@ -304,7 +304,7 @@ class md_repo_server($hostname) {
ensure_resource('class','https_server',{}) ensure_resource('class','https_server',{})
} }
class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost',$enabled=false) { class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost') {
$_version = safe_hiera('eidas_demw_version',$version) $_version = safe_hiera('eidas_demw_version',$version)
$_hostname = safe_hiera('eidas_demw_hostname',$hostname) $_hostname = safe_hiera('eidas_demw_hostname',$hostname)
$poseidas_admin_hashed_password = safe_hiera('poseidas_admin_hashed_password') $poseidas_admin_hashed_password = safe_hiera('poseidas_admin_hashed_password')
@ -340,8 +340,6 @@ class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost',
"SPRING_DATASOURCE_PASSWORD=$spring_datasource_password"], "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password"],
extra_parameters => ["--log-driver=syslog"] extra_parameters => ["--log-driver=syslog"]
} }
ensure_resource('class','webserver',{enabled => $enabled})
ensure_resource('class','https_server',{})
} }
class eidas_de_middleware($version="106-rs",$hostname='localhost') { class eidas_de_middleware($version="106-rs",$hostname='localhost') {
@ -386,8 +384,6 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
"MIDDLEWARE_SIGN_PIN=$middleware_sign_pin"], "MIDDLEWARE_SIGN_PIN=$middleware_sign_pin"],
extra_parameters => ["--log-driver=syslog"] extra_parameters => ["--log-driver=syslog"]
} }
ensure_resource('class','webserver',{})
ensure_resource('class','https_server',{})
} }
class eidas_sp($version="1.0.0",$hostname='localhost',$environment='qa') { class eidas_sp($version="1.0.0",$hostname='localhost',$environment='qa') {