bbe3fe8f72
- Update patches
- Modified:
* run-salt-master-as-dedicated-salt-user.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-cp.push-empty-file.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* move-log_file-option-to-changeable-defaults.patch
* activate-all-beacons-sources-config-pillar-grains.patch
* remove-obsolete-unicode-handling-in-pkg.info_install.patch
- Removed:
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
-------------------------------------------------------------------
- Update cp.push patch
- Modified:
* fix-cp.push-empty-file.patch
* salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- force re-generate a new thin.tgz when an update gets installed
- fix salt-ssh with a different patch
- remove: dumps-should-return-unicode-also-with-py2-to-prevent.patch
- added: salt-ssh-fix-json-load-of-return-data-when-it-contai.patch
- Added:
OBS-URL: https://build.opensuse.org/request/show/586784
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=115
27 lines
926 B
Diff
27 lines
926 B
Diff
From 5dfc5ebd799d5c9a4588d9e1a27b813b8c35ce25 Mon Sep 17 00:00:00 2001
|
|
From: Hubert Mantel <mantel@suse.de>
|
|
Date: Mon, 27 Nov 2017 13:55:13 +0100
|
|
Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58)
|
|
|
|
---
|
|
pkg/suse/salt-minion | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pkg/suse/salt-minion b/pkg/suse/salt-minion
|
|
index 2e418094ed..73a91ebd62 100755
|
|
--- a/pkg/suse/salt-minion
|
|
+++ b/pkg/suse/salt-minion
|
|
@@ -55,7 +55,7 @@ WATCHDOG_CRON="/etc/cron.d/salt-minion"
|
|
|
|
set_watchdog() {
|
|
if [ ! -f $WATCHDOG_CRON ]; then
|
|
- echo -e '* * * * * root /usr/bin/salt-daemon-watcher --with-init\n' > $WATCHDOG_CRON
|
|
+ echo -e '-* * * * * root /usr/bin/salt-daemon-watcher --with-init\n' > $WATCHDOG_CRON
|
|
# Kick the watcher for 1 minute immediately, because cron will wake up only afterwards
|
|
/usr/bin/salt-daemon-watcher --with-init & disown
|
|
fi
|
|
--
|
|
2.16.2
|
|
|
|
|