summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-17 01:00:13 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-17 01:00:13 +0200
commit93b50f3e164495f0ad102108245bc41b1f972edf (patch)
tree17e2aea15eaa4014303bcd9539b2045507267244
parenteb06e3007ad406e5b79907513f13bd6a2a075f1f (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp4
-rw-r--r--web-f1.sunet.se/overlay/etc/ssl/certs/web-f1.sunet.se_infra.crt35
2 files changed, 39 insertions, 0 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 2d60c60..04bfde3 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -833,6 +833,10 @@ class webfrontend {
class { 'webcommon': }
docker::image {'docker.sunet.se/pound': }
docker::image {'docker.sunet.se/varnish': }
+ sunet::etcd_node {'sunetweb':
+ disco_url => 'https://discovery.etcd.io/877f25988ea1e8bb8c9a49f2ad5f5f6a',
+ proxy => true
+ }
}
class webappserver {
diff --git a/web-f1.sunet.se/overlay/etc/ssl/certs/web-f1.sunet.se_infra.crt b/web-f1.sunet.se/overlay/etc/ssl/certs/web-f1.sunet.se_infra.crt
new file mode 100644
index 0000000..17b1b40
--- /dev/null
+++ b/web-f1.sunet.se/overlay/etc/ssl/certs/web-f1.sunet.se_infra.crt
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGHTCCBAWgAwIBAgIJAK32qhI0uUb6MA0GCSqGSIb3DQEBCwUAMD8xIDAeBgNV
+BAMTF1NVTkVUIEluZnJhc3RydWN0dXJlIENBMQ4wDAYDVQQKEwVTVU5FVDELMAkG
+A1UEBhMCU0UwHhcNMTUwNDE0MTA1MDAxWhcNMTUwNTE0MTA1MDAxWjA3MQswCQYD
+VQQGEwJTRTEOMAwGA1UEChMFU1VORVQxGDAWBgNVBAMTD3dlYi1mMS5zdW5ldC5z
+ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALZZWj88jnCWENR6zJfb
+te7RjDCwRv9H6bb4hEUZ7Xgjvucehj3J9WNqQ8pXcxbQBleia/8R1wnY4GwJWIlB
+iYdn3U3eqMU80e8Fz7c7Lf48sVp3gGYPfItdKbLG5iUQnEkHsE3JPQB5mLX2k9NI
+PdBnbdiGGTaF/MlVG14tATWFNbry90Qe8ynbmpiCuxu+GpSEU4yk0B+gY039ymYt
+MB47uNanUwbDCUzJ8WkRrWNlLzErKV+f3drY1jXOcjbZHxcde4yLBMr99hM/On48
+/jyBr4AGcfzL6nq7Lvi+eL4J+djRe+KJICXBahn8GTJGOVdqvZFgJKYTBl1Xym1t
+J5K2/4BPxJCqcIi2ZnR567Wlz2Bu32YXBjWkt+capnbLkTDljUEmKsaMGUey+Owv
+ZvnsRCxzTpKYMgNfvOZRXF18EwPt2dDRMUhmg/snyjo120a8OFCgYjNSCD5jY+mh
+DtmgL7lRar+EPaX/cl7yWixrGQzY85+mXa6OG4lJpmvQgmdRLnoQpVWnV6bo6fag
+PZ9Rq/RWErIgOdaK2bx/HWNTMMhqFxCOJEFC6VlsMewkfgr6BgJuPNh+Bwkppc57
+xdg4SodNnJugwbAzzhkacTnf1UahEkMQz1JWdFtVlvmzQDx+PqkahByZqnA0adVS
+2lhzxHPpH8mfliAjTog0s1mvAgMBAAGjggEiMIIBHjAdBgNVHQ4EFgQU4GQ8FhVe
+KtZIsgxGWdqnefCjrucwHwYDVR0jBBgwFoAU5yyeURqwHQEd5kK0Jxo1k3DAbdcw
+OwYIKwYBBQUHAQEELzAtMCsGCCsGAQUFBzAChh9odHRwOi8vY2Euc3VuZXQuc2Uv
+aW5mcmEvY2EuY3J0MDEGA1UdHwQqMCgwJqAkoCKGIGh0dHA6Ly9jYS5zdW5ldC5z
+ZS9pbmZyYS9jcmwucGVtMCMGA1UdEgQcMBqGGGh0dHA6Ly9jYS5zdW5ldC5zZS9p
+bmZyYTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcD
+ATAaBgNVHREEEzARgg93ZWItZjEuc3VuZXQuc2UwDQYJKoZIhvcNAQELBQADggIB
+ADTn3RRVUivj/cAN07Ri1vHxO6qtIc9/odgQY4vZNAH1QkMO/ZJWknw5kMNsPnaG
+It/zspgSlVpBjIfFwqnrSFQrmneh5PWpP7m1QajJWLtwQtujtXvXcGa9fsuwizcr
+J2HiTFRH0RWPB+brh6r4Y2spxleccv3B9+Dg4hDdbS+f82gbJ959OAD+77kF4PUT
+GF7DpypsuQmmEkDZZF+NS/4hkR1blYUkxqC4otWCalNrPljOfL9PJPkdpkVcVyBG
+5G0CD/X8zkjsHSt6+UoJYT6U3lOc0jVVejhr7bvnv4k4YXJEDLOjPhuF4RljMP4e
+fprC9OXOaWFzE+XYeXIbgd7B/5QhwBaxal2urpXhNIg8eQGvXRdBt/cDqnLFVcN0
+DVbj5WSwPTsK0sIVnwtwQH6qEBuyLrd1rCZLqhex0dBVdNSL8h753TA+mSSQGXj7
+dxygTpGtxCKgWpuwki0ltRf9zHwyUzohLLl99hHos6NYstP63aVthWGZojgNgKJH
+DgNl7/B91q80F5ZHTA+8ajm3A0Z8lKbhGgA3YJrV8OiLKB9XBSQ3qmxJZwTbM76s
+FbkMRsmJXP2nsgP4dnOPm75OcdM+H0lEZyw6u/ndEj0GXtlTv4gtex9/O/m/yBIV
+pghnO57od+5ULt3dPEYEjJ0px0YeVA+E1/nO1dkty/sB
+-----END CERTIFICATE-----