diff options
author | Leif Johansson <leifj@sunet.se> | 2015-04-01 12:07:53 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-04-01 12:07:53 +0200 |
commit | 219cf87fd6aee7f87ce56661f5c66446be1645d9 (patch) | |
tree | f4104311269bb437c570b47c730a785962ec8b3a | |
parent | 60c658ffa577aa4e14c1ae0b0d79c529ae5dc9e3 (diff) | |
parent | c378fbacef4d4ab364ed677f2008a5854fd74394 (diff) |
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-01-v05
3 files changed, 82 insertions, 0 deletions
diff --git a/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/lundberg.csr b/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/lundberg.csr new file mode 100644 index 0000000..0765c95 --- /dev/null +++ b/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/lundberg.csr @@ -0,0 +1,27 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIIEmzCCAoMCAQAwMDELMAkGA1UEBhMCU0UxDjAMBgNVBAoTBVNVTkVUMREwDwYD +VQQDEwhsdW5kYmVyZzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMCV ++l9UKX3wJmTrngYJ3pYkEf6mwW+S5dtWRveKNh1bBK9DheJ1f5nsJMJbvXx2009+ +rDpBEt+QQxpAnjTUGs7feLAsIlHwvscgroq58zONefx5woR8pD9V/wX6vDT7CAUB +QSrXyQBgetln8FWyNmoTK3J2ldzWqcKvmRaMPm7kMOsALq8ZAQxH5RHnTAY/+Yox +PY01qTPJwnYxLcSPlG+EUfkaCzsrXjaDTZMwo723Tlup9E7knN8OXAzp5rYRaRK8 +R710ZtNOvnjFqBDljUTYcJfRPTJxRYFNd3kJ9gVgLj8FoYjWKu7g//orcO1/mVF3 +g1Amqj670zlvWRbyJVi1EtjVmrVJJYUlkmSb2JqEhgSkhpOhUNw10fafOfdFDaCX +UWx4hKndBSOndHpaB0M7sktx7aIJzY7SRtqOiOzlgzUf8y5RNwPQF6shVSMpxzxc +rxlFiTIcH+7+buBO36TZ2V3pqZvBhwhvl8fFOzS6Q4Wn2Hx2OWjTjbAHnVUwdyTJ +hYv0b0donkNwCtkayxNzQzw7hHldjYnHDbEAKA6LmoPb9pbwTrNUF10NaFn+Kbbv +mWAH1fNvrZQTNSi7Z1aVErvvgLxRaEtDC4aMmiLILQs41eCCTSayZRy7PIZSqwsD +pNcnZhlRZLrc9Dt23czDUSodFkYzNHj5s7FaTkW9AgMBAAGgJjAkBgkqhkiG9w0B +CQ4xFzAVMBMGA1UdEQQMMAqCCGx1bmRiZXJnMA0GCSqGSIb3DQEBCwUAA4ICAQAS +OnUftj3UfYkzqW0FBqZTdquq4GRexeDpQ0uzgsBXJPqvvozcgWSoNf7BlL2N22g6 +NcdXvZMgFCR0BNRoV2nDqlIfF5Ng7lmrjb5iDe0syJzyd5wZr1rZWI8nlY3V+ZHe +hkD1vGHxz1YkEgaH/3KR+9paUkXDm7QGoSZldi6czzZkmIML5MXfAdYU3Ofr0vLO +Ylr3tnup2HC/BnGA+yEGYA2L3qf2qQZmZmKpkGP3omrk32z9jPA4XWXO4XhRlwhe +MepAya5Im/VqcaM12FyygvNy2UPmwLm8HwAGEt+GKnGBlZeF7YHEFik/CTh+vSpV +UW65gA756i6rpbk5Bo2iqgROrE1d9prdDZf5WHFww2nqfjsywvVjsXVT2YkP9TDH +AC9vF/T5j+U0Bv+pCQxLSWmI/7GRd+ilMu8AKBpOLfTTMLntCmzsRjTDlvYwaeEg +Dq9KBP0VOiaDX64AT09FUKeCC66cwwViqTp5AOLvLjvXaqcAsW8t0Kh9y7eEAB2J +MXEnvTHQ93qThOyma0lYh/lqAYPIGZy43tw5tmNKLh0hHNdOoLOTYB6h99XjO70Y +Gg5FI9aJxlMJfBbYlVtSYjhvK+53XLpYdd2+5R9yLWdYlbJgbEyQ6W9CFdMGCeX0 +ByKz1ShijSpph02aYtEka3h9WSONi4TUx1Et7KV2uw== +-----END CERTIFICATE REQUEST----- diff --git a/global/overlay/etc/cosmos/keys/john-D9654A60.pub b/global/overlay/etc/cosmos/keys/john-D9654A60.pub new file mode 100644 index 0000000..a1a15a3 --- /dev/null +++ b/global/overlay/etc/cosmos/keys/john-D9654A60.pub @@ -0,0 +1,49 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBFUILoUBCADpbqMy1CyQi57gh0Bt9vRO1UIJYQYkEK3i2P3+b1oslksf6oE4 +53is1wZNAQkl7791JoZruNT+gR3l0kAgO4bQRlA2SJPQYg4ECwvbnyAXllPxB70T +tLGYzleAwFFPpc5Uksd57eRRiD3PRKMklwG50LIQHf1DBIbFywVN2eATPI52V+xO +tYiTbn5dWQ20TdyshnenmJPdOrDryunWhvIqpXzc0Y/HLWeaBY6ISkc2A5tXY2/c +HZTmE1UAugHIH5OtDYwXFyyblsQUJ4lAt9GdVVS/y4QI1t7C//hUOY4Sqsti+f0D +5YQ4oSjC7+rP6RyniMWzS2XmsKKgHBj/SKiDABEBAAG0MkpvaG4gVmFuIGRlIE1l +dWxlYnJvdWNrIEJyZW5kZ2FyZCA8am9obkBub3JkdS5uZXQ+iQE/BBMBAgApBQJV +CC6FAhsDBQkB4TOABwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQ9aKav9ll +SmD9Iwf/Rm51P+HXHCYq6riVCK2CfkQqhrk2te2q7z6B4P+gWmiJnZyxLTStgdQG +2iHLNsc3FSecFrLbJNFy9qM8TlIzcF5aDMpmB8q9YFGTgqS7oIuD/xdB+LaNAqJ1 +j6mdXtE8T20kI72rEmMXukiwLmAz6iFC3RYHzvaF/7OEQ/fm1EB377QMtdERoWlO +eRdBeHziwa9XkKKkoVOADJeMeydlb5d7UG5gL7Hco+J/cr8FUH5bBsTgJ61TpC8m +RWNRBHfJiHX0oE6M3egUxGKCBsRnVJ6zl3jQAq38br+VZCYzjXL89vVq8l6c19KI +VK5KCNv+3Ys0mMRDXY46cg96poQnjIkBHAQQAQIABgUCVRF7yQAKCRDRvtfekwPF +28y8B/4hjBXi87XGfA+jhVgCGaev6cEvWt/ns3hr1ySwZ4ivOtRELbtLDEzxCIVi +6UWeLYKlCY88xW1fsmMWWgUnEZKIPRb2UOjqE72ofJcC8B7t7SM8/EMIagyVxi38 +x1fg4yMi7I2pkH5WSGzp+tCxar4AO+DI1h0zZOi1W+op+QV1RuwG0pnm6XdcyL9N +gsGu+4QoQUlMkIoqBNyZkEnyK3OEkV6/vpvwso8EgqsGCv/KzozYwGW0S+fJJblm +VR5vC9NIH/patqoWxA+k644VOdYbxm+pSRcD3u9Z1sSGMaf+L8tlgvKIIMhbOy0f +tenj56buoQm0zkdBsE3sANUPK9ySuQENBFUILoUBCADCAUi8g/quouk0MjVBAVYC +K89urRg06G2zt/MSkrDbp1n47vpUZP4Pi24yeT1+XsuscqqKGdtAY6yg8Q7Emzdl +HDHEjdNVBkxin4CUzSrnLfHi1PuN9cIfF8Fvd7KB7BX8oFfMEGW9xCkVOG/IXsum +sVkRfKgfIIb95jl7PoFQZiOkHXAPBuGlCY746XB3Jnh7Ujrr8Ikvb6tTQ5OOKv3p +nrpqNg74YJ/dc2APhmXDSXnOnWI/Y7HgilG4xccLIWN5H2NHr2SsXGbiYIK9HagC +KjbvlPxnjgwtIxMYADkubg2GDGUA27JQ+MaAmpCywjlGGB/55YcUllkFSN2O5lm/ +ABEBAAGJASUEGAECAA8FAlUILoUCGwwFCQHhM4AACgkQ9aKav9llSmDsdQf+M00T +SVr6GCbdYDTN2MZ1tPW509talS3cAPs8DY7tGiC7ZHUEOirPKXk0ImsHsKiLz9j7 +ipYKLg9Kfgfne5UtzVCt+1jFwI9FxUep7vpVTGme2cJ/chau+PltpngoNvuVgtqZ +/Tf8PN3eBrArCjQHu6vF1ruKxDxvD+O6D34jDB5FbH9JJBcO+9H6LyrAbyTcJUHy +2zxKYPRCDi55khmppOdaSbqivPyJNRLk+jtS5Vz7mYI4urQFJKBFwfxkOjxlzbwq +MXlZXoYxPD8JndFW2FY8v7hS0/i2t2gzY7BKAeIu4Kyj2tCKzfYIWLXomRUewjRb ++LOu1Fy8Afe5EIFWVrkBDQRVCDZ8AQgA14hIWY4v5veEW7Vd6OfjI30DQcvbJpgS +nq3IeImabHQ+YGsDfwBq2q90IcbYeOXHAEnYdoAgymhb3CZtvyFbj0TG+j4W0qMx +v56VNZqARanQm1PaIzzjFsKHjKJwyStn/CCViXhEoHEwv8Q1ghET6zH5MMGx5ICn +DxYgFJ1mp8D1o2NbVEMl+K4Vg1UP2uj4JMkhM2mPCGiFHSvLJ4FXpNwiKNOP8aPR +4Iu6y7VbCaCVadsEzGLix6TYrG6TNJ8GQLXasptTbQE6ju8KKXSR91ex7AI8bJtu +7wzV7QLHr8M+vCOyPnFKtHa3RSLNfVfSkIuhNQ40Z36z/TNOMmGAvQARAQABiQEl +BBgBAgAPBQJVCDZ8AhsgBQkB4TOAAAoJEPWimr/ZZUpgWHUH/iAgjSi0dlpB/bA2 +MMqPUAt0tEL5rXS8dRpo7rqJknbEPquLoCQBpB6QIltOJkeTqji56rOFd83nAcBJ +5izPxmcAPAZqLdpwhUHF8uPdchHIO4giPISW8pS5sMZWPQxl0xD7v9ICkHRHAj5w +Xj4l5Bgw8WF7mTeopj4wry9mWaHiailKGY2YpYngqciZpNDtjEww0ozeQQHdZ5yo +InRpf0qHhpHUTNqdGzdxR6TBuP0U521OnlFu76B/zQLnSKTFxI6p1g1FkX/6d9RO +BF7cGCvP6uN1/IoNXF7W3oY4aNBeXvGmYSWmaN8FrOdbFCecxHjm3WxGLI7gVqHc +g9VZQNI= +=7NYp +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily b/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily new file mode 100644 index 0000000..2bfb1c9 --- /dev/null +++ b/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily @@ -0,0 +1,6 @@ +0 23 * * * root scriptherder --mode wrap --name update_institutions -- curl https://meta.eduroam.se/institution.xml -so /opt/flog/institution.xml +#1 0 * * * postgres /usr/bin/pg_dumpall | /bin/gzip > /var/postgresbackup/postgres-dumpall-flogdb.gz +# Run aggregation and caching for eduroam data +10 0 * * * root scriptherder --mode wrap --name daily_eduroam -- docker run --rm -v /opt/flog/dotenv:/opt/flog/.env -v /var/log/flog_cron/:/opt/flog/logs/ -v /opt/flog/institution.xml:/opt/flog/institution.xml -v /opt/flog/dotenv:/opt/flog/.env -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro --link flog_db:flog_db.docker docker.sunet.se/flog/flog_app /bin/sh -e /usr/local/bin/daily_eduroam +# Run aggregation and caching for sso data +10 0 * * * root scriptherder --mode wrap --name daily_sso -- docker run --rm -v /opt/flog/dotenv:/opt/flog/.env -v /var/log/flog_cron/:/opt/flog/logs/ -v /opt/flog/dotenv:/opt/flog/.env -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro --link flog_db:flog_db.docker docker.sunet.se/flog/flog_app /bin/sh -e /usr/local/bin/daily_sso |