Merge branch 'master' of gitops.sunet.se:eid-ops

This commit is contained in:
Björn Mattsson 2023-04-26 15:45:55 +02:00
commit c056772e1f
Signed by: bjorn
GPG key ID: 8E2DA8EB05F646D7
18 changed files with 102 additions and 33 deletions

View file

@ -15,13 +15,13 @@ cat<<EOF
<EPAConnectorConfiguration updateCVC="true">
<CVCRefID>se-de-middleware</CVCRefID>
<PkiConnectorConfiguration>
<blackListTrustAnchor>MIIEeTCCA2GgAwIBAgIDJncSMA0GCSqGSIb3DQEBCwUAMFQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxLjAsBgNVBAMTJUQtVFJVU1QgTGltaXRlZCBCYXNpYyBFQUMgQ0EgMS0xIDIwMTgwHhcNMTkwNDA5MTA1OTQwWhcNMjMwNDA5MTA1OTQwWjBZMQswCQYDVQQGEwJERTEUMBIGA1UEChMLRUFDIFN5c3RlbWUxFDASBgNVBAsTC0VBQyBTeXN0ZW1lMR4wHAYDVQQDExVCbGFja2xpc3QgU2lnbmVyIFByb2QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCllBN2ywEYeRbho72EcY57ts1UOrTkyTxPywCUBQNs9K3d/HGDMyp1LviWxeO4hFldj31TiW6QkEYL56bURhS4JG//Pry2L6wQoBJWkw2++xioZzCD1W2GtoX7djNM6YRGJ4+UOIJw31i6iQpjDBq/PqQypr4foGqacBx2JkLIMGF3Ad7gG9o6kxEuSnl/9QrdCGII7Suowc/MWKch6SO3m14YXxSG1jhr0+8Wn1gO2lPhbSjhAh2wSg/wl7D1Nx7aIgHyyX8sHQGyUNhz9kZ/Zv/qdySn4NEMneSSBoKoeR4lgA1zg6jXHy7sGIF6d/hjJ2QDsuvxfOeA0KfwQ/CFAgMBAAGjggFNMIIBSTAdBgNVHQ4EFgQUe4pbOJhU5L4/Kaafv/V6xfSM1A0wFgYDVR0gBA8wDTALBgkqghQAUAeDdAowHwYDVR0jBBgwFoAUswxYrf8CYVl4gE/vvK5G8oYbv2kwDgYDVR0PAQH/BAQDAgeAMIHeBgNVHR8EgdYwgdMwgdCggc2ggcqGgYFsZGFwOi8vZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBMaW1pdGVkJTIwQmFzaWMlMjBFQUMlMjBDQSUyMDEtMSUyMDIwMTgsTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3SGRGh0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfbGltaXRlZF9iYXNpY19lYWNfY2FfMS0xXzIwMTguY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQCR6P6B+PTwOUPg3QAg9zXtAiWzySnWcEyq3QuHTGtnFXp5tVlX0nteNaPh8tfN4kH5U9/s4mFGqFCbPMSLGTjhDTr/ctw/qnj9J0nNW+G5dubTk+p/bZTPS8WcGm6feeNlfSF6V+W58hMnsVvH2o80t9b6TxAhM/G5FMjhIjbE3WxiYDcNecGnWrtmYCaNUeC/XYL7ZJp2t5MjhJYgNzIhvPV0NnEjBmp7jH57xzhHJ8b/LX+xt6nytEwWH4E6HqYqlQcSzfCpMurhR2s7EpyJxP1CIEy1gcWiBQPYFJIsl32P3VU6vclxxTJclZfTsJ/2wKu9oubMLdfjpvHL0M/z</blackListTrustAnchor>
<blackListTrustAnchor>MIIFwzCCBKugAwIBAgIDD+TCMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxLTArBgNVBAMMJEQtVFJVU1QgTGltaXRlZCBCYXNpYyBSb290IENBIDEgMjAxNTAeFw0xODA0MTkxMzAyMjZaFw0zMDExMDQwNzM1NTFaMFQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxLjAsBgNVBAMTJUQtVFJVU1QgTGltaXRlZCBCYXNpYyBFQUMgQ0EgMS0xIDIwMTgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB8WLI+HxLRlAQCcpRqQjwU6slek1H4USttrsOgkDdeqj5MRPpOxcWuoqt/13Yt93stTqRd6xjz6eoG1MMEQuaELW6rLPiTmHe1hlcLVgI/VVwo3cfzng4SSNJhlFgYKaKKMVbz9vdmXYMqyzjerTvLBpHzab0o8TRmSck+2Jxb55KEMOGOiOaetQlQ2bMaNxfwU0A0wZzp+iCpFbgcXByS1mlZ+lf3Vv8TVbRvbyvuEwxbgO4LsbtfDLbYWcNU5CsTq7XMIGaIicPQ9X7uolMyk5+jH/DnBW0Q3v/0AZWTlG2DML6bCbyaVdvG+soE4bbNQsUrIP0mFfF2bn3SUZVAgMBAAGjggKdMIICmTAfBgNVHSMEGDAWgBQlSUX5fGYWq5kTw3rWRXJpOqsDmjCCATIGCCsGAQUFBwEBBIIBJDCCASAwQAYIKwYBBQUHMAGGNGh0dHA6Ly9saW1pdGVkLWJhc2ljLXJvb3QtY2EtMS0yMDE1Lm9jc3AuZC10cnVzdC5uZXQwUwYIKwYBBQUHMAKGR2h0dHA6Ly93d3cuZC10cnVzdC5uZXQvY2dpLWJpbi9ELVRSVVNUX0xpbWl0ZWRfQmFzaWNfUm9vdF9DQV8xXzIwMTUuY3J0MIGGBggrBgEFBQcwAoZ6bGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwTGltaXRlZCUyMEJhc2ljJTIwUm9vdCUyMENBJTIwMSUyMDIwMTUsTz1ELVRydXN0JTIwR21iSCxDPURFP2NBQ2VydGlmaWNhdGU/YmFzZT8wGAYDVR0gBBEwDzANBgsrBgEEAaU0AoN0ATCB4gYDVR0fBIHaMIHXMIGJoIGGoIGDhoGAbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwTGltaXRlZCUyMEJhc2ljJTIwUm9vdCUyMENBJTIwMSUyMDIwMTUsTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwSaBHoEWGQ2h0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfbGltaXRlZF9iYXNpY19yb290X2NhXzFfMjAxNS5jcmwwHQYDVR0OBBYEFLMMWK3/AmFZeIBP77yuRvKGG79pMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMA0GCSqGSIb3DQEBCwUAA4IBAQAIVJmvQUmQzKtHu5J06SpEdhlkZwHn8EA8U0Ieh5mgpxif14EwIf43ChVq2SpSKZErtQWewE+drUH2r6FvT+/3OW+TYr1jdejQFXcGXABKbJDqFfBIkbAr6E+Dy90aur656nZv+lV/leHL6pCPilcSzTTrdyNzL86AQrifcCO7GPO0tVjkUCFTEByGqWkOPtu0Xr+04bxdtUIWrpBHQENwEx67B0tS60c5v/cdhi9EedGHvJy5lXtw0R8KKR8u/WEbwmI72EIcrgG+/jF/oMR59x2bTv6hVGT9KkddKWot0oBNGkMJrLAJboq5zzHYxXEJFpjhOgkS7THQHGcxPJn8</blackListTrustAnchor>
<masterListTrustAnchor>MIIFKjCCBI+gAwIBAgICBE0wCgYIKoZIzj0EAwQwQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MB4XDTE5MDUyMDA5MjYyMloXDTMzMDIyMDIzNTk1OVowQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MIICODCCAa8GByqGSM49AgEwggGiAgEBMEwGByqGSM49AQECQQCq3Z242+nEiz/U5q4zyfwHyzCNs7PJ0g7WY5zKcDMIcX1NmwCbxmhCrs2hKuajgOYogf8vLYLGhSiqYFZYOkjzMIGEBEB4MKMxi2A7ieIycUWsI0zFlMvdjT35FhCoNEHK6phjvC3tXVqoJTqhCi7xyYuayLV/ERenK/LHuefBrE13/JTKBEA9+RYQqDRByuqYY7wt7V1aqCU6oQou8cmLmsi1fxEXpyvyx7nnwaxNd/yUytwIPmeYQFC3Xrrl3SgJvWOAFvcjBIGBBIGu5L3YLtlkWiEyLpxMapOF7Z9wtdkWwbQ7Yu700AmO/zsfeOLQ1I1Q0Wh7k7l9X3xtUEdAal5oizUiCby5+CJ93jhdVmMy7MDqv6nPeCL98gn3ACSlexqgAMVbiB+BEbLc3klKX0heW8pL2IonY67RyisvqPBUBnjNHg862AiSAkEAqt2duNvpxIs/1OauM8n8B8swjbOzydIO1mOcynAzCHBVPlxBTKkmGUGGYRl/rBBHHbHTgQhd2t21h5aCnKkAaQIBAQOBggAEEERozJeK4nstSM5WcswLo7XmgwufavFGedmYQpZdonhC5trUBNLYkNNW69vl5va9oTRr1fU95eJ/nKJQy5I3cRRuw1hOp+rSUUfk2V9ACscNpIMKLTVp9kUOKrLObvnjaDes+4eNV3WiCv6MiD77pMmSx6ek9IPqd7KxU5/iW42jggGUMIIBkDAdBgNVHQ4EFgQUdBpErUvXtvzVuu7xHoJ+WKWYHCQwDgYDVR0PAQH/BAQDAgEGMCsGA1UdEAQkMCKADzIwMTkwNTIwMDkyNjIyWoEPMjAyMjA3MjAyMzU5NTlaMBYGA1UdIAQPMA0wCwYJBAB/AAcDAQEBMFEGA1UdEQRKMEiBGGNzY2EtZ2VybWFueUBic2kuYnVuZC5kZYYcaHR0cHM6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYaQOMAwxCjAIBgNVBAcMAUQwUQYDVR0SBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDASBgNVHRMBAf8ECDAGAQH/AgEAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYV9jcmwwDQYHZ4EIAQEGAQQCBQAwHwYDVR0jBBgwFoAUdBpErUvXtvzVuu7xHoJ+WKWYHCQwCgYIKoZIzj0EAwQDgYgAMIGEAkA4qqxpicREnfeRLiNJBGAmOmRmT2JyNx76ttqogtx31bS6ZOGF+08akTb6J2gdXTuTfQ05buVwKjA8HMI0J463AkB+iwO2+J/NaYUdr014wTu5ZHcbSMA2QpaSl2v+Gzp0+QpeP2a/2gvGZoiVpfTT4mfEmtcCN5QwRWmXpMyB2IsO</masterListTrustAnchor>
<defectListTrustAnchor>MIIFKjCCBI+gAwIBAgICBE0wCgYIKoZIzj0EAwQwQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MB4XDTE5MDUyMDA5MjYyMloXDTMzMDIyMDIzNTk1OVowQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MIICODCCAa8GByqGSM49AgEwggGiAgEBMEwGByqGSM49AQECQQCq3Z242+nEiz/U5q4zyfwHyzCNs7PJ0g7WY5zKcDMIcX1NmwCbxmhCrs2hKuajgOYogf8vLYLGhSiqYFZYOkjzMIGEBEB4MKMxi2A7ieIycUWsI0zFlMvdjT35FhCoNEHK6phjvC3tXVqoJTqhCi7xyYuayLV/ERenK/LHuefBrE13/JTKBEA9+RYQqDRByuqYY7wt7V1aqCU6oQou8cmLmsi1fxEXpyvyx7nnwaxNd/yUytwIPmeYQFC3Xrrl3SgJvWOAFvcjBIGBBIGu5L3YLtlkWiEyLpxMapOF7Z9wtdkWwbQ7Yu700AmO/zsfeOLQ1I1Q0Wh7k7l9X3xtUEdAal5oizUiCby5+CJ93jhdVmMy7MDqv6nPeCL98gn3ACSlexqgAMVbiB+BEbLc3klKX0heW8pL2IonY67RyisvqPBUBnjNHg862AiSAkEAqt2duNvpxIs/1OauM8n8B8swjbOzydIO1mOcynAzCHBVPlxBTKkmGUGGYRl/rBBHHbHTgQhd2t21h5aCnKkAaQIBAQOBggAEEERozJeK4nstSM5WcswLo7XmgwufavFGedmYQpZdonhC5trUBNLYkNNW69vl5va9oTRr1fU95eJ/nKJQy5I3cRRuw1hOp+rSUUfk2V9ACscNpIMKLTVp9kUOKrLObvnjaDes+4eNV3WiCv6MiD77pMmSx6ek9IPqd7KxU5/iW42jggGUMIIBkDAdBgNVHQ4EFgQUdBpErUvXtvzVuu7xHoJ+WKWYHCQwDgYDVR0PAQH/BAQDAgEGMCsGA1UdEAQkMCKADzIwMTkwNTIwMDkyNjIyWoEPMjAyMjA3MjAyMzU5NTlaMBYGA1UdIAQPMA0wCwYJBAB/AAcDAQEBMFEGA1UdEQRKMEiBGGNzY2EtZ2VybWFueUBic2kuYnVuZC5kZYYcaHR0cHM6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYaQOMAwxCjAIBgNVBAcMAUQwUQYDVR0SBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDASBgNVHRMBAf8ECDAGAQH/AgEAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYV9jcmwwDQYHZ4EIAQEGAQQCBQAwHwYDVR0jBBgwFoAUdBpErUvXtvzVuu7xHoJ+WKWYHCQwCgYIKoZIzj0EAwQDgYgAMIGEAkA4qqxpicREnfeRLiNJBGAmOmRmT2JyNx76ttqogtx31bS6ZOGF+08akTb6J2gdXTuTfQ05buVwKjA8HMI0J463AkB+iwO2+J/NaYUdr014wTu5ZHcbSMA2QpaSl2v+Gzp0+QpeP2a/2gvGZoiVpfTT4mfEmtcCN5QwRWmXpMyB2IsO</defectListTrustAnchor>
<policyImplementationId>budru</policyImplementationId>
<sslKeys id="d-trust">
<serverCertificate>
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
</serverCertificate>
<clientCertificate>${DEMW_TLS_CLIENT_CERT}</clientCertificate>
<clientKey>${DEMW_TLS_CLIENT_KEY}</clientKey>

