Jorge Schrauwen
71e08ab599
Set correct api_service for SmartOS
On SmartOS the salt-api daemon is started by the salt:api service.
7 years ago
Niels Abspoel
31e2d95203
Merge pull request #339 from dafyddj/win-restart
Fix Windows minion restart command
7 years ago
Niels Abspoel
d01083f347
Merge pull request #345 from Angelo-Verona/master
Changed pillar example formatting for Slack
7 years ago
Angelo Verona
c8e86c5d76
Changed formating in pillar example to avoid warning about wrong dictionary format from Salt. Added comment about type of token.
7 years ago
Niels Abspoel
24998a4a0b
Merge pull request #332 from mchugh19/indenting
peer run space and jason to yaml
7 years ago
Theo Chatzimichos
fa657a850e
add also default git values for SUSE osfamily ( #344 )
they get overwritten from defaults.yaml if not specified
7 years ago
Theo Chatzimichos
3fd9b0964d
add default values for SUSE osfamily ( #343 )
7 years ago
Dafydd Jones
d987901db2
fix windows minion restart command
7 years ago
Alexandre Gomes
01564c3753
Change cmd.wait to cmd.run ( #336 )
Changing cmd.wait to cmd.run as recomended on the documentation: https://docs.saltstack.com/en/latest/ref/states/all/salt.states.cmd.html#salt.states.cmd.wait
7 years ago
Andrew Ernst
9ef5335f7b
Update f_defaults.conf to support elasticsearch returner ( #335 )
Proposed pull request for elasticsearch returner in the minion.d/f_defaults.conf file
7 years ago
Niels Abspoel
b615ca077a
Merge pull request #333 from EvaSDK/gentoo-pyinotify
Add pyinotify entry for Gentoo, refs #331
7 years ago
Gilles Dartiguelongue
3c88ad9918
Add pyinotify entry for Gentoo, refs #331
7 years ago
Niels Abspoel
413a2eae30
Merge pull request #331 from chessclub/fix-inotify-beacon-dependency
Added support for installing pyinotify when using inotify beacons
7 years ago
Niels Abspoel
228f74b660
Merge pull request #330 from aboe76/fix_deprecated_iteritems
fix #296 deprecated iteritems() and replace it with items()
7 years ago
Christian McHugh
d5c10f5600
fix indenting around peer run. Convert extra configs from json to yaml
7 years ago
Tibold
80a160a810
Added default pyinotify package name for archlinux.
7 years ago
Tibold
e94f15d0fe
Added support for installing pynotify when inotify beacons are configuredwq
7 years ago
Niels Abspoel
e2973c644d
fix iteritems() with items()
7 years ago
Niels Abspoel
d6389b8a24
Merge pull request #313 from iondulgheru/master
Fix master_tops configuration rendering
7 years ago
Niels Abspoel
8ad2bb6a80
Merge pull request #325 from mechleg/minion-restart
adding salt-minion restart option from official FAQ page
7 years ago
Niels Abspoel
3d8f2f6c42
Merge pull request #328 from saltstack-formulas/fix-pillar-example
Corrected salt:release in pillar.example
7 years ago
Alexander Weidinger
7e8df76e28
Corrected salt:release in pillar.example
Fixes 'TypeError: coercing to Unicode: need string or buffer, float found'
7 years ago
Niels Abspoel
e307b0cd53
Merge pull request #327 from arthurlogilab/patch-2
[pillar.example] fix indentation of reactors examples
7 years ago
Arthur Lutz
0467074e28
[pillar.example] fix indentation of reactors examples
7 years ago
mechleg
e8ef3c1446
adding salt-minion restart option from official FAQ page
7 years ago
Niels Abspoel
9cf5cd2c00
Merge pull request #319 from genuss/restart_via_at
Add restart minion via at (fixes #136 )
7 years ago
Niels Abspoel
c265206e94
Merge pull request #323 from aquto/master
Enable option to set minion scheduler
7 years ago
Elliot Chen
ec8241c6fd
Added minion scheduler configuration
7 years ago
Niels Abspoel
96edba24fe
Merge pull request #322 from matthew-parlette/master
Fix map.jinja to work with 2017.7.0
7 years ago
Matthew Parlette
4437f7b2e1
Fixed map.jinja to work with 2017.7.0
7 years ago
Niels Abspoel
9e7bcd5946
Merge pull request #320 from tampakrap/enable_syndic_service
enable the syndic service
7 years ago
Theo Chatzimichos
27c69a8a93
enable the syndic service
7 years ago
Florian Ermisch
739be9550f
Merge pull request #316 from cmclaughlin/remove-env-comments
Remove "source" comments from Saltify configs
7 years ago
a.genus
0e8573d13a
Fix typo
7 years ago
a.genus
22ad7db7c0
Add restart minion via at ( fixes #136 )
7 years ago
Niels Abspoel
826bf6695e
Merge pull request #318 from netmanagers/master
Fix lists join error (#317 )
7 years ago
Javier Bértoli
b8273b9c3f
Fix lists join error ( #317 )
7 years ago
Charles McLaughlin
3a261c7da0
Update comment for consistency
7 years ago
Charles McLaughlin
316622ef9b
Remove "source" comments from Saltify configs
I use Salt environments to provide each of my team mates the ability to develop
and test their Salt changes. And I've found that when we run this formula from
our environments against our salt-master, comments in some files change. For us
this represents an unwanted and unplanned change. I understand the intention -
to identify how or why the file changed, but I firmly believe that we should
be able to run highstsate with test=True and only see intended changes. Here's
an example:
ID: salt-cloud-providers
Function: file.recurse
Name: /etc/salt/cloud.providers.d
Result: None
Comment: #### /etc/salt/cloud.providers.d/saltify.conf ####
The file /etc/salt/cloud.providers.d/saltify.conf is set to be changed
Started: 20:01:28.586441
Duration: 75.185 ms
Changes:
----------
/etc/salt/cloud.providers.d/saltify.conf:
----------
diff:
---
+++
@@ -1,4 +1,4 @@
-# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=myenv
+# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=dev
saltify:
provider: saltify
7 years ago
Niels Abspoel
83433c8dd8
Merge pull request #312 from netmanagers/master
Allow to specify reactors separatedly for master and minions
7 years ago
Niels Abspoel
be266a180c
Merge pull request #314 from kakwa/ADD_SALT_REALEASE
add a way to set which release of saltstack to use
7 years ago
Carpentier Pierre-Francois
5c3dc73f2a
fix map.jinja
add missing comas
7 years ago
carpenti
6622d177bf
add a way to set which release of saltstack to use
SaltStack provides "versioned" repositories, this commit add a way
to set which release of salt to use.
It adds a pillar "salt:release" which can be set to a specific release
(ex: 2016.11). This release is then used to configure properly the
repositories URLs for Debian/Ubuntu/RedHat.
The default behavior is to point to 'latest', retaining the previous
behavior if the "salt:release" pillar is not set.
7 years ago
Ion Dulgheru
165f2d727c
Fix master_tops configuration rendering
7 years ago
Javier Bértoli
9331997269
Exclude reactors from f_defaults.conf
7 years ago
Javier Bértoli
3a1e7ad9f9
Fix reactor examples
7 years ago
Javier Bértoli
561eb4c5c8
Reactors should be in an array
7 years ago
Javier Bértoli
442806ab9e
Allow to specify different reactors for minions and masters
7 years ago
Niels Abspoel
eaf9fc98f6
Merge pull request #307 from M2Mobi/external_auth
Fix rendering of external_auth config.
7 years ago
Heinz Wiesinger
68a2b72519
Fix rendering of external_auth config.
This now properly also supports per user, per minion as well as
function argument limiting.
7 years ago