Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-08-03 21:13:55 +02:00
Code Issues Activity

Commit Graph

  • 03ec0dce2d Merge pull request #301 from vquiering/move_to_publisher_acl Niels Abspoel 2017-04-08 12:05:15 +02:00
  • d218bb4933 Merge f3ce57252a627266da6619211edc4fac83eef13b into ca204ea8c4b6b3b0cf9898a767802d7782fd716a John Carlyle-Clarke 2017-04-08 10:05:09 +00:00
  • ca204ea8c4 Merge pull request #302 from vquiering/fix_external_auth_config Niels Abspoel 2017-04-08 12:04:57 +02:00
  • 4b5ea5a544 Merge pull request #303 from tampakrap/syndic_user Niels Abspoel 2017-04-07 13:14:58 +02:00
  • 57498d1645
         add syndic_user option in the master config Theo Chatzimichos 2017-04-07 12:12:21 +02:00
  • f7189e2900 User publisher_acl setting in salt master config even if used client_acl in pillar (backwards compatibility) Vitali Quiering 2017-03-27 08:39:05 +02:00
  • 894bd15c79 fix salt master config template to use external_auth settings Vitali Quiering 2017-03-25 19:59:16 +01:00
  • d3b46a3648 add publisher_acl to salt master config Vitali Quiering 2017-03-24 13:07:19 +01:00
  • 31229c5a0d Merge pull request #298 from 0xf10e/no_mapping_workaround puneet kandhari 2017-03-04 05:17:38 -06:00
  • 250a82d110 Merge pull request #1 from saltstack-formulas/master segal90 2017-03-04 11:22:20 +01:00
  • e86e6fc221 Work around missing is mapping on CentOS/RHEL 6 Florian Ermisch 2017-02-24 18:10:54 +01:00
  • 5327e921fe Hack to make rendering work on CentOS 6 Florian Ermisch 2017-02-24 13:34:31 +01:00
  • d34f63fdf0 Merge pull request #297 from Sjd-Risca/fix_lxc_keyword Niels Abspoel 2017-02-24 00:03:04 +01:00
  • ef120e56bc fixed key reserved for lxc_profile file risca 2017-02-23 23:51:14 +01:00
  • a26e82f530 Merge pull request #288 from aboe76/fix_beacons Niels Abspoel 2017-02-01 22:53:44 +01:00
  • 9bb9b05af8 fix default dict Andre Sencioles 2017-02-01 09:33:35 +13:00
  • f57db0a786 check version variable is defined Dafydd Jones 2016-12-19 22:59:47 +00:00
  • 075acdabf8 allow for pkg.installed version parameter Dafydd Jones 2016-12-19 18:21:19 +00:00
  • bf3193cac7 fix default dict (like PR #279) Dafydd Jones 2017-01-31 16:19:27 +00:00
  • c685ca7767 Merge pull request #277 from Furlot/patch-1 Niels Abspoel 2017-01-22 23:45:25 +01:00
  • 2e792584d2 Merge pull request #281 from vermut/patch-1 Niels Abspoel 2017-01-22 23:37:28 +01:00
  • 724e603689 Merge pull request #283 from irtnog/fix-root-group-bsd Niels Abspoel 2017-01-22 23:35:52 +01:00
  • 39383847b3 Merge pull request #1 from saltstack-formulas/master Richard Clark 2017-01-22 10:36:34 -08:00
  • 5ffed7de5c fix beacons on dev Niels Abspoel 2017-01-21 22:58:31 +01:00
  • 4d8d85e147 Merge 834325ee26ccc92f14a606df216066cc57d7158d into cb050736b0328060a7311d8d86206b4e2fe2ecb4 luitzifa 2017-01-21 21:57:39 +00:00
  • 5f05ca7168 Merge a931bb911e81f6ebe71180aa5962d6943aa00d2c into cb050736b0328060a7311d8d86206b4e2fe2ecb4 Matthew X. Economou 2017-01-21 21:57:39 +00:00
  • cb050736b0 Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge Brian Jackson 2017-01-21 11:41:49 -08:00
  • b4d55b80f9 Merge pull request #285 from leansalt/archlinux-pygit-libgit2 Florian Ermisch 2017-01-15 12:03:45 +01:00
  • d3dfd1b967 Merge pull request #287 from ek9/alpine-linux-support Brian Jackson 2017-01-14 12:09:15 -08:00
  • d7af7c15bb Alpine Linux: add basic support ek9 2017-01-13 17:31:47 +01:00
  • 8ae39f4700 Arch Linux: install pygit2 or libgit2 via pacman instead of source by default ek9 2017-01-13 17:03:19 +01:00
  • c43657487f
         Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd Matthew X. Economou 2017-01-13 10:21:14 -05:00
  • 9e42d32000 Merge pull request #282 from rocket-labs-sysadmins/beacons Niels Abspoel 2017-01-13 16:20:31 +01:00
  • 3746f08f2f
         Use a different group name for GID 0 depending on the minion's O/S Matthew X. Economou 2017-01-13 07:52:18 -05:00
  • fc40847542
         fixed beacon variable name Tobias Martin 2017-01-13 15:26:17 +01:00
  • 73906a03a5
         added beacons configuration support Tobias Martin 2017-01-13 14:22:39 +01:00
  • bad783ea28 Fixes jinja in include block Pavel Veretennikov 2017-01-13 14:58:59 +02:00
  • a931bb911e
         Specify the "root" group by GID, as BSD Unix names that group "wheel". Matthew X. Economou 2017-01-13 07:52:18 -05:00
  • caff23424d fix default dict Niels Abspoel 2017-01-12 23:40:41 +01:00
  • 45e686b7f2 Add http proxy support for minion Furlot 2017-01-06 17:12:59 +01:00
  • f58562beeb Merge pull request #276 from saltstack-formulas/fix_pygit2_debian Brian Jackson 2016-12-25 23:17:47 -08:00
  • 6fab0c54c6 Merge pull request #274 from jebas/master Rene Jochum 2016-12-26 08:01:44 +01:00
  • e329bda7bf Fix pygit2-libgit2 builds on Debian like platforms. Rene Jochum 2016-12-25 17:41:47 +01:00
  • 4397f55290 Merge 8eabd29c1c8e843bc2dc26866c1c0def76cbd65f into 13f06a8ae515316262f71be69411f5b9a8a47c81 John Carlyle-Clarke 2016-12-21 21:48:00 +00:00
  • 0166cd4097 Added fedora. Jeff Baskin 2016-12-19 23:29:42 -05:00
  • 13f06a8ae5 Merge pull request #273 from jerrykan/saltapi Forrest 2016-12-07 21:35:14 -08:00
  • 43663fec1b Have salt-api service watch the master config files John Kristensen 2016-12-02 17:28:30 +11:00
  • f3f2251d75 Merge pull request #271 from dafyddj/add-master-other-settings Forrest 2016-12-01 14:13:04 -08:00
  • 8e41067c69 allow non-default config settings in master.d/f_defaults.conf (similar to PR#247) Dafydd Jones 2016-11-07 18:49:38 +00:00
  • d68c0b63ee Merge pull request #267 from fizmat/pkgrepo-cleanup Brian Jackson 2016-11-21 22:53:47 -08:00
  • 111cbd44d1 Merge pull request #269 from mattwillsher/smartos-support Forrest 2016-11-14 14:37:50 -08:00
  • 157f356442 Correct SmartOS config path Matt Willsher 2016-11-14 22:22:52 +00:00
  • 88794c8c62 Merge pull request #268 from mattwillsher/smartos-support Forrest 2016-11-14 14:17:25 -08:00
  • 5b87c50e46 Add SmartOS salt-master and gitfs support Matt Willsher 2016-11-14 22:13:52 +00:00
  • af02bc5b78 Merge pull request #266 from fizmat/arch-update Forrest 2016-11-10 09:15:02 -08:00
  • 8552113226 update map.jinja after Arch renamed the package Ivan Kadochnikov 2016-11-10 16:05:48 +03:00
  • fd0b200fea Delete repotype from map.jinja, unused after 8f2191471 Ivan Kadochnikov 2016-10-07 16:12:20 +03:00
  • e18eeffb5e Delete debian saltstack repo gpg, not used since 87f3e849d23d Ivan Kadochnikov 2016-10-07 15:58:47 +03:00
  • fcefad0899 Delete pkgrepo/ubuntu, not used anymore Ivan Kadochnikov 2016-10-07 15:55:44 +03:00
  • 13ea551011 Simplify pkgrepo logic, made possible by 3b265a544 Ivan Kadochnikov 2016-10-07 15:55:15 +03:00
  • 01043740dc Merge pull request #259 from kakwa/separate_engines_config Forrest 2016-11-09 12:08:33 -08:00
  • ff8bf379a7 Merge pull request #261 from fizmat/pkgrepo-redhat Niels Abspoel 2016-11-09 20:46:34 +01:00
  • f6551c5fc8 Merge pull request #265 from genuss/pillar_opts Forrest 2016-11-09 10:01:41 -08:00
  • 8fd8c76d5f Change default value for pillar_opts genuss 2016-11-09 20:48:15 +03:00
  • d6affbba39 Merge pull request #263 from robruma/feature/support_master_id_option Forrest 2016-10-14 09:35:34 -07:00
  • 6f4880a258 Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id Rob Ruma 2016-10-14 08:25:18 -04:00
  • 423d58dd88 Add state that ensures pkgrepo for RedHat is absent Ivan Kadochnikov 2016-10-07 16:26:14 +03:00
  • 07aa250925 Merge pull request #260 from mothbe/master Forrest 2016-10-06 15:56:02 -07:00
  • 9d0b6b03d8 fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template Marcin Witowski 2016-10-07 00:48:59 +02:00
  • 3098aebcad add engines as a reserved_keys to not add generic configuration carpenti 2016-10-05 22:28:33 +02:00
  • 08d10376ab implementing retro-compatible behavior carpenti 2016-10-05 21:14:00 +02:00
  • c27bfd92b7 make the configuration of engines specific to master or minion carpenti 2016-10-05 10:26:36 +02:00
  • 5e9c937931 Merge pull request #258 from aboe76/enable_salt_minion_standalone Forrest 2016-10-01 11:12:08 -07:00
  • 64e7376fe4 fix minion daemon to be enabled if master_type is set to disable Niels Abspoel 2016-10-01 11:31:56 +02:00
  • e76880d500 Merge pull request #257 from aboe76/salt-minion_standalone_with_service Forrest 2016-10-01 00:50:25 -07:00
  • 1ffbb4b6bc add option to start minion service if master_type is set to disable Niels Abspoel 2016-10-01 09:30:39 +02:00
  • e464109c92 Merge pull request #256 from aboe76/missing_files Forrest 2016-09-30 13:43:17 -07:00
  • 13a6ecf8b9 add missing files Niels Abspoel 2016-09-30 22:00:11 +02:00
  • 894351b248 Merge pull request #255 from aboe76/minion_engines_reactors Forrest 2016-09-30 12:44:16 -07:00
  • ddaa166de2 add engine and reactor config to salt minion configuration Niels Abspoel 2016-09-30 21:27:20 +02:00
  • 4e8d36f308 Merge pull request #253 from jerrykan/cloud_without_pip Javier Bértoli 2016-09-21 06:35:17 -03:00
  • 37f82242e7 By default don't install cloud dependencies using pip John Kristensen 2016-09-20 13:38:01 +10:00
  • 834325ee26 Refactor saltstack-formulas/salt-formula#250 Daniel Krämer 2016-09-14 09:05:35 +02:00
  • ad440d904c Merge pull request #250 from luitzifa/master Forrest 2016-09-13 09:33:59 -07:00
  • 749bf0e863 [BIGFUX] make pygit2 work with ubuntu xenial Daniel Krämer 2016-09-13 09:03:06 +02:00
  • 52bc1badca Merge pull request #251 from UGNS/master Forrest 2016-09-06 00:21:59 -07:00
  • 4283cba123 Add example for winrepo_provider Jeremy T. Bouse 2016-09-06 05:33:23 +00:00
  • a842dbe621 Fixes saltstack-formulas/salt-formula#190 Daniel Krämer 2016-09-05 10:48:31 +02:00
  • 79fcda8806 Clean up formating of nodegroups Jeremy T. Bouse 2016-09-04 14:48:10 +00:00
  • a89d8d9b6b Add winrepo_provider to master.d/f_defaults.conf Jeremy T. Bouse 2016-09-04 14:47:39 +00:00
  • 2a80f55a17 Merge pull request #249 from msciciel/salt-master-yaml-utf8 Forrest 2016-08-24 09:47:52 -07:00
  • 776c5ecbe6 Add yaml_utf8 option to salt master configuration. Krzysztof Pawłowski 2016-08-24 13:06:24 +02:00
  • 988ad87b35 Adjust map.jinja, clean up os_family_map Jan Philipp Timme 2016-08-24 12:22:50 +02:00
  • 5dd3eac097 Merge pull request #247 from mrichar1/other_opts Forrest 2016-08-23 10:48:18 -07:00
  • 89ece150e6 Tidy up comments, add some docs/examples. Matthew Richardson 2016-08-23 09:48:39 +01:00
  • 5abdaee5a2 Handle config opts not part of default config. Matthew Richardson 2016-08-22 11:22:08 +01:00
  • 39a329b693 Merge pull request #245 from UGNS/raspbian Niels Abspoel 2016-08-15 16:44:27 +02:00
  • 3b265a544a Fix URLs in salt.pkgrepo for Raspbian & Ubuntu Jeremy T. Bouse 2016-08-13 13:56:53 -04:00
  • 8050f6cf95 Merge pull request #243 from pcdummy/master Forrest 2016-07-15 09:02:57 -07:00
  • f17b8f5424 Add optional method to remove /etc/salt/master. Rene Jochum 2016-07-15 15:13:21 +02:00