Commit Graph

203 Commits

Author SHA1 Message Date
N 89f3653de9
Merge pull request #517 from ze42/log_fmt_console
fix(log_fmt_console): double option in config
2021-12-27 17:54:52 +00:00
Javier Bértoli 7540dc90aa fix(minion): update config parameter saltenv
`environment` is being deprecated, renamed to `saltenv`
2021-12-14 11:12:37 -03:00
Niels Abspoel 7d26191578
Merge pull request #518 from ze42/sorted_extra_options
fix: sort extra options in configuration
2021-12-04 21:17:19 +01:00
Robert Fairburn 5b7d7ea70e
fix(master): master.d template to support saltclass ext_pillar 2021-11-30 23:15:21 +00:00
Adrien "ze" Urban 89cdcec595 fix: sort extra options in configuration
Ensure extra options in generated configuration is sorted, to ensure stable
configuration.
2021-10-28 11:54:09 +02:00
Adrien "ze" Urban b705e44378 fix(log_fmt_console): double option in config
When option was specified, it appeared twice in config, making configuration
file buggy, and not loaded.
2021-10-28 11:41:18 +02:00
Raphaël Hertzog 97299983ba
Ensure consistent ordering of module_config entries
Right now when you set module_config entries in your pillar data
like this:
salt:
  minion:
    module_config:
      smtp.from: 'Kali Salt <admins+salt@kali.org>'
      smtp.to: 'Kali Admins <admins+salt@kali.org>'
      smtp.host: localhost
      smtp.subject: 'Results of salt actions on'
      smtp.fields: id,fun

On each run, you will always a different ordering of the various
fields in the minion configuration file, leading to spurious restart
of the minion and admin annoyance:

          ID: salt-minion
    Function: file.recurse
        Name: /etc/salt/minion.d
      Result: True
     Comment: Recursively updated /etc/salt/minion.d
     Started: 13:39:25.689775
    Duration: 874.318 ms
     Changes:
              ----------
              /etc/salt/minion.d/f_defaults.conf:
                  ----------
                  diff:
                      ---
                      +++
                      @@ -930,10 +930,10 @@
                       # A dict for the test module:
                       #test.baz: {spam: sausage, cheese: bread}
                       #
                      +smtp.fields: id,fun
                      +smtp.from: Kali Salt <admins+salt@kali.org>
                       smtp.to: Kali Admins <admins+salt@kali.org>
                      -smtp.fields: id,fun
                       smtp.host: localhost
                      -smtp.from: Kali Salt <admins+salt@kali.org>
                       smtp.subject: Results of salt actions on

