diff options
author | Leif Johansson <leifj@sunet.se> | 2015-03-22 01:12:40 +0100 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2015-03-22 01:12:40 +0100 |
commit | 3a8ee7ace2bdd268d870fed9755fb91f21a10c5b (patch) | |
tree | a633960bce278f587ed5b4a29d54ffc529590d50 /global/overlay/etc/cron.d | |
parent | 73bc205b46926c0b775e484b4f7d8c14611f0b8f (diff) | |
parent | c04894515146e2e762d25abcff275c0d03dfe0c6 (diff) |
Merge branch 'multiverse'
Conflicts:
global/overlay/etc/puppet/cosmos-modules.conf
Diffstat (limited to 'global/overlay/etc/cron.d')
-rw-r--r-- | global/overlay/etc/cron.d/cosmos | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/global/overlay/etc/cron.d/cosmos b/global/overlay/etc/cron.d/cosmos index 70af3a4..4eab8de 100644 --- a/global/overlay/etc/cron.d/cosmos +++ b/global/overlay/etc/cron.d/cosmos @@ -1,4 +1,4 @@ SHELL=/bin/sh PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -*/15 * * * * root test -f /etc/no-automatic-cosmos || (cosmos update ; cosmos apply) +*/15 * * * * root test -f /etc/no-automatic-cosmos || /usr/local/bin/run-cosmos |