aeed45986b
- Update to 2018.3.0
- Modified:
* explore-module.run-response-to-catch-the-result-in-d.patch
* add-saltssh-multi-version-support-across-python-inte.patch
* run-salt-api-as-user-salt-bsc-1064520.patch
* fix-openscap-push.patch
* fix-decrease-loglevel-when-unable-to-resolve-addr.patch
* fix-cp.push-empty-file.patch
* make-it-possible-to-use-login-pull-and-push-from-mod.patch
* avoid-excessive-syslogging-by-watchdog-cronjob-58.patch
* feat-add-grain-for-all-fqdns.patch
* fix-bsc-1065792.patch
* run-salt-master-as-dedicated-salt-user.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
- Add python-2.6 support to salt-ssh
- Modified:
* add-saltssh-multi-version-support-across-python-inte.patch
- Update salt-ssh multiversion patch
- Modified:
* add-saltssh-multi-version-support-across-python-inte.patch
- Removed:
* require-same-major-version-while-minor-is-allowed-to.patch
OBS-URL: https://build.opensuse.org/request/show/594031
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=117
27 lines
926 B
Diff
27 lines
926 B
Diff
From edb1c95fa06b8bb1d7e6d91beaaddec6d22c966b 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
|
|
|
|
|