65 Commits (9e42d32000cd6ed421669f3287c8c08630da4fc7)

Auteur SHA1 Bericht Datum
  Dafydd Jones 8e41067c69 allow non-default config settings in master.d/f_defaults.conf (similar to PR#247) 8 jaren geleden
  genuss 8fd8c76d5f Change default value for pillar_opts 8 jaren geleden
  Rob Ruma 6f4880a258 Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id 8 jaren geleden
  Marcin Witowski 9d0b6b03d8 fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template 8 jaren geleden
  carpenti 3098aebcad add engines as a reserved_keys to not add generic configuration 8 jaren geleden
  carpenti 08d10376ab implementing retro-compatible behavior 8 jaren geleden
  carpenti c27bfd92b7 make the configuration of engines specific to master or minion 8 jaren geleden
  Jeremy T. Bouse 79fcda8806 Clean up formating of nodegroups 8 jaren geleden
  Jeremy T. Bouse a89d8d9b6b Add winrepo_provider to master.d/f_defaults.conf 8 jaren geleden
  Krzysztof Pawłowski 776c5ecbe6 Add yaml_utf8 option to salt master configuration. 8 jaren geleden
  Matthew X. Economou 12390494cf Add support for s3fs 8 jaren geleden
  Rene Jochum 6ae81a9640 Add support for mongodb connection settings to config templates. 8 jaren geleden
  Rene Jochum 478fef683b Remove trailing whitespaces in config templates. 8 jaren geleden
  Raphaël Hertzog 182098fc16 JSON encode values embedded in the salt-master's configuration file 8 jaren geleden
  risca ca42d40ef9 added support for LXC profiles 8 jaren geleden
  Christian McHugh ac4ed62c03 Support engine configuration 8 jaren geleden
  Brad Thurber b9ae603fd7 Add support for master eauth LDAP config 8 jaren geleden
  Brad Thurber 939aa37028 Cleanup and make closer to the PR submitted for the mainline salt repo master config file 8 jaren geleden
  Brad Thurber c4ef48c5e8 add new gitfs functionality 8 jaren geleden
  Imran Iqbal 7f36259614 Remove excessive blank lines rendered after "Miscellaneous settings" 8 jaren geleden
  Imran Iqbal c4e116ee8f Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions 8 jaren geleden
  Imran Iqbal 7474d4239d Fix Windows repo settings using values from 2015.8 documentation 8 jaren geleden
  Niels Abspoel bfcaca38a6 merge options from 2015.8.7 version in f_defaults.conf 8 jaren geleden
  Kevin Schmidt ce6849247e add consul config support 9 jaren geleden
  Kevin Schmidt 41f2de74bd * add gitfs whitelist and blacklist 9 jaren geleden
  Niels Abspoel adb0c7008d removing accidentally committed files 9 jaren geleden
  Niels Abspoel cbe5763668 fix pillar and libvirt 9 jaren geleden
  risca 3a83533669 fixed ext_pillar according to https://docs.saltstack.com/en/latest/topics/development/external_pillars.html#configuration and master_tops according to https://docs.saltstack.com/en/latest/topics/master_tops/index.html 9 jaren geleden
  Wolodja Wentland 0216d66527 Remove trailing whitespace from master config 9 jaren geleden
  Wolodja Wentland 52893bc978 Manage show_jid in master configuration 9 jaren geleden
  jpic 825fd7cd77 Fixed pillar_roots generation for salt-master. 9 jaren geleden
  genus fffd30fe17 Add master_sign_pubkey option 9 jaren geleden
  Edvinas Klovas 8992e15882 fix typo 9 jaren geleden
  Edvinas Klovas 47b37f2ffb Fix pillar_roots configuration format in master 9 jaren geleden
  Matt Parlette efcefd6579 Updated master.d/f_defaults for 2014.7 9 jaren geleden
  Brian Jackson 7649c26a0d Switch config file.recurse to clean by default and tell it to ignore _* 9 jaren geleden
  Niels Abspoel b8e53771f3 add mine_get function to master config 9 jaren geleden
  Niels Abspoel 7ddc1692ec added rest_tornado to _defaults.conf 9 jaren geleden
  Nitin Madhok fa6c39eccd Revert "Add mine_functions to master config template" 10 jaren geleden
  Jimmy Tang deee69319f Add mine_functions to master config template 10 jaren geleden
  Raphaël Hertzog 7fb86b9076 Fix the handling of event_return_whitelist/event_return_blacklist 10 jaren geleden
  Raphaël Hertzog d4ae38f825 Import the salt/formulas.jinja template with context 10 jaren geleden
  Raphaël Hertzog 445108f87a Avoid “set salt” jinja calls that mask the usual salt variable 10 jaren geleden
  Raphaël Hertzog 8a828b506e Use items() method instead of iteritems() for Python 3 compatibility 10 jaren geleden
  Raphaël Hertzog 2f2cd972ac Use items() method to loop over nodegroups/log_granular_levels dictionaries 10 jaren geleden
  Raphaël Hertzog f46b4f29d8 Add new “salt.formulas” state to manage salt formulas 10 jaren geleden
  Niels Abspoel 5029504212 Updated master config file to 2014.7 10 jaren geleden
  Niels Abspoel af7f9d722a more improvements in _defaults.conf 10 jaren geleden
  Tim O'Guin be972d9057 updated salt-master config template to add presence_events setting 10 jaren geleden
  Nitin Madhok 00a9e0640c Removing unnecessary - 10 jaren geleden