25 Commits (dce9bea40b77e8bdd6183f26fe19e2ccfef5462a)

Author SHA1 Message Date
  Javier Bértoli edce95f949 Updated master and minion default config files 7 years ago
  Florian Ermisch e86e6fc221 Work around missing `is mapping` on CentOS/RHEL 6 7 years ago
  Tobias Martin 73906a03a5
added beacons configuration support 7 years ago
  Pavel Veretennikov bad783ea28 Fixes jinja in include block 7 years ago
  Furlot 45e686b7f2 Add http proxy support for minion 8 years ago
  carpenti 3098aebcad add engines as a reserved_keys to not add generic configuration 8 years ago
  Matthew Richardson 89ece150e6 Tidy up comments, add some docs/examples. 8 years ago
  Matthew Richardson 5abdaee5a2 Handle config opts not part of default config. 8 years ago
  Rene Jochum 6ae81a9640 Add support for mongodb connection settings to config templates. 8 years ago
  Rene Jochum 478fef683b Remove trailing whitespaces in config templates. 8 years ago
  Manoj Sonawane 98d591eab2 add module_config for minions 8 years ago
  Étienne BERSAC adad72741e Render config as JSON 8 years ago
  Brad Thurber 39479cafe9 add missing gitfs parms to minion config file as well (for use by standalone minions) 8 years ago
  a.genus e97822a0d5 Take mine_functions back 8 years ago
  Niels Abspoel a4c5b4f322 update 2015.8.7 version config for the minion 8 years ago
  Krzysztof Pawłowski 02be0b1367 add support for returner setting in minion configuration 9 years ago
  Devon Stewart d730d4f2b8 Using cfg_salt['master'] is never the right answer 9 years ago
  genus 4ff1a746d6 Add master_type option 9 years ago
  genus a738198d8b Add verify_master_pubkey_sign 9 years ago
  Javier Domingo 4344a1311b Cleanup template for easier user reading 9 years ago
  Andrew Vant 11efee54c3 Added mine_functions to f_defaults.conf. 9 years ago
  Brian Jackson 7649c26a0d Switch config file.recurse to clean by default and tell it to ignore _* 9 years ago
  Niels Abspoel 90f23948ef create config option for mine_interval 9 years ago
  Niels Abspoel 23fd8b64af Fix #39 multi master support to minion 9 years ago
  Niels Abspoel 5bed5368e2 updated minion _defaults.conf to version 2014.7 10 years ago
  Raphaël Hertzog d4ae38f825 Import the salt/formulas.jinja template with context 10 years ago
  Raphaël Hertzog 445108f87a Avoid “set salt” jinja calls that mask the usual salt variable 10 years ago
  Raphaël Hertzog 8a828b506e Use items() method instead of iteritems() for Python 3 compatibility 10 years ago
  Raphaël Hertzog f46b4f29d8 Add new “salt.formulas” state to manage salt formulas 10 years ago
  Raphaël Hertzog b93ec22244 Add a “salt.standalone” state 10 years ago
  Niels Abspoel af7f9d722a more improvements in _defaults.conf 10 years ago
  Niels Abspoel 4b0ec5dc01 Improved jinja spacing in template 10 years ago
  Niels Abspoel 7da141721b fix spacing with gitfs. 10 years ago
  Niels Abspoel ef4bc1a25a Added support for salt minion gitfs 10 years ago
  Andrew Vant 00e245e20a Added recursive management of minion.d and master.d. 10 years ago
  Johannes 791025e065 Avoid config key clashes 10 years ago
  Wes Turner bc7ccedf45 Fix nested file,pillar _roots in minion and master templates 10 years ago
  Oleg Tsarev e3b2ebeb06 Actualized master and minion config files templates 10 years ago
  tiger-seo f4b839a4fb sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion 11 years ago
  Kenneth Wilke 9404ebf915 Added module_config section to minion template 11 years ago
  Justin Phelps 6282d9570c Corrected the typo for the minion configuration file. 11 years ago
  Kenneth Wilke a6667cdb81 Isolated package mapping and some fixes 11 years ago
  Kenneth Wilke 2420b85913 overhauled minion template 11 years ago
  Thomas S Hatch fa29decc39 Move into salt subdir 11 years ago
  Antoine Cezar c7af1d12a1 Add minion's include configurability 11 years ago
  Colton Myers 46652ebfda Move everything to root directory for submodule use, Fix #4 11 years ago
  Antoine Cezar 0c394abad1 Add minion managed file 11 years ago