diff options
3 files changed, 1 insertions, 47 deletions
diff --git a/global/overlay/etc/puppet/modules/sunet/manifests/flog.pp b/global/overlay/etc/puppet/modules/sunet/manifests/flog.pp index b368b45..553e83b 100644 --- a/global/overlay/etc/puppet/modules/sunet/manifests/flog.pp +++ b/global/overlay/etc/puppet/modules/sunet/manifests/flog.pp @@ -65,7 +65,7 @@ class sunet::flog { } -> sunet::docker_run {'flog_db': image => 'docker.sunet.se/flog/postgresql-9.3', - volumes => ['/opt/flog/postgres/ssl:/etc/ssl', '/var/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'], + volumes => ['/etc/ssl:/etc/ssl', '/var/docker/postgresql_data/:/var/lib/postgresql/','/var/log/flog_db/:/var/log/postgresql/'], } -> sunet::docker_run {'flog_app': image => 'docker.sunet.se/flog/flog_app', diff --git a/sto-tug-kvm2.swamid.se/overlay/opt/flog/postgres/ssl/certs/ssl-cert-snakeoil.pem b/sto-tug-kvm2.swamid.se/overlay/opt/flog/postgres/ssl/certs/ssl-cert-snakeoil.pem deleted file mode 100644 index 1e51120..0000000 --- a/sto-tug-kvm2.swamid.se/overlay/opt/flog/postgres/ssl/certs/ssl-cert-snakeoil.pem +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIC0jCCAbqgAwIBAgIJAPWiRS1801VVMA0GCSqGSIb3DQEBCwUAMCExHzAdBgNV -BAMTFnN0by10dWcta3ZtMi5zd2FtaWQuc2UwHhcNMTQxMDIyMTI1NTQzWhcNMjQx -MDE5MTI1NTQzWjAhMR8wHQYDVQQDExZzdG8tdHVnLWt2bTIuc3dhbWlkLnNlMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0AeuSvXfxZEDnhqPAnPb1CA5 -ijzHYKCAV8tPbrwzJDHCDd2bPhRSfnUMAg12DmHvaqFLekk0kuYRPETVVpPxk4ss -NZgh/3CqShd3UnMjoAUFT+sq7c7OqbLD9bWY8EbgEid1ph2t+nAxXNoRVQd2azvP -llbwBmKrW15WDFPVnv/zyRs85xviaQgmmowMVVjPNcxw2oMpeJTtpSm15RQ0x6Kk -p9cUILj7p7ls82uOutJgYL6MhGytqdtgoWu6sEoYc3Sck/scZJnBMwecvkKC8Zvj -qk/JvIsGsme7Akp8bK0tJ7Pts9mtTaSqwqHsyCrY6lZE8wKmJ7bUX70yE9eTCwID -AQABow0wCzAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBCwUAA4IBAQBXJPEZGI5EXNBf -NwO1jT9Mvxfjs27Cw72nO6PR+ZdGdludQH8NDuEK8FudAdenk4r40KTqsxlezr+y -Wn0JMe92IUvag7T/RNPNXu0IieNRvNTMwsNfZJnymqReEnoHYB0f8U/rX+vshKwP -5D7pdCaXspzXr3rJ+ZNw6YBxqgeprCcln8NSi2gtnA/PGTyzpPRmlFpRvBy+PC/I -fBejYOcgrc1i7v1MYC85OnMLzIGsxsnQIJjtjK8iY9BDyhQ1S+Jwu17vWJ2ZWGlk -NQUnSqJw447ooQUKLrpkx7brwSLMDPDO9hO7/b2L/VsfGlGiaXBhUEYF3GAnOwZJ -QslpyIrc ------END CERTIFICATE----- diff --git a/sto-tug-kvm2.swamid.se/overlay/opt/flog/postgres/ssl/private/ssl-cert-snakeoil.key b/sto-tug-kvm2.swamid.se/overlay/opt/flog/postgres/ssl/private/ssl-cert-snakeoil.key deleted file mode 100644 index 3e0d431..0000000 --- a/sto-tug-kvm2.swamid.se/overlay/opt/flog/postgres/ssl/private/ssl-cert-snakeoil.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDQB65K9d/FkQOe -Go8Cc9vUIDmKPMdgoIBXy09uvDMkMcIN3Zs+FFJ+dQwCDXYOYe9qoUt6STSS5hE8 -RNVWk/GTiyw1mCH/cKpKF3dScyOgBQVP6yrtzs6pssP1tZjwRuASJ3WmHa36cDFc -2hFVB3ZrO8+WVvAGYqtbXlYMU9We//PJGzznG+JpCCaajAxVWM81zHDagyl4lO2l -KbXlFDTHoqSn1xQguPunuWzza4660mBgvoyEbK2p22Cha7qwShhzdJyT+xxkmcEz -B5y+QoLxm+OqT8m8iwayZ7sCSnxsrS0ns+2z2a1NpKrCoezIKtjqVkTzAqYnttRf -vTIT15MLAgMBAAECggEAWs7/hjlONS/YJGvzgV6R10c51t4xKjzlyW02f2An8uTF -kMfrvG2ilREC7OJzZlPZ7vH5wKe0C2vimixx9BkgmwdlhP+j152WuEEGFTetlWyb -pQdC9gwQqoMeh2N+H2TQ6xvOf3T1PR08bwvCBRv81VKGi1nn7OGla30Ckt8FoSHP -cTEYsLQhn6XyFPYZvtSgoaxA8kEGBICD/LMpkqQ2w8QDiqD0LJ6Dhiu4AAZTjksK -CXc/qek35ldAYB76f/02YRMJCDwW7h3abmkHv7FMDHk9K4APxWYxWlUIWc4C4O1Q -fMesGNIqpFXlTSj4g3bdVue0R/rwvdz9RLS2gyv8AQKBgQD5lmQumMzH3JpTnIg5 -VNGHxOI1OtqO32H/gdlPkWZTfD6dhitM2NfdXlntaSZ4EwoyDu6Iq/a9T32jUHnL -iV3Fn59a1bQcYsl/g/Q4P78XbRIjRFU602JdQGVJeeAB5h/v/xrhcr/fyRAsk1gD -/N6VR20TkoO6YvkRH7xpv8/HSQKBgQDVX/Q/QZg/BlkMTvrQz27xnzBdtoycRGE+ -V4J0l7U9txs6i0uTCwFU8C5DA7LffbNYhDMC+eJzXRgYdCwcsQUJP/2KzkRuKW4/ -SIe9eNk4kRcfti63hiubshh3/HmvXgftv5OHGHRCb2KUx4BEB5S0Vh9/+9l5SqG+ -XejFiY5jswKBgHoG55BIsMZ+uw1qGMg/Cfqhbh+sWLNF0DoGGGNoqWjj9BE8SetW -kaPvv3Pt1xsZ5AA5gLJdsVM5jCnO7N1wmeJHergEh/zg57dqonrl393qO9X2UN1k -AFGrbFoSNk13X+INDe1wFxOo0DmbCItalNDTjSbmmXUFctTGeW4Sk9nRAoGBAL/q -eENU+lzllr5tY0bg7EbDCbugb8Q19Mkf6KR5t3h08zarBySQp3gAN3vrHb3Kz77z -2PX6T+W3e+6yvuJnjcIOHjv03rO+6/xbfku7IJWyWnwZXtePBDYb78or+j7zcmoy -/7xpEFiY2rA66HFH6EZzmA2DNs3ThLs2uCDEYp/lAoGBALEgYoAlUWK5zeV2zrLa -vWdvubphN76ljVX23vW8cx5S07w3QeIqLZR4C1BH+9/ibbxGks69dDHg7y7EKe6S -6lkhRjhMCvN2jg0tMBU7skPmLs75wN98qC3TqK8uu+gdSPsctG5w1QIS77p+5lCg -7x5NyDVPI+bX7MadeANul/8c ------END PRIVATE KEY----- |