summaryrefslogtreecommitdiff
path: root/sto-tug-kvm2.swamid.se
diff options
context:
space:
mode:
authorGijutsu <john@nordu.net>2015-04-07 09:30:17 +0200
committerGijutsu <john@nordu.net>2015-04-07 09:30:17 +0200
commit688e27ff245665ced64e0723237634ef4ba056da (patch)
tree51b5944b6bc39cfa757e17c6a80cd97dbeab632c /sto-tug-kvm2.swamid.se
parent962130c1962af736c58f3e914c3b336f2ea56f7e (diff)
parent13cd385fcf1a51f8335539edf3cb047a221680ad (diff)
Merge branch 'master' of git.nordu.net:sunet-opssunet-ops-2015-04-07-v01
Diffstat (limited to 'sto-tug-kvm2.swamid.se')
-rw-r--r--sto-tug-kvm2.swamid.se/overlay/etc/cron.d/flog_daily9
-rwxr-xr-xsto-tug-kvm2.swamid.se/overlay/usr/local/bin/postgres_backup1
2 files changed, 6 insertions, 4 deletions
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 7f23c66..fab47df 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
@@ -1,6 +1,7 @@
-0 23 * * * root scriptherder --mode wrap --name flog_update_institutions -- curl https://meta.eduroam.se/institution.xml -so /opt/flog/institution.xml
-1 0 * * * root scriptherder --mode wrap --syslog --name flog_db_backup -- /usr/local/bin/postgres_backup
+# m h dom mon dow user command
+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 scriptherder --mode wrap --name flog_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
+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
# Run aggregation and caching for sso data
-20 0 * * * root scriptherder --mode wrap --name flog_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
+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
diff --git a/sto-tug-kvm2.swamid.se/overlay/usr/local/bin/postgres_backup b/sto-tug-kvm2.swamid.se/overlay/usr/local/bin/postgres_backup
index 94bbe93..ebf052c 100755
--- a/sto-tug-kvm2.swamid.se/overlay/usr/local/bin/postgres_backup
+++ b/sto-tug-kvm2.swamid.se/overlay/usr/local/bin/postgres_backup
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
#
# Simplistic postgres backup
#