View file

@ -80,7 +80,7 @@ export TOMCAT_TLS_SERVER_KEY=$TOMCAT_CREDENTIALS/tomcat-key.pem
export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem
export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
export FEDERATION_METADATA_URL=https://md.swedenconnect.se/entities
export FEDERATION_METADATA_URL=https://md.swedenconnect.se/entities/
export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/swedenconnect-signer.crt
unset EIDAS_METADATA_SERVICE_LIST_URL=https://md.eidas.swedenconnect.se/mdservicelist-aggregate.xml

View file

@ -78,7 +78,7 @@ proxy-service.eidasMdListLocation=https://md.eidas.swedenconnect.se/mdservicelis
proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/cfg/swedenconnect-signer.crt
#Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:"
proxy-service.eidasMetadataLocation=https://md.eidas.swedenconnect.se/entities
proxy-service.eidasMetadataLocation=https://md.eidas.swedenconnect.se/role/sp.xml
# Optional certificate file for validating metadata signatures
# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set

View file

@ -67,7 +67,7 @@ export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
export TOMCAT_INTERNAL_PROXIES='"10\.\d{1,3}\.\d{1,3}\.\d{1,3}\|192\.168\.\d{1,3}\.\d{1,3}\|169\.254\.\d{1,3}\.\d{1,3}\|127\.\d{1,3}\.\d{1,3}\.\d{1,3}\|172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}\|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}\|172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}\|130\.242\.125\.\d{1,3}\|81\.236\.48\.\d{1,3}"'
export TOMCAT_SESSION_COOKIE_NAME="JSESSIONID.CONNECTOR.QA"
export FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities
export FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities/
export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
#export EIDAS_METADATA_SERVICE_LIST_URL=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
@ -75,7 +75,7 @@ unset EIDAS_METADATA_SERVICE_LIST_URL
#export EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
unset EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT
export EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities
export EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities/
export EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
export IDP_ACCESSIBILITY_URL=https://www.swedenconnect.se/om/om-webbplatsen/tillganglighet/svenska-eidas-noden

