Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-09-v01

3 files changed, 77 insertions, 2 deletions

diff --git a/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/john.csr b/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/john.csr
new file mode 100644
index 0000000..3967d18
--- /dev/null
+++ b/ca.sunet.se/overlay/var/lib/ca/infra/requests/client/john.csr
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIEkzCCAnsCAQAwLDELMAkGA1UEBhMCU0UxDjAMBgNVBAoTBVNVTkVUMQ0wCwYD
+VQQDEwRqb2huMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1tkWaTLZ
+nGJiaRxhx9lml0kqaASkNxqMekwuWyBD+oe8peQ3SimSJQ8C5pqR02ivHyi1VHCI
+J5SK0kaVY9FmbaKNVS0OhAm9f8ppIv5ZXynsUkje63AUX7nh0oqJuKBhMdEUExxo
+VKvmmMivVMl5Z1jr7B1NtdD67aHrrlisOWFCNcR7KwMzoAb/xe0DjQdKUOYGmR7v
+alwSMJUc6bgDxMwLN0uYHHkLAHIP4m3NX5sv1M0WykFL1eNzTJBY9eethXnoJQej
+GezM6kveoNl8xfxkdkaCi6TvBcs+5z2qVCeYD2iAXEkO+DWRNX/CwIDZSOPbLx5l
+FYHzWBAQnexCf2OtvbvHDwPoAEeP/92jiaLW5JMLJrwDq/S8FT581fBrfy22U0s8
+LT7WMNLMmS47epDo6hx1PfLvBVFgiigvK9Ql4mg0qOCIGieFwkUpUhDmrFhurNVu
+b7wXxmrlaC0oM3aKXhjQYs0WjvZBvlII6NWXZOwOYSiRKQYVIC70dgchl7TsYakN
+luo0kiIcwIvXwiwO42sVMb8PQBJfw9eCLDdKyCeQKWNvAQp5jYzS8jS5/kPOvntG
+R8TOPSoZR3CAT3ZBkbXY7Hy+0pE61VaFaPRj3L1dqg6x7jhSWliGqT8DXK8+mDjg
+M87wmb8GMbljR7+/fC7TcDv+TP/aUpVRG/ECAwEAAaAiMCAGCSqGSIb3DQEJDjET
+MBEwDwYDVR0RBAgwBoIEam9objANBgkqhkiG9w0BAQsFAAOCAgEAnDtlemQNrbDN
+bdygeNrKywiYhTGMjLR5Ad3hJ5hZtKnwRWSo0hEY5waGNdvokgz8ssPEQVnbczMD
+3I4tUK6Sh+AAPn71Son2AdY53gQ85/Mhr9S3fC+KMo+IDg9SYoRDE8F5LALkJLA/
+LAUIK+2B3aScPxGC6Y3I9RWzDbQKCQQZLhWsyXWgQyPU97UjQNRVd+8XZKHIlHpp
+cHpdkGNcwTyAfCxB0F9pyOwIj84ooQMw6Sch0tw0kyqiRWfdfW0C3+AZP3RK5yC1
+nxeKxAWcAgtNqSI0+CG7wGV6iaP1el6wy7oYxn/woqbOQpAec3TFO2ZvudBvKaCO
+VIA3+V1LtXBjlv4K5S3/hjaKBg+t+T0hEIYma8hg6I9A1J+Z72C/PpSYtcLkMhbX
+0e4jz/jAH8YY6qargShSOQYJl+NTevWpBQ5hKs0VIoqK9Le5pxmyoMpA2y3W0l7f
++0O4zU2PV8hFxoufHMDX5pRG98hpGWfK5ZdR9fUCm0mWMBOmYc0BeCphlJFNwwDG
+lNPPftZs8acngntphzVQj4EZiG6clkQNvORshS8fC/MnVLGWwlNvYhG4heT7lJb5
+uJGDXnaZpnk87JpzKjtvfgqajhLEFW8cFeUuS+9Wma+NDR17+uvdRpcXtDni2pN6
+nwAhtf+gL1dBbAu7p79iyJFH5fQmaqs=
+-----END CERTIFICATE REQUEST-----
diff --git a/global/overlay/etc/cosmos/keys/linus-F64A60A0.pub b/global/overlay/etc/cosmos/keys/linus-F64A60A0.pub
new file mode 100644
index 0000000..c5e0659
--- /dev/null
+++ b/global/overlay/etc/cosmos/keys/linus-F64A60A0.pub
@@ -0,0 +1,48 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+mQENBFUk8BABCACMS5F5mX3Si8JhxmXURtDAp45uehgY3Pwiqfb/Ax2a2BJoVfbU
+hnbjGIs8z2M+BKaVNg+XyiyKf4DZVvHxSSB3V1Z4QzhLz02xn5SGVpK3cLBv8cFf
+253u3Ua6TrueRVvsTXrXFgsrP4fALy8FhNy02tY3Dc2VXSPtfT/41On8L+N+Hx5d
+F/DmJx2nEuH4vndAD8luOJjgzIiqibqXl41lOok5Y0gV3bnnRhgq0WG4+A2VufrQ
+unUAc62mE5V88xdRcu8i/Jn7BUHrReFzWovn5BjjSwLj/9Czk24Gd/ZWtX03+flX
+qs198O8zvXa7+iwNEbnItZ+w63lTfDvPmNpJABEBAAG0JmxpbnVzIChTVU5FVCBo
+dyBrZXkpIDxsaW51c0Bub3JkdS5uZXQ+iQE3BBMBCAAhBQJVJPAQAhsDBQsJCAcD
+BRUKCQgLBRYCAwEAAh4BAheAAAoJEIzlLJv2SmCgLEwH/09L5b9Eeq1xuj1I7UOQ
+WUp/hlz6IpZSjLizKd34/2Qb+BP+hOMy5fVoFl1acABxcosPGEkr5eCX2vl0DxNE
+7WM7KxFp79/Zk6CeDqWc2TyqKJAFurryhstwBrBZnJXNs6CqWpD95d574eW+eSPp
+66t0UMCUsn8wo/4fDwF+ZqjPou6LLXW363MUO//YNcC7B+92UxTDEN1Mh+3BNnyj
+kVvb0laz044UHIperl5czZfgyOIGIrWoLH6OAHizxxKijTx2lLkNfvUIeJP6sJHh
+FRxzFokhTL2GQ2VAnCqIwYYJ7NCcdnRD5PXdGthU8yt9HJxGULUnSes8rOZfONIL
+Q5aJARwEEAEKAAYFAlUlEdUACgkQGYwa/VBRUt1aUwgAq8+Cc1jYFp9rgIiZwge0
+wUyE9TUnpbrcH7jBL/duv2BJZEedJj0yBKIcpFBAFHypPFk2IsnMzRo4YnLYGgCE
+lMPAPqxL+Ss1Jb2Umu3Bd6KjBu+5qAmgcD72pIXq3vuMe8VA8etL7ns9+YoDk9sK
+OUTse8dJIYrgQ9hErAvYZIAYTfG48/QqLMSU8zzPVVrKhTbxLthN1L69EAKSrV1q
+xQHbDFvQjTGBBcivV7grX/wMBctM2u3Pd2fO950m4c1T9pV5UzdrFHBWKjAVA06Q
+pZVkyFONX2/EMzqiLWpwz3pXe6wu54HZvNX8jcE6xj3aGL7Uw+nJlAQJ0KVZUg+g
+krkBDQRVJPAQAQgAiF+v4upHVKBsmwGtb4fgUh8VLaQ2fZ/t0uwY+hdvd+J76rbx
+udm5qo7m/19g4pM+2HZs5CVX7s37/AGFpUUIGnnB0Jdxg4h2DzSgxHTNNhJZOtjP
+mJubLrYfak04lD0we5AfUOHuvQtcuXDePUch3wtY0H6DObRbgyPx5uU2m97/Hcd2
+Vd+DYL5puPBls0tx9eu0Sit3xMj6r/rJUOoF2zfGdoZDUMgpC4iDj3bkZOurGUt0
+r4TmsbWaVTY9uEas7OsJLgfso37OkCjFj2f+F8DpC0EfrEY+LS4aVLGFeXO6Oryb
+Kz9u4YrComD98QjEnumiBmUwz2zoSe7VjT0MNQARAQABiQEfBBgBCAAJBQJVJPAQ
+AhsgAAoJEIzlLJv2SmCgpCoH/2Rv7rqRkFwbRf9u2VJ5e5vCybkrJCRKY5d4atCY
+R1MJL2FEn9wv4otW3PMgIZy6Bfd3YhqJ9X+h16vFeyqCcR4utB7mSq0qxRgLg3xu
+Gk8wIbG0kIpbAHC5KTNPu5lemitCOJ2GTFbDcQRFT7GlU4fbK0vvHUBkf41E8veO
+vBZayfapL2lpnfXt9aUUc6P5i9bQ7u7Ns5sClITAtZTfoqPMinOlV59L3wP9UP0O
+YWKcswQm34EA6w1pFVnpWg1TGlqEVWJdn0TxFVl9Bq8c8XMfLbt1Z2N8CGpZJuYE
+dfYCHnT7eRssRuIDUARPYxeLLuvQf48WYTZabuTqH9TLp8K5AQ0EVSTwEAEIAIVi
+s5xBlKcBuWXkmE+r+l1mEFb5Eul1xtoa5UP28jBiRXlQfAU24JshDBXLvbeAcnqq
+fZtGMToE87xVE6BZ9fkYN9v8kAHYqunwLi44dtD6tEKPIwjvb+oDQuhBMbN/Jsf7
+oSMQQGGmx+6SW66d2EC8T0bpixESq4j6wZqAMTp1f5S0mNA0K7w9GvribT0uKSch
+1uDX2+bATQI3ldoPygS+xZtP8dkk2oGsdezfNyvTb+umRziJon6vnIjiyizwcl1u
+Y9mLU6e8gRpl302wAk8y+menjz6QiR0bWpFtYcjtf/+2mgJenAVLjk5rCDqqRnc4
+uAPe6ZMPX4H7NOLuTBkAEQEAAYkBHwQYAQgACQUCVSTwEAIbDAAKCRCM5Syb9kpg
+oO4kCACA3bxjBrWwM/K7yyAG1ZVYN1bkeQ6eCURRJfagLAFzjOPxTDysjBb5LfwX
+tmpSEBSdCZDMldUHTcTSoIW9rTTdV7CBvNh9E/zJu+TRJW5nmrSXkXjKwYeWmayJ
+lk2OnllVo95GqZmm9ok949e23C3vFialai+JuxAG4Afi73DvEEKsatOGhnZjzdB8
+IpO6cBOwSm1J999t6YnGeRD0QSsD5XBWkTmw9vkIWUFG9oQ6kgAGJoBRP11mJwIC
+jWvcNE2VJRNNXwTAjxVdEoC/QOCfZxW4ZCATDyerbJ1Naj/JpbFcEQto4kkoG0Tc
+2rVz+RwZV2Pb+TMAXEs6xig5kJpC
+=Fmc2
+-----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
index fab47df..0759dca 100644
--- a/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily
+++ b/sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily
@@ -2,6 +2,6 @@
 0 23 * * * root     /usr/local/bin/scriptherder --mode wrap --name flog_update_institutions -- /usr/bin/curl https://meta.eduroam.se/institution.xml -so /opt/flog/institution.xml
 1 0  * * * root     /usr/local/bin/scriptherder --mode wrap --syslog --name flog_db_backup -- /usr/local/bin/postgres_backup
 # Run aggregation and caching for eduroam data
-20 0 * * * root     /usr/local/bin/scriptherder --mode wrap --name flog_daily_eduroam -- /usr/bin/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
+20 0 * * * root     /usr/local/bin/scriptherder --mode wrap --name flog_daily_eduroam -- /usr/bin/docker run --rm -it -a stdout -a stderr -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
-25 0 * * * root     /usr/local/bin/scriptherder --mode wrap --name flog_daily_sso -- /usr/bin/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
+25 0 * * * root     /usr/local/bin/scriptherder --mode wrap --name flog_daily_sso -- /usr/bin/docker run --rm -it -a stdout -a stderr -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