With the change here, this bad behaviour is gone...
2021-04-09 16:02:36 +02:00
Dafydd Jones a89fb3f4aa fix: revert to using `is mapping` in Jinja2
* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
  `'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
2021-03-02 00:40:07 +00:00
Mark Ferrell b1d296d270 feat: enable the metadata grains server by default 2020-09-20 07:47:53 -07:00
Ryan Walder 042e9baad3
Add 'return' to reserved_keys in minion config
This prevents the `return` key being duplicated in the minion config by L1205
2019-08-15 14:16:57 +01:00
Imran Iqbal fbe814ace8
feat(`tofs`): allow TOFS for minion configuration 2019-06-07 03:58:24 +01:00
Imran Iqbal 1b202afb29
feat(`tofs`): allow TOFS for master configuration 2019-06-07 03:58:24 +01:00
Niels Abspoel 3888519cdf
Merge pull request #381 from starops/external_auth-file-directives
Add support for file external_auth special directives
2018-12-19 20:41:25 +01:00
Heinz Wiesinger 549c73c739 Fix support for extra config values as mappings 2018-11-12 17:54:11 +01:00
Krzysztof Pawłowski f43cc94362 Support fileserver_list_cache_time in master configuration 2018-08-09 09:06:00 +02:00
Johannes Löthberg ec33ba5fab Add support for file external_auth special directives
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2018-08-06 10:26:17 +02:00
Alexandre Anriot 3e6e6028ae Support publisher_acl minion-level commands 2018-07-11 14:36:41 +02:00
Niels Abspoel d87d858a87
Merge pull request #378 from mrichar1/extra_config
Handle other non-iterable values like int/float.
2018-07-02 11:12:05 +02:00
Matthew Richardson aff75ce8ac Handle other non-iterable values like int/float. 2018-07-01 22:09:34 +01:00
Niels Abspoel a1a65ce1e9
Merge pull request #375 from mrichar1/extra_config
Handle extra config where value is a list (minion)
2018-06-29 17:06:50 +02:00
Matthew Richardson 1a5027ef8c Handle pillar params with child params. (#372) 2018-06-22 10:41:10 +02:00
Matthew Richardson c363aa9e04 Handle extra config where value is a list. 2018-06-12 14:40:54 +01:00
ze42 2761d90626 minion: master_alive_interval: remove duplicate (#369)
Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
2018-06-11 11:12:23 +02:00
Justin Riley d2ceaab7dd only set master_alive_interval once (#368)
closes #367
2018-06-08 17:12:07 +02:00
Felix Russell 9f33d2afe1 [Minion] [returner] [Elasticsearch] Yaml read patch + example.pillar update (#359)
* Minion/returner/elasticsearch yaml read fix.

* Improved the documentation for the elasticsearch returner
2018-04-17 22:26:45 +02:00
Jerzy Drozdz d1e4768cdb Quotation and ipv6 (#355)
* Added quotration around globing rules
2018-04-05 12:45:59 +02:00
Niels Abspoel 3c731605cc fix iteritems python3 2018-03-06 20:52:04 +01:00
Stefan Reimer e92f6f80b0 Fix default value to match array type of pillar 2018-01-30 12:57:31 -08:00
Stefan Reimer 334d5de72b Support profiles within engine.conf to be able to configure sqs_events, https://docs.saltstack.com/en/latest/ref/engines/all/salt.engines.sqs_events.html 2018-01-29 12:28:48 -08: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
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
Christian McHugh d5c10f5600 fix indenting around peer run. Convert extra configs from json to yaml 2017-08-28 07:04:43 +01:00
Niels Abspoel d6389b8a24 Merge pull request #313 from iondulgheru/master
Fix master_tops configuration rendering
2017-08-13 22:38:48 +02:00
Elliot Chen ec8241c6fd Added minion scheduler configuration 2017-07-25 10:13:51 -04: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
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
Ion Dulgheru 165f2d727c Fix master_tops configuration rendering 2017-05-24 18:31:36 +03:00
Javier Bértoli 9331997269 Exclude reactors from f_defaults.conf 2017-05-22 20:56:13 -03:00
Javier Bértoli 561eb4c5c8 Reactors should be in an array 2017-05-22 19:34:31 -03:00
Javier Bértoli 442806ab9e Allow to specify different reactors for minions and masters 2017-05-22 19:20:36 -03:00
Heinz Wiesinger 68a2b72519 Fix rendering of external_auth config.
This now properly also supports per user, per minion as well as
function argument limiting.
2017-05-09 13:34:44 +02:00
Gilles Dartiguelongue 87074cf3d9 Do not sync salt-cloud provided default configuration by default
As discussed in PR#305, these are defaults that even if they are
configurable as probably not suited to a majority of users and causes
delete/add output on highstate of user of the formula choses to use
the same file name.
2017-04-11 13:54:05 +02:00
Javier Bértoli 7093a32968 Simplify logic 2017-04-10 12:14:12 -03:00
Javier Bértoli 997194c992 Wrong list name in config file 2017-04-10 12:11:09 -03:00
Javier Bértoli edce95f949 Updated master and minion default config files
Added parameters new to 2016.03 (or simply missing in the existing config).
2017-04-09 14:27:30 -03:00
Niels Abspoel 03ec0dce2d Merge pull request #301 from vquiering/move_to_publisher_acl
Add new publisher_acl to salt master config
2017-04-08 12:05:15 +02:00
Niels Abspoel ca204ea8c4 Merge pull request #302 from vquiering/fix_external_auth_config
add salt master config template external_auth settings
2017-04-08 12:04:57 +02:00
Theo Chatzimichos 57498d1645
add syndic_user option in the master config 2017-04-07 12:12:21 +02:00