View file

@ -80,7 +80,7 @@ export TOMCAT_TLS_SERVER_KEY=$TOMCAT_CREDENTIALS/tomcat-key.pem
export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem
export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
export FEDERATION_METADATA_URL=https://test.md.swedenconnect.se/entities
export FEDERATION_METADATA_URL=https://test.md.swedenconnect.se/entities/
export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata-signer.crt
unset EIDAS_METADATA_SERVICE_LIST_URL=https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml

View file

@ -78,7 +78,7 @@ proxy-service.eidasMdListLocation=https://test.md.eidas.swedenconnect.se/mdservi
proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/cfg/test-metadata-signer.crt
#Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:"
proxy-service.eidasMetadataLocation=https://test.md.eidas.swedenconnect.se/entities
proxy-service.eidasMetadataLocation=https://test.md.eidas.swedenconnect.se/role/sp.xml
# Optional certificate file for validating metadata signatures
# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set

View file

@ -80,7 +80,7 @@ j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
<h2>SAML Metadata URLs</h2>
<dl>
<dt>All Entities</dt>
<dd><a href="/entities/">https://md.eidas.swedenconnect.se/entities</a></dd>
<dd><a href="/entities/">https://md.eidas.swedenconnect.se/entities/</a></dd>
<dt>Only IdPs</dt>
<dd><a href="/role/idp.xml">https://md.eidas.swedenconnect.se/role/idp.xml</a></dd>
<dt>Only SPs</dt>

