Javier Bértoli
fc202490a3
Merge pull request #358 from iustinam/pkgver
...
Add configuration for packages version
2018-02-01 13:50:01 -03:00
Iustina
6027df00a4
Add configuration for packages version
2018-02-01 18:31:35 +02:00
Niels Abspoel
b15ce1c73d
Merge pull request #351 from colin-stubbs/master
...
pillar.example is incorrect; package name for windows is incorrect #350
2018-01-06 15:27:37 +01:00
Colin Stubbs
32f3104dbe
Missing single quote
2018-01-06 23:22:57 +10:00
Colin Stubbs
4307b8ee65
Add pkg source default options for MacOS
2018-01-06 23:21:15 +10:00
Colin Stubbs
532b306b4e
Add initial basis for proper MacOS support
2018-01-06 22:54:57 +10:00
Colin Stubbs
996aa78a8b
pillar example is incorrect; map.jinja incorrectly names package for windows
2018-01-06 22:21:02 +10:00
Niels Abspoel
8268d83dbe
Merge pull request #348 from sjorge/patch-1
...
Set correct api_service for SmartOS
2017-12-24 09:35:53 +01:00
Jorge Schrauwen
71e08ab599
Set correct api_service for SmartOS
...
On SmartOS the salt-api daemon is started by the salt:api service.
2017-12-23 22:23:53 +01:00
Niels Abspoel
31e2d95203
Merge pull request #339 from dafyddj/win-restart
...
Fix Windows minion restart command
2017-12-23 11:41:06 +01:00
Niels Abspoel
d01083f347
Merge pull request #345 from Angelo-Verona/master
...
Changed pillar example formatting for Slack
2017-12-23 11:39:30 +01:00
Angelo Verona
c8e86c5d76
Changed formating in pillar example to avoid warning about wrong dictionary format from Salt. Added comment about type of token.
2017-12-08 02:18:10 +01:00
Niels Abspoel
24998a4a0b
Merge pull request #332 from mchugh19/indenting
...
peer run space and jason to yaml
2017-11-21 11:33:06 +01:00
Theo Chatzimichos
fa657a850e
add also default git values for SUSE osfamily ( #344 )
...
they get overwritten from defaults.yaml if not specified
2017-11-21 00:18:22 +01:00
Theo Chatzimichos
3fd9b0964d
add default values for SUSE osfamily ( #343 )
2017-11-20 23:34:09 +01:00
Dafydd Jones
d987901db2
fix windows minion restart command
2017-10-16 17:09:19 +01:00
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
2017-10-01 20:22:11 +02:00
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
2017-09-29 22:13:00 +02:00
Niels Abspoel
b615ca077a
Merge pull request #333 from EvaSDK/gentoo-pyinotify
...
Add pyinotify entry for Gentoo, refs #331
2017-09-11 15:34:09 +02:00
Gilles Dartiguelongue
3c88ad9918
Add pyinotify entry for Gentoo, refs #331
2017-09-11 14:32:47 +02:00
Niels Abspoel
413a2eae30
Merge pull request #331 from chessclub/fix-inotify-beacon-dependency
...
Added support for installing pyinotify when using inotify beacons
2017-08-29 00:12:13 +02:00
Niels Abspoel
228f74b660
Merge pull request #330 from aboe76/fix_deprecated_iteritems
...
fix #296 deprecated iteritems() and replace it with items()
2017-08-29 00:11:12 +02:00
Christian McHugh
d5c10f5600
fix indenting around peer run. Convert extra configs from json to yaml
2017-08-28 07:04:43 +01:00
Tibold
80a160a810
Added default pyinotify package name for archlinux.
2017-08-16 07:20:00 +00:00
Tibold
e94f15d0fe
Added support for installing pynotify when inotify beacons are configuredwq
2017-08-15 20:48:15 +00:00
Niels Abspoel
e2973c644d
fix iteritems() with items()
2017-08-14 13:15:30 +02:00
Niels Abspoel
d6389b8a24
Merge pull request #313 from iondulgheru/master
...
Fix master_tops configuration rendering
2017-08-13 22:38:48 +02:00
Niels Abspoel
8ad2bb6a80
Merge pull request #325 from mechleg/minion-restart
...
adding salt-minion restart option from official FAQ page
2017-08-08 22:23:23 +02:00
Niels Abspoel
3d8f2f6c42
Merge pull request #328 from saltstack-formulas/fix-pillar-example
...
Corrected salt:release in pillar.example
2017-08-07 20:15:12 +02:00
Alexander Weidinger
7e8df76e28
Corrected salt:release in pillar.example
...
Fixes 'TypeError: coercing to Unicode: need string or buffer, float found'
2017-08-07 17:49:44 +02:00
Niels Abspoel
e307b0cd53
Merge pull request #327 from arthurlogilab/patch-2
...
[pillar.example] fix indentation of reactors examples
2017-08-04 14:04:15 +02:00
Arthur Lutz
0467074e28
[pillar.example] fix indentation of reactors examples
2017-08-04 11:44:06 +02:00
mechleg
e8ef3c1446
adding salt-minion restart option from official FAQ page
2017-07-27 13:15:21 -07:00
Niels Abspoel
9cf5cd2c00
Merge pull request #319 from genuss/restart_via_at
...
Add restart minion via at (fixes #136 )
2017-07-26 21:45:25 +02:00
Niels Abspoel
c265206e94
Merge pull request #323 from aquto/master
...
Enable option to set minion scheduler
2017-07-25 16:37:25 +02:00
Elliot Chen
ec8241c6fd
Added minion scheduler configuration
2017-07-25 10:13:51 -04:00
Niels Abspoel
96edba24fe
Merge pull request #322 from matthew-parlette/master
...
Fix map.jinja to work with 2017.7.0
2017-07-21 16:47:03 +02:00
Matthew Parlette
4437f7b2e1
Fixed map.jinja to work with 2017.7.0
2017-07-18 16:18:44 -04:00
Niels Abspoel
9e7bcd5946
Merge pull request #320 from tampakrap/enable_syndic_service
...
enable the syndic service
2017-06-29 13:14:36 +02:00
Theo Chatzimichos
27c69a8a93
enable the syndic service
2017-06-29 13:05:15 +02:00
Florian Ermisch
739be9550f
Merge pull request #316 from cmclaughlin/remove-env-comments
...
Remove "source" comments from Saltify configs
2017-06-16 12:17:20 +02:00
a.genus
0e8573d13a
Fix typo
2017-06-15 13:30:30 +03:00
a.genus
22ad7db7c0
Add restart minion via at ( fixes #136 )
2017-06-14 19:28:11 +03:00
Niels Abspoel
826bf6695e
Merge pull request #318 from netmanagers/master
...
Fix lists join error (#317 )
2017-06-09 22:42:51 +02:00
Javier Bértoli
b8273b9c3f
Fix lists join error ( #317 )
2017-06-09 08:34:55 -03:00
Charles McLaughlin
3a261c7da0
Update comment for consistency
2017-06-07 14:55:25 -07:00
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
2017-06-07 13:39:35 -07:00
Niels Abspoel
83433c8dd8
Merge pull request #312 from netmanagers/master
...
Allow to specify reactors separatedly for master and minions
2017-06-03 19:28:05 +02:00
Niels Abspoel
be266a180c
Merge pull request #314 from kakwa/ADD_SALT_REALEASE
...
add a way to set which release of saltstack to use
2017-05-31 23:15:30 +02:00
Carpentier Pierre-Francois
5c3dc73f2a
fix map.jinja
...
add missing comas
2017-05-31 22:53:48 +02:00