Forrest
4acd1711a2
Merge pull request #214 from irtnog/fix-paths-freebsd
Prefix configuration files with the suitable O/S-specific pathname
8 years ago
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 years ago
Matthew X. Economou
001b034eb5
Replace absolute config pathname prefixes with the config_path variable
8 years ago
Forrest
ed4fcbc541
Merge pull request #213 from aboe76/spm_formula
add formula file this fixes #211
8 years ago
Niels Abspoel
398d71d392
add formula file
8 years ago
Forrest
59ee0c7761
Merge pull request #212 from genuss/mine_functions
Take mine_functions back
8 years ago
a.genus
e97822a0d5
Take mine_functions back
8 years ago
Forrest
7856b5ea9a
Merge pull request #210 from iamseth/master
Add Windows support to map.jinja
8 years ago
Seth Miller
c7552b6d0a
Add Windows support to map.jinja
This adds some minimal support for Windows minions.
8 years ago
Forrest
7abdf217a9
Merge pull request #205 from myii/PR_FixWindowsRepoSettings
Fix Windows repo settings using values from 2015.8 documentation
8 years ago
Imran Iqbal
7f36259614
Remove excessive blank lines rendered after "Miscellaneous settings"
8 years ago
Imran Iqbal
c4e116ee8f
Provide Windows repo settings: 2015.8+ master used for pre-2015.8 minions
8 years ago
Imran Iqbal
7474d4239d
Fix Windows repo settings using values from 2015.8 documentation
8 years ago
Nitin Madhok
043433b90a
Merge pull request #204 from aboe76/master
update 2015.8.7 version config for the minion
8 years ago
Niels Abspoel
a4c5b4f322
update 2015.8.7 version config for the minion
8 years ago
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 years ago
Niels Abspoel
bfcaca38a6
merge options from 2015.8.7 version in f_defaults.conf
8 years ago
Forrest
8573ba96e2
Merge pull request #202 from irtnog/revert-pr200
Revert PR #200
8 years ago
Matthew X. Economou
e8021220b8
Revert PR #200
This restores the original structure/behavior of the
`salt_formulas` Pillar key.
8 years ago
Forrest
b47fec3564
Merge pull request #200 from thomaslarsen/master
Support for downloading formulas from multiple baseurls into same environment
8 years ago
Thomas Larsen
bbeacc4ace
Fixed typo in `pillar.example`
8 years ago
Thomas Larsen
d1cbec3fe2
Added support for downloading formulas from multiple baseurls into the same environment.
8 years ago
Forrest
337c48b14c
Merge pull request #199 from kevinschmidt/master
add consul config support to master config file
8 years ago
Kevin Schmidt
ce6849247e
add consul config support
8 years ago
Forrest
0fee3f58f2
Merge pull request #196 from iamseth/master
Replace pkgrepo with offical Saltstack repo
8 years ago
Forrest
8617db1536
Merge pull request #198 from kevinschmidt/master
add support for gitfs whitelist and blacklist
8 years ago
Kevin Schmidt
41f2de74bd
* add gitfs whitelist and blacklist
9 years ago
Niels Abspoel
adb0c7008d
removing accidentally committed files
9 years ago
Niels Abspoel
cbe5763668
fix pillar and libvirt
9 years ago
Seth Miller
8f2191471b
Replace pkgrepo with offical Saltstack repo
issue #180
9 years ago
Forrest
46346e935f
Merge pull request #195 from vexxhost/master
Dropped ppa and updated to official repos for ubuntu
9 years ago
Mohammed Naser
3b8669cd67
dropped ppa and updated to official repos for ubuntu
9 years ago
Forrest
ad009a68e3
Merge pull request #194 from msciciel/master
Add support for returner configuration in salt minion
9 years ago
msciciel
f1c941a6a8
Merge pull request #1 from msciciel/github
Add support for returner configuration in salt minion
9 years ago
Krzysztof Pawłowski
02be0b1367
add support for returner setting in minion configuration
9 years ago
Krzysztof Pawłowski
422888cf77
Merge branch 'github' into itg
Conflicts:
salt/formulas.jinja
9 years ago
Wolodja Wentland
5d1368d936
Merge pull request #192 from hemebond/master
Add clean_file to wipe saltstack.list contents
9 years ago
James O'Neill
6d9683ca1f
Add clean_file to wipe saltstack.list contents
9 years ago
Forrest
d58729e6c1
Merge pull request #191 from hemebond/master
Make Debian use pkgrepo.managed
9 years ago
James O'Neill
87f3e849d2
Make Debian use pkgrepo.managed and allow the repo name and key_url to be overridden via Pillar lookup.
9 years ago
Forrest
b00844fbe4
Merge pull request #189 from Sjd-Risca/test
fixed ext_pillar and master_tops to get more options
9 years ago
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 years ago
Forrest
a33937d9e8
Merge pull request #188 from abednarik/fix_deprecated_iteritems_method
Replace deprecated iteritems() with items()
9 years ago
abednarik
8b39b37762
Replace deprecated iteritems() with items()
9 years ago
Forrest
5c960fd2d8
Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion
Never fall back to `cfg_salt['master']` in minion config
9 years ago
Devon Stewart
d730d4f2b8
Using cfg_salt['master'] is never the right answer
- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
`salt:minion:master`
9 years ago
Forrest
eeb7235ee0
Merge pull request #184 from 0xf10e/master
use salt_settings.syndic_service so state works on FreeBSD, too
9 years ago
Forrest
8d1b382343
Merge pull request #183 from babilen/dev-show-jid
Manage show_jid option in master configuration
9 years ago
puneet kandhari
52803ea883
Merge pull request #185 from babilen/dev-trailing-whitespace
Remove trailing whitespace from master config
9 years ago
Wolodja Wentland
0216d66527
Remove trailing whitespace from master config
9 years ago