diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-07-28 16:18:22 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-07-28 16:18:22 +0200 |
| commit | 47a968085005c10feb2bbb7cd05610a4ae33cb77 (patch) | |
| tree | 72c7c9f216294cb0eb4efcd39f39bfe9b0fa8806 /global/post-tasks.d | |
| parent | eb35f2b362452dab12ffc67c7aa2e81755b1e222 (diff) | |
Update global/pre-tasks.d/ and global/post-tasks.d/ from nunoc-ops.
Diffstat (limited to 'global/post-tasks.d')
| -rwxr-xr-x | global/post-tasks.d/020reports | 4 | ||||
| -rwxr-xr-x | global/post-tasks.d/030puppet | 4 | ||||
| -rwxr-xr-x | global/post-tasks.d/099autoremove | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/global/post-tasks.d/020reports b/global/post-tasks.d/020reports index 091a236..380f31a 100755 --- a/global/post-tasks.d/020reports +++ b/global/post-tasks.d/020reports @@ -1,4 +1,4 @@ #!/bin/sh -rm -f /var/run/facts.json -facter -p -y > /var/run/facts.yaml +#rm -f /var/run/facts.json +#facter -p -y > /var/run/facts.yaml diff --git a/global/post-tasks.d/030puppet b/global/post-tasks.d/030puppet index b94b9ff..6742949 100755 --- a/global/post-tasks.d/030puppet +++ b/global/post-tasks.d/030puppet @@ -1,13 +1,13 @@ #!/bin/sh if [ "x$COSMOS_VERBOSE" = "xy" ]; then - args="--verbose --show_diff" + args="--verbose" else args="--logdest=syslog" fi if [ -f /usr/bin/puppet -a -d /etc/puppet/manifests ]; then for m in `find /etc/puppet/manifests -name \*.pp`; do - puppet apply $args $m + puppet apply $args < $m done fi diff --git a/global/post-tasks.d/099autoremove b/global/post-tasks.d/099autoremove index 74b0aa4..2cc6996 100755 --- a/global/post-tasks.d/099autoremove +++ b/global/post-tasks.d/099autoremove @@ -1,6 +1,4 @@ #!/bin/sh -if (( $RANDOM % 20 == 0)); then - apt-get -qq update - apt-get -qq -y autoremove -fi +apt-get -qq update +apt-get -qq -y autoremove |