View file

@ -79,7 +79,7 @@ W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
<h2>SAML Metadata URLs</h2>
<dl>
<dt>All Entities</dt>
<dd><a href="/entities/">https://test.md.eidas.swedenconnect.se/entities</a></dd>
<dd><a href="/entities/">https://test.md.eidas.swedenconnect.se/entities/</a></dd>
<dt>Only IdPs</dt>
<dd><a href="/role/idp.xml">https://test.md.eidas.swedenconnect.se/role/idp.xml</a></dd>
<dt>Only SPs</dt>

View file

@ -42,6 +42,9 @@ defaults
timeout server 17s
timeout http-request 5s
balance roundrobin
# never fail on address resolution
default-server init-addr libc,none
{% endblock defaults %}
{% block stats %}

View file

@ -202,6 +202,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites:
sites:
@ -223,6 +224,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites: &id012
sites:
@ -244,6 +246,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites: &id015
sites:
@ -264,6 +267,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites: *id012
sunet::rsyslog: null
@ -280,6 +284,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites: *id015
sunet::rsyslog: null
@ -296,6 +301,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites: *id012
sunet::rsyslog: null
@ -311,6 +317,7 @@ classes:
konsulter: null
mailclient: *id001
nrpe: null
proxy_eidas_metadata: null
servicemonitor: null
sunet::frontend::register_sites: *id012
sunet::rsyslog: null
@ -1803,6 +1810,9 @@ members:
pages: [web-1.qa.sveidas.se]
prid: [prid-1.qa.sveidas.se, prid-1.sveidas.se, prid-2.sveidas.se]
prid_local: [eidas-connector-1.test.sveidas.se, eidas-connector-2.test.sveidas.se]
proxy_eidas_metadata: [eidas-proxy-1.qa.sveidas.se, eidas-proxy-1.sveidas.se, eidas-proxy-1.test.sveidas.se,
eidas-proxy-2.sveidas.se, eidas-proxy-2.test.sveidas.se, eidas-proxy-3.sveidas.se,
eidas-proxy-4.sveidas.se]
redis_cluster_node: [eidas-redis-1.sveidas.se, eidas-redis-2.sveidas.se, eidas-redis-3.sveidas.se,
eidas-redis-4.sveidas.se]
redis_frontend_node: [eidas-redis-fe-1.sveidas.se, eidas-redis-fe-2.sveidas.se]

