summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2015-04-17 00:55:24 +0200
committerLeif Johansson <leifj@sunet.se>2015-04-17 00:55:24 +0200
commiteb06e3007ad406e5b79907513f13bd6a2a075f1f (patch)
tree686edbb168c082f781c32d162964abc376921248
parent2fd221bd8ab2f2d0b7353b1b2d90bac1816a086d (diff)
-rw-r--r--global/overlay/etc/puppet/manifests/cosmos-site.pp1
-rw-r--r--global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp1
-rw-r--r--web-a1.sunet.se/overlay/etc/ssl/certs/web-a1.sunet.se_infra.crt35
-rw-r--r--web-a2.sunet.se/overlay/etc/ssl/certs/web-a2.sunet.se_infra.crt35
4 files changed, 71 insertions, 1 deletions
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 21aca81..2d60c60 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -826,6 +826,7 @@ class quantis {
}
class webcommon {
+ file {"/data": ensure => directory }
}
class webfrontend {
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
index 8daef2e..196b7fe 100644
--- a/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
+++ b/global/overlay/etc/puppet/modules/sunet/manifests/wordpress.pp
@@ -10,7 +10,6 @@ $myqsl_version = "5.7")
default => $db_host
}
$pwd = hiera("${name}_db_password",'NOT_SET_IN_HIERA')
- file {"/data": ensure => directory } ->
file {"/data/${name}": ensure => directory } ->
file {"/data/${name}/html": ensure => directory } ->
sunet::docker_run { "${name}_wordpress":
diff --git a/web-a1.sunet.se/overlay/etc/ssl/certs/web-a1.sunet.se_infra.crt b/web-a1.sunet.se/overlay/etc/ssl/certs/web-a1.sunet.se_infra.crt
new file mode 100644
index 0000000..4066236
--- /dev/null
+++ b/web-a1.sunet.se/overlay/etc/ssl/certs/web-a1.sunet.se_infra.crt
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+MIIGHTCCBAWgAwIBAgIJAL9FQ4sMNbylMA0GCSqGSIb3DQEBCwUAMD8xIDAeBgNV
+BAMTF1NVTkVUIEluZnJhc3RydWN0dXJlIENBMQ4wDAYDVQQKEwVTVU5FVDELMAkG
+A1UEBhMCU0UwHhcNMTUwNDE0MTA1MDAxWhcNMTUwNTE0MTA1MDAxWjA3MQswCQYD
+VQQGEwJTRTEOMAwGA1UEChMFU1VORVQxGDAWBgNVBAMTD3dlYi1hMS5zdW5ldC5z
+ZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANq6TNx7L0JsDNraJynR
+hOTa4JIomMihbed/TLI/d3UMIZaVhNx7QfVfX6M9zTOhX2/nlaLgmBqU2GrTta2y
+9sB/AedIXwoym1Mind0aLQZpdNBuzFmAFDdwVGLbDSwfxOFw+TUarDZZkI4MU7cf
+9Ur7BaoXfpkjh6h9VKCAsgYxtXrx/ab1no2sQfiF7guM+Pk9RAJKkUgiRpOzGbUx
+6E5Pm6aEP0Do4eZI0MU4w6g9fj5Y/T4+TzI5EqHOiyeCUD81/wclriVCGmF//Dmy
+zbOmMGhJVeLgLMbwXQ9ypLM5JayZrNhOD6PrIl+JQuONgaBPOuDRUnQhHfXKDBix
+xlPfX5TdhT6cwIKtgQ55mj6BbNzOauENSTfT5ySU4Y0xQheJZnWLkbuorSUbOIUr
+DJQOggSyQCx4CaUroNx9dP9zpklmHj8jMgY6xCYjyjDVpGlwv2c9q16D6Q/XydBR
+mH6G3bjPRVE0Vt4yhFh3fK8/PUkoZXr2MYL9G3PNjbCeLPA0dLY9/n0P+KVdPviu
+raLZFMdri1SBMC2cMPyGbMRK5X8DL36xW7HS5Ijnle4fEvwu8Suar0yG5XSWPDCM
+xATbqmUo1WvQ7Ji1H8Bo2dV5yEzwsl9K+iqbPKDALaXZtHrefVqmBE8FwYx0kH/B
+P2wUCfQcUdkzRtVGn2Z6tQtBAgMBAAGjggEiMIIBHjAdBgNVHQ4EFgQU9H+BhwwQ
+zEhGUruehLQzpwrBEYEwHwYDVR0jBBgwFoAU5yyeURqwHQEd5kK0Jxo1k3DAbdcw
+OwYIKwYBBQUHAQEELzAtMCsGCCsGAQUFBzAChh9odHRwOi8vY2Euc3VuZXQuc2Uv
+aW5mcmEvY2EuY3J0MDEGA1UdHwQqMCgwJqAkoCKGIGh0dHA6Ly9jYS5zdW5ldC5z
+ZS9pbmZyYS9jcmwucGVtMCMGA1UdEgQcMBqGGGh0dHA6Ly9jYS5zdW5ldC5zZS9p
+bmZyYTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DATBgNVHSUEDDAKBggrBgEFBQcD
+ATAaBgNVHREEEzARgg93ZWItYTEuc3VuZXQuc2UwDQYJKoZIhvcNAQELBQADggIB
+AFJ+FnDa1pHKcQ6wYK2bfKQzxSHChTY6dnQs8S8N2O+Up8xapM8CZV9tBrSH22j4
+bRwXpkhDPVFLo+rqgoQdIcbC37XiEhOHjc8TVay+drvzpnG9Rr174lbFK5IfzSmW
+bwARXwphbx5wDBlEQa/gg/uFChRjdZ47OHu1LNXzCZXcyX3XDvgHoNvQI1ne2uZ4
+GuMKwe1LZaFgksSG+zjmi62QSyX/WeLQUIdesDbOwCGiPgU/y9D+efMta7+pWj+B
+M9YP0lvpGGSNXLoqF8b+CO51Bx39Ng/TKlbV+uFzC3xUmz3Px7hlnvQo3T5H1Y9d
+Mm2HlLbd7MEb8WSIvBQRG4A8NBzCbgYuzwBwvssSu+zqj6Ge7Ge++20rbleyeXbu
+yvcdQ9ybllwin0GjznrJr290ppadVSdEa5WPq0IHYuu+WMFwLnn9wZ2hQx9dQBuZ
+1Ug7OAacKxkdqkqvqgDAedaoFgG/l6XDxV5NYb9OEuwmhWL7lnxA/6KmyQjb2l5b
+bfvTkb7uN6F/Kq2Q3/B1GWeU9bORx3oaml0r9m5PSIBrrsrQyhe3V0c1ATxT87Ru
+Coa1OK1Ru2mEcBeSgmWDma7gPiUqH5ylgfhP/IhdT+WCh2MfE4To1m5cU83LrBXJ
+K6XsN1n0DOJcvfiB9yXjTvTu4GFbOLfL32Fh+BQYL0kj
+-----END CERTIFICATE-----
diff --git a/web-a2.sunet.se/overlay/etc/ssl/certs/web-a2.sunet.se_infra.crt b/web-a2.sunet.se/overlay/etc/ssl/certs/web-a2.sunet.se_infra.crt
new file mode 100644
index 0000000..90eebbd
--- /dev/null
+++ b/web-a2.sunet.se/overlay/etc/ssl/certs/web-a2.sunet.se_infra.crt
@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----