0
0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-04-20 21:42:06 +02:00

Commit Graph

  • 790065559c Merge pull request from gravyboat/master Joseph Hall 2014-02-08 05:38:10 -07:00
  • 9e84f26fba Fixed formatting in readme. Forrest Alvarez 2014-02-08 05:47:47 +00:00
  • 54d2772a2e Merge pull request from gravyboat/master Seth House 2014-01-28 16:49:06 -08:00
  • c7b1f081f7 Updated readme to match standards Forrest Alvarez 2014-01-28 17:53:07 +00:00
  • 4dadffc28d Merge pull request from tiger-seo/master Joseph Hall 2014-01-14 04:56:47 -08:00
  • 507f2abc1a possibility to define Halite configuration for salt-master tiger-seo 2014-01-14 12:30:43 +02:00
  • e45258d633 Merge pull request from tiger-seo/master Seth House 2014-01-08 10:09:12 -08:00
  • f4b839a4fb sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion tiger-seo 2014-01-08 15:27:41 +02:00
  • bea689e977 Merge pull request from KennethWilke/master David Boucha 2013-09-03 08:46:31 -07:00
  • fdca918d3b Merge 9404ebf915438417f2b59abccd2f2775d32ebf0c into fbda93c5e48b22ae514c9c29d84cf205d1ccb908 Kenneth Wilke 2013-09-03 07:43:33 -07:00
  • 9404ebf915 Added module_config section to minion template Kenneth Wilke 2013-09-03 09:45:24 -05:00
  • fbda93c5e4 Merge pull request from KennethWilke/master Seth House 2013-08-27 11:11:01 -07:00
  • 8f3f182e61 Merge d337cc2784b3ce50a57b28b1e4afeb013d5ff58e into ca231053f28d095665ec9f095eed90ffa8d1123e Kenneth Wilke 2013-08-27 09:16:38 -07:00
  • d337cc2784 Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula Kenneth Wilke 2013-08-27 11:14:18 -05:00
  • e3a29bf69a ext_pillar fix Kenneth Wilke 2013-08-27 10:33:06 -05:00
  • 1f71bef33b jijna syntax fix Kenneth Wilke 2013-08-27 10:30:23 -05:00
  • e104b3eb41 fixed ext_pillar Kenneth Wilke 2013-08-27 10:28:33 -05:00
  • 426493b76d fixed ext_pillar Kenneth Wilke 2013-08-27 10:20:42 -05:00
  • ca231053f2 Merge pull request from Linuturk/master Seth House 2013-08-23 19:38:36 -07:00
  • 4ab9284467 Merge 6282d9570ce47da0dff46760a5180d720e357953 into d47edecafd1ee97e4e8d224bde2403b4bce50a81 Justin Phelps 2013-08-23 14:04:52 -07:00
  • 6282d9570c Corrected the typo for the minion configuration file. Justin Phelps 2013-08-23 16:03:26 -05:00
  • c080cf37d6 ext_pillar fix Kenneth Wilke 2013-08-23 12:01:36 -05:00
  • e83d25b80f newline fix Kenneth Wilke 2013-08-23 11:57:45 -05:00
  • 98fd674c95 indentation fix Kenneth Wilke 2013-08-23 11:55:09 -05:00
  • 92b2572734 newline fix Kenneth Wilke 2013-08-23 11:54:12 -05:00
  • 153feac309 Edited master template Kenneth Wilke 2013-08-23 11:52:46 -05:00
  • d47edecafd Merge pull request from KennethWilke/master Joseph Hall 2013-08-15 08:40:30 -07:00
  • ce1be8fc95 Merge a14ded0b6eb9191cd9e36ef4429ea40a165cff7e into c0e24237076d11edc1b7bd658248159061d30fc4 Kenneth Wilke 2013-08-15 08:14:20 -07:00
  • a14ded0b6e really more gentoo Kenneth Wilke 2013-08-15 10:16:54 -05:00
  • 5c3ffbd43c added salt package mapping for gentoo Kenneth Wilke 2013-08-15 10:15:47 -05:00
  • c0e2423707 Merge pull request from KennethWilke/master Seth House 2013-08-14 14:22:44 -07:00
  • 9d276ecbb6 Merge 48e2e326b2c68ed466d291e8147c252615be53fa into b8cbf60db946dd879ec517e1be6743f9f47eda23 Kenneth Wilke 2013-08-14 14:18:40 -07:00
  • 48e2e326b2 fixed missing curly brackets Kenneth Wilke 2013-08-14 16:21:15 -05:00
  • fc9db5336a added moar distro package mapping Kenneth Wilke 2013-08-14 16:16:50 -05:00
  • a6667cdb81 Isolated package mapping and some fixes Kenneth Wilke 2013-08-14 14:53:29 -05:00
  • b8cbf60db9 Merge pull request from KennethWilke/master David Boucha 2013-08-14 09:06:22 -07:00
  • c16d3a741e Merge a940766e7b158b0f2e52564cf75432ae98d8cc70 into 9a52c6530bcdc8edd0c7d12ec21cc6513b99a084 Kenneth Wilke 2013-08-14 07:57:48 -07:00
  • a940766e7b updated readme Kenneth Wilke 2013-08-14 10:00:14 -05:00
  • 2420b85913 overhauled minion template Kenneth Wilke 2013-08-14 09:43:46 -05:00
  • 71418cd1d7 pillar example fix Kenneth Wilke 2013-08-13 16:40:48 -05:00
  • 9a52c6530b Merge pull request from KennethWilke/master David Boucha 2013-08-13 14:21:27 -07:00
  • 0ddfdd2a51 Merge 2d598ac2ef29b3938a9f3c147c25ae41c4bf59ad into 3014f4c20b951e3ad71e01d4a118dc63614915b7 Kenneth Wilke 2013-08-13 14:17:30 -07:00
  • 2d598ac2ef corrected spelling mistake Kenneth Wilke 2013-08-13 16:17:53 -05:00
  • 539d210896 Overhauled the master template Kenneth Wilke 2013-08-13 16:00:08 -05:00
  • be1cd4ff73 Overhauled master config template Kenneth Wilke 2013-08-13 12:20:10 -05:00
  • 3014f4c20b Merge pull request from KennethWilke/master David Boucha 2013-08-12 15:43:10 -07:00
  • b31dd2f865 Merge 8060db1c7b22d74cb9d9f295d03b5708aa5264af into f120f7244f2702088b4a94b8c602d51f042bc3a6 Kenneth Wilke 2013-08-12 15:35:05 -07:00
  • 8060db1c7b used saltstack formulas repo instead of my own Kenneth Wilke 2013-08-12 17:37:38 -05:00
  • 3634e3d833 removed bad require line Kenneth Wilke 2013-08-12 17:36:36 -05:00
  • 48d89a5485 added pillar example Kenneth Wilke 2013-08-12 17:35:25 -05:00
  • b9d2e2f9d4 changed salt-master package to salt-master Kenneth Wilke 2013-08-12 17:33:28 -05:00
  • 76684f638d changed master require to watch, and both to salt-master Kenneth Wilke 2013-08-12 17:33:02 -05:00
  • b1903eea83 fixed log format string Kenneth Wilke 2013-08-12 17:10:45 -05:00
  • d0df360e5d Removed template refs, quoted log_datefmt_logfile Kenneth Wilke 2013-08-12 16:45:39 -05:00
  • f120f7244f Merge pull request from KennethWilke/master David Boucha 2013-08-12 13:13:43 -07:00
  • 12400f0917 Merge 5403d433a1d5aeb86d3f07e8095fefb384a7a0eb into 0cd54925d30cd3739840d527e90155de66b869ab Kenneth Wilke 2013-08-12 13:12:10 -07:00
  • 5403d433a1 fixed small syntax error: geT instead of get Kenneth Wilke 2013-08-12 15:14:23 -05:00
  • 0cd54925d3 Merge pull request from stp-ip/new_structure Joseph Hall 2013-07-27 15:48:49 -07:00
  • 275255d141 Merge 06fd87ced1bc5e96fc7b663c5e4501e55fea2efb into fa29decc39bf10ee5f6b2eb7a00205c36818b948 Michael Grosser 2013-07-27 15:23:34 -07:00
  • 06fd87ced1 Add LICENSE. Michael Grosser 2013-07-27 23:33:47 +02:00
  • c431ed9119 Add pillar.example Michael Grosser 2013-07-27 23:33:33 +02:00
  • fa29decc39 Move into salt subdir Thomas S Hatch 2013-07-27 09:30:56 -06:00
  • 7d6ab1e4f1 Merge pull request from AntoineCezar/dev Joseph Hall 2013-07-22 08:01:38 -07:00
  • 8301c1f244 Merge c7af1d12a1cc9f5b7a26da01aadd65550c14dd2b into 9a5e71bfd9077664874a91e78b5cf8b186a18366 Antoine Cezar 2013-07-22 08:00:21 -07:00
  • c7af1d12a1 Add minion's include configurability Antoine Cezar 2013-07-22 16:56:36 +02:00
  • 9a5e71bfd9 Merge pull request from basepi/master Colton Myers 2013-07-17 08:36:25 -07:00
  • 7e6ea5bfcd Merge 46652ebfda2603bf355c508a7e97d134579bcc85 into 4b3e75780d3a023a482bf8ada2954393ee057c14 Colton Myers 2013-07-17 08:36:20 -07:00
  • 46652ebfda Move everything to root directory for submodule use, Fix Colton Myers 2013-07-17 09:35:39 -06:00
  • 4b3e75780d Merge pull request from AntoineCezar/add_minion_managed_file Thomas S Hatch 2013-07-15 09:55:37 -07:00
  • 06de9b5ee4 Merge 0c394abad16ebcb2cad2b674e2c7547e74b4718d into cff32dadc158a5da35d7656d7d55716ece2b1f92 Antoine Cezar 2013-07-15 06:12:03 -07:00
  • 0c394abad1 Add minion managed file Antoine Cezar 2013-07-15 13:25:42 +02:00
  • cff32dadc1 Merge pull request from auser/master David Boucha 2013-06-18 00:24:43 -07:00
  • 0e7e4deaa0 Merge 91330d170df3da430ae80a727874d6584a382d91 into 6a7f64c5ecc015dfff5cd94cc0d82305b0a73db6 Ari 2013-06-18 00:18:42 -07:00
  • 91330d170d Added small readme Ari Lerner 2013-06-18 00:18:10 -07:00
  • 3ff270fe9f Added the entire master configuration to be set in the pillar Ari Lerner 2013-06-18 00:17:04 -07:00
  • 6a7f64c5ec Start to paramaterize the master config Thomas S Hatch 2013-06-12 22:42:44 -04:00
  • 349a077675 Start on salt formula Thomas S Hatch 2013-06-12 17:53:26 -06:00
  • 87dcccda3a Set up readme Thomas S Hatch 2013-06-12 17:44:36 -06:00
  • 585d3dbd27 Initial commit Thomas S Hatch 2013-06-12 16:46:13 -07:00