View file

@ -990,6 +990,7 @@ validator-test-1.komreg.net:
konsulter:
autoupdate:
servicemonitor:
proxy_eidas_metadata:
eidas_proxy:
version: 1.4.7_hsm2_ubuntu
hostname: proxy.eidas.swedenconnect.se
@ -1083,6 +1084,7 @@ log-1.sveidas.se:
sunet_iaas_cloud:
autoupdate:
servicemonitor:
proxy_eidas_metadata:
eidas_proxy:
version: 1.4.7_hsm2_ubuntu
hostname: qa.proxy.eidas.swedenconnect.se
@ -1103,6 +1105,7 @@ log-1.sveidas.se:
konsulter:
autoupdate:
servicemonitor:
proxy_eidas_metadata:
eidas_proxy:
version: 1.4.7_hsm2_ubuntu
hostname: test.proxy.eidas.swedenconnect.se

View file

@ -291,6 +291,19 @@ class mdsl_publisher() {
}
}
class proxy_eidas_metadata() {
sunet::nagios::nrpe_check_fileage {"proxy_eidas_metadata":
filename => "/etc/eidas-proxy/se/ps-mdcache/metadata.xml",
warning_age => '1800',
critical_age => '172800'
}
sunet::nagios::nrpe_check_fileage {"proxy_eidas_metadata_list":
filename => "/etc/eidas-proxy/se/ps-mdcache/metadataList.xml",
warning_age => '600',
critical_age => '172800'
}
}
class md_repo_server($hostname) {
ensure_resource('sunet::system_user', 'www-data', {
username => 'www-data',
@ -537,7 +550,7 @@ class swedenconnect_refidp($version="1.0.3",$hostname='localhost',$env=undef) {
'/etc/ssl:/etc/ssl'],
env => ["IDP_SERVER_HOSTNAME=$_hostname",
"TOMCAT_HOSTNAME=$_hostname",
"IDP_FEDERATION_METADATA_URL=https://${env}.md.swedenconnect.se/entities",
"IDP_FEDERATION_METADATA_URL=https://${env}.md.swedenconnect.se/entities/",
"IDP_FEDERATION_METADATA_VALIDATION_CERT=/etc/swedenconnect-idp/credentials/trust/sc-${env}-metadata-validation-cert.crt",
"TOMCAT_TLS_SERVER_KEY=/etc/ssl/private/${::fqdn}_infra.key",
"TOMCAT_TLS_SERVER_CERTIFICATE=/etc/ssl/certs/${::fqdn}_infra.crt",
@ -1218,6 +1231,18 @@ class nagios_monitor {
description => 'mdsl se age',
contact_groups => ['alerts']
}
nagioscfg::service {'proxy_eidas_metadata_age':
hostgroup_name => ['proxy_eidas_metadata'],
check_command => 'check_nrpe_1arg!check_fileage_proxy_eidas_metadata',
description => 'proxy eidas metadata age',
contact_groups => ['alerts']
}
nagioscfg::service {'proxy_eidas_metadata_list_age':
hostgroup_name => ['proxy_eidas_metadata'],
check_command => 'check_nrpe_1arg!check_fileage_proxy_eidas_metadata_list',
description => 'proxy eidas metadata list age',
contact_groups => ['alerts']
}
nagioscfg::service {'check_eidas_health':
hostgroup_name => ['servicemonitor'],
check_command => 'check_nrpe_1arg!check_eidas_health',
@ -1375,12 +1400,13 @@ class nagios_monitor {
nagioscfg::command {'check_country_count':
command_line => "/usr/lib/nagios/plugins/check_eidas_country_count.sh '\$ARG1\$' '\$ARG2\$' '\$ARG3\$' '\$ARG4\$'"
}
nagioscfg::service {'check_country_eIDAS_QA':
host_name => ['qa.md.eidas.swedenconnect.se'],
check_command => 'check_country_count!qa.md.eidas.swedenconnect.se!PT LU IT ES HR LV DE EE BE IS XB CY PL SK LT NO DK CZ SE EL XA MT SI!1!3',
description => 'check number of countries in eIDAS QA',
contact_groups => ['alerts'],
}
#Commented out in relation to SC-1468
# nagioscfg::service {'check_country_eIDAS_QA':
# host_name => ['qa.md.eidas.swedenconnect.se'],
# check_command => 'check_country_count!qa.md.eidas.swedenconnect.se!PT LU IT ES HR LV DE EE BE IS XB CY PL SK LT NO DK CZ SE EL XA MT SI!1!3',
# description => 'check number of countries in eIDAS QA',
# contact_groups => ['alerts'],
# }
nagioscfg::service {'check_country_eIDAS':
host_name => ['md.eidas.swedenconnect.se'],
check_command => 'check_country_count!md.eidas.swedenconnect.se!LU IT ES HR DE EE BE PT SK CZ LV!1!3',
@ -1408,21 +1434,48 @@ class nagios_monitor {
nagioscfg::command {'check_metadata_age':
command_line => "/usr/lib/nagios/plugins/check_eidas_metadata_age.sh '\$ARG1\$' '\$ARG2\$' '\$ARG3\$'"
}
$hosts_md = ['qa.md.swedenconnect.se', 'md.swedenconnect.se']
$hosts_md = ['qa.md.swedenconnect.se', 'md.swedenconnect.se', 'test.md.swedenconnect.se']
$hosts_md.each |$host|{
nagioscfg::service {"check_metadata_age_${host}":
host_name => ["${host}"],
check_command => "check_metadata_age!https://${host}/entities!691200!172800",
description => "check metadata for ${host}",
check_command => "check_metadata_age!https://${host}/entities/!691200!172800",
description => "check metadata age for ${host}",
contact_groups => ['alerts'],
}
}
$hosts_md_eidas = ['md.eidas.swedenconnect.se', 'qa.md.eidas.swedenconnect.se']
$hosts_md_eidas = ['md.eidas.swedenconnect.se', 'qa.md.eidas.swedenconnect.se', 'test.md.eidas.swedenconnect.se']
$hosts_md_eidas.each |$host|{
nagioscfg::service {"check_metadata_age_${host}":
host_name => ["${host}"],
check_command => "check_metadata_age!https://${host}/entities!432000!86400",
description => "check metadata for ${host}",
check_command => "check_metadata_age!https://${host}/entities/!432000!86400",
description => "check metadata age for ${host}",
contact_groups => ['alerts'],
}
}
$hosts_proxy = ['proxy.eidas.swedenconnect.se', 'qa.proxy.eidas.swedenconnect.se', 'test.proxy.eidas.swedenconnect.se']
$hosts_proxy.each |$host|{
nagioscfg::service {"check_metadata_age_${host}":
host_name => ["${host}"],
check_command => "check_metadata_age!https://${host}/eidas-ps/ServiceMetadata/!432000!86400",
description => "check metadata age for ${host}",
contact_groups => ['alerts'],
}
}
$hosts_demw = ['demw.eidas.swedenconnect.se', 'qa.demw.eidas.swedenconnect.se']
$hosts_demw.each |$host|{
nagioscfg::service {"check_metadata_age_${host}":
host_name => ["${host}"],
check_command => "check_metadata_age!https://${host}/eidas-middleware/Metadata/!432000!86400",
description => "check metadata age for ${host}",
contact_groups => ['alerts'],
}
}
$hosts_connector = ['connector.eidas.swedenconnect.se', 'qa.connector.eidas.swedenconnect.se', 'test.connector.eidas.swedenconnect.se']
$hosts_connector.each |$host|{
nagioscfg::service {"check_metadata_age_${host}":
host_name => ["${host}"],
check_command => "check_metadata_age!https://${host}/idp/metadata/sp/!432000!86400",
description => "check metadata age for ${host}",
contact_groups => ['alerts'],
}
}

View file

@ -79,7 +79,7 @@ JERf83JkjVLanESP9/U9nsZYgIiSX88PahYtuSZLhqamzzFvK+wuVcNKark8s1kS
<h2>Metadata URLer</h2>
<dl>
<dt>Full metadata - samtliga objekt</dt>
<dd><a href="/entities/">https://qa.md.swedenconnect.se/entities</a></dd>
<dd><a href="/entities/">https://qa.md.swedenconnect.se/entities/</a></dd>
<dt>Endast IdP:er</dt>
<dd><a href="/role/idp.xml">https://qa.md.swedenconnect.se/role/idp.xml</a></dd>
<dt>Endast SP:er</dt>

View file

@ -82,7 +82,7 @@ j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
<h2>Metadata URLer</h2>
<dl>
<dt>Full metadata - samtliga objekt</dt>
<dd><a href="/entities/">https://md.swedenconnect.se/entities</a></dd>
<dd><a href="/entities/">https://md.swedenconnect.se/entities/</a></dd>
<dt>Endast IdP:er</dt>
<dd><a href="/role/idp.xml">https://md.swedenconnect.se/role/idp.xml</a></dd>
<dt>Endast SP:er</dt>

View file

@ -79,7 +79,7 @@ W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
<h2>Metadata URLer</h2>
<dl>
<dt>Full metadata - samtliga objekt</dt>
<dd><a href="/entities/">https://test.md.swedenconnect.se/entities</a></dd>
<dd><a href="/entities/">https://test.md.swedenconnect.se/entities/</a></dd>
<dt>Endast IdP:er</dt>
<dd><a href="/role/idp.xml">https://test.md.swedenconnect.se/role/idp.xml</a></dd>
<dt>Endast SP:er</dt>

View file

@ -15,13 +15,13 @@ md-validator.home.url=https://swedenconnect.se
# Multipple sources may be set ordered by index. Valid parameters are "location", "certFile" (optional),
# "cacheFile" (optional), "index" and "ignoreSignatureValidation" default false.
md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities
md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities/
md-validator.metadataSource.prod[0].certFile=${md-validator.path.prefix}/cert/sc-prod-md.crt
md-validator.metadataSource.prod[0].cacheFile=${md-validator.path.prefix}/mdcache/prod-metadata-cache.xml
md-validator.metadataSource.prod[0].index=0
md-validator.metadataSource.prod[0].ignoreSignatureValidation=false
md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities
md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities/
md-validator.metadataSource.qa[0].certFile=${md-validator.path.prefix}/cert/sc-qa-md.crt
md-validator.metadataSource.qa[0].cacheFile=${md-validator.path.prefix}/mdcache/qa-metadata-cache.xml
md-validator.metadataSource.qa[0].index=0

View file

@ -15,13 +15,13 @@ md-validator.home.url=https://swedenconnect.se
# Multipple sources may be set ordered by index. Valid parameters are "location", "certFile" (optional),
# "cacheFile" (optional), "index" and "ignoreSignatureValidation" default false.
md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities
md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities/
md-validator.metadataSource.prod[0].certFile=${md-validator.path.prefix}/cert/sc-prod-md.crt
md-validator.metadataSource.prod[0].cacheFile=${md-validator.path.prefix}/mdcache/prod-metadata-cache.xml
md-validator.metadataSource.prod[0].index=0
md-validator.metadataSource.prod[0].ignoreSignatureValidation=false
md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities
md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities/
md-validator.metadataSource.qa[0].certFile=${md-validator.path.prefix}/cert/sc-qa-md.crt
md-validator.metadataSource.qa[0].cacheFile=${md-validator.path.prefix}/mdcache/qa-metadata-cache.xml
md-validator.metadataSource.qa[0].index=0

View file

@ -15,13 +15,13 @@ md-validator.home.url=https://swedenconnect.se
# Multipple sources may be set ordered by index. Valid parameters are "location", "certFile" (optional),
# "cacheFile" (optional), "index" and "ignoreSignatureValidation" default false.
md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities
md-validator.metadataSource.prod[0].location=https://md.swedenconnect.se/entities/
md-validator.metadataSource.prod[0].certFile=${md-validator.path.prefix}/cert/sc-prod-md.crt
md-validator.metadataSource.prod[0].cacheFile=${md-validator.path.prefix}/mdcache/prod-metadata-cache.xml
md-validator.metadataSource.prod[0].index=0
md-validator.metadataSource.prod[0].ignoreSignatureValidation=false
md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities
md-validator.metadataSource.qa[0].location=https://qa.md.swedenconnect.se/entities/
md-validator.metadataSource.qa[0].certFile=${md-validator.path.prefix}/cert/sc-qa-md.crt
md-validator.metadataSource.qa[0].cacheFile=${md-validator.path.prefix}/mdcache/qa-metadata-cache.xml
md-validator.metadataSource.qa[0].index=0
@ -70,4 +70,4 @@ management.endpoint.health.enabled=true
management.endpoint.auditevents.enabled=true
management.endpoints.web.exposure.include=*
management.endpoints.web.base-path=/
management.endpoint.health.show-details=always
management.endpoint.health.show-details=always