Brad Thurber
d2df211011
allow state to function without errors if no keys are find in pilar
8 yıl önce
Forrest
8ed58c6528
Merge pull request #221 from bradthurber/new-gitfs-functionality
add new gitfs functionality
8 yıl önce
Brad Thurber
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
8 yıl önce
Brad Thurber
939aa37028
Cleanup and make closer to the PR submitted for the mainline salt repo master config file
8 yıl önce
Brad Thurber
c4ef48c5e8
add new gitfs functionality
8 yıl önce
puneet kandhari
6578fb2ae2
Merge pull request #219 from UtahDave/master
Use the latest stable salt from repo.saltstack.com
8 yıl önce
David Boucha
cca75d93d7
Use the latest stable salt from repo.saltstack.com
8 yıl önce
puneet kandhari
d0d4a6cc6b
Merge pull request #218 from UtahDave/master
Comment out second master config example
8 yıl önce
David Boucha
08501c9e18
Comment out second master config example
This second master config example was causing problems when vagrant
would use the default pillar.example
8 yıl önce
Wolodja Wentland
633ce3630f
Merge pull request #216 from centromere/driver-version-check
Added version check for provider/driver backwards compatibility
8 yıl önce
John Galt
e26b805279
Added version check for provider/driver backwards compatibility
8 yıl önce
Nitin Madhok
29d4a55828
Merge pull request #215 from centromere/provider-fix
Renamed "provider" to "driver"
8 yıl önce
John Galt
c4208bb661
Renamed "provider" to "driver"
8 yıl önce
Forrest
4acd1711a2
Merge pull request #214 from irtnog/fix-paths-freebsd
Prefix configuration files with the suitable O/S-specific pathname
8 yıl önce
Matthew X. Economou
abe9b91e66
Replace reference to slspath with the complete URL of the source file
Without this change, importing map.jinja in config files (as opposed to
SLS files) causes a rendering error because `slspath` isn't defined.
The `salt_settings.key_url` variable gets used only in
`salt/pkgrepo/debian/init.sls`.
8 yıl önce
Matthew X. Economou
001b034eb5
Replace absolute config pathname prefixes with the config_path variable
8 yıl önce
Forrest
ed4fcbc541
Merge pull request #213 from aboe76/spm_formula
add formula file this fixes #211
8 yıl önce
Niels Abspoel
398d71d392
add formula file
8 yıl önce
Forrest
59ee0c7761
Merge pull request #212 from genuss/mine_functions
Take mine_functions back
8 yıl önce
a.genus
e97822a0d5
Take mine_functions back
8 yıl önce
Forrest
7856b5ea9a
Merge pull request #210 from iamseth/master
Add Windows support to map.jinja
8 yıl önce
Seth Miller
c7552b6d0a
Add Windows support to map.jinja
This adds some minimal support for Windows minions.
8 yıl önce
Forrest
7abdf217a9
Merge pull request #205 from myii/PR_FixWindowsRepoSettings
Fix Windows repo settings using values from 2015.8 documentation
8 yıl önce
Imran Iqbal
7f36259614
Remove excessive blank lines rendered after "Miscellaneous settings"
8 yıl önce
Imran Iqbal
c4e116ee8f
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions
8 yıl önce
Imran Iqbal
7474d4239d
Fix Windows repo settings using values from 2015.8 documentation
8 yıl önce
Nitin Madhok
043433b90a
Merge pull request #204 from aboe76/master
update 2015.8.7 version config for the minion
8 yıl önce
Niels Abspoel
a4c5b4f322
update 2015.8.7 version config for the minion
8 yıl önce
Forrest
a8ced2e98f
Merge pull request #203 from aboe76/master_config_2015.8.7
merge options from 2015.8.7 version in f_defaults.conf
8 yıl önce
Niels Abspoel
bfcaca38a6
merge options from 2015.8.7 version in f_defaults.conf
8 yıl önce
Forrest
8573ba96e2
Merge pull request #202 from irtnog/revert-pr200
Revert PR #200
8 yıl önce
Matthew X. Economou
e8021220b8
Revert PR #200
This restores the original structure/behavior of the
`salt_formulas` Pillar key.
8 yıl önce
Forrest
b47fec3564
Merge pull request #200 from thomaslarsen/master
Support for downloading formulas from multiple baseurls into same environment
9 yıl önce
Thomas Larsen
bbeacc4ace
Fixed typo in `pillar.example`
9 yıl önce
Thomas Larsen
d1cbec3fe2
Added support for downloading formulas from multiple baseurls into the same environment.
9 yıl önce
Forrest
337c48b14c
Merge pull request #199 from kevinschmidt/master
add consul config support to master config file
9 yıl önce
Kevin Schmidt
ce6849247e
add consul config support
9 yıl önce
Forrest
0fee3f58f2
Merge pull request #196 from iamseth/master
Replace pkgrepo with offical Saltstack repo
9 yıl önce
Forrest
8617db1536
Merge pull request #198 from kevinschmidt/master
add support for gitfs whitelist and blacklist
9 yıl önce
Kevin Schmidt
41f2de74bd
* add gitfs whitelist and blacklist
9 yıl önce
Niels Abspoel
adb0c7008d
removing accidentally committed files
9 yıl önce
Niels Abspoel
cbe5763668
fix pillar and libvirt
9 yıl önce
Seth Miller
8f2191471b
Replace pkgrepo with offical Saltstack repo
issue #180
9 yıl önce
Forrest
46346e935f
Merge pull request #195 from vexxhost/master
Dropped ppa and updated to official repos for ubuntu
9 yıl önce
Mohammed Naser
3b8669cd67
dropped ppa and updated to official repos for ubuntu
9 yıl önce
Forrest
ad009a68e3
Merge pull request #194 from msciciel/master
Add support for returner configuration in salt minion
9 yıl önce
msciciel
f1c941a6a8
Merge pull request #1 from msciciel/github
Add support for returner configuration in salt minion
9 yıl önce
Krzysztof Pawłowski
02be0b1367
add support for returner setting in minion configuration
9 yıl önce
Krzysztof Pawłowski
422888cf77
Merge branch 'github' into itg
Conflicts:
salt/formulas.jinja
9 yıl önce
Wolodja Wentland
5d1368d936
Merge pull request #192 from hemebond/master
Add clean_file to wipe saltstack.list contents
9 yıl önce