saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity
467 Commits 3 Branches 68 Tags 2 MiB
6fab0c54c6
Commit Graph

467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Richardson
5abdaee5a2 Handle config opts not part of default config. 2016-08-22 11:22:08 +01:00
Niels Abspoel
39a329b693 Merge pull request #245 from UGNS/raspbian 
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
 2016-08-15 16:44:27 +02:00
Jeremy T. Bouse
3b265a544a Fix URLs in salt.pkgrepo for Raspbian & Ubuntu 
Rasbian reports back the following grain values:

local:
    ----------
    os:
        Raspbian
    os_family:
        Debian
    osarch:
        armhf
    osmajorrelease:
        8
    osrelease:
        8.0

Ubuntu reports back the following grain values:

local:
    ----------
    os:
        Ubuntu
    os_family:
        Debian
    osarch:
        amd64
    osmajorrelease:
        14
    osrelease:
        14.04

For Raspbian the osarch needed to be changed from other Debain os_family
distributions.
For Ubuntu the osrelease value is needed instead of osmajorrelease as other
Debian os_family distributions.

Part of #180
 2016-08-13 15:29:03 -04:00
Forrest
8050f6cf95 Merge pull request #243 from pcdummy/master 
https for the ubuntu repo and option to remove /etc/salt/minion.
 2016-07-15 09:02:57 -07:00
Rene Jochum
f17b8f5424 Add optional method to remove /etc/salt/master. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-15 15:13:21 +02:00
Rene Jochum
1b611c871e Add optional method to remove /etc/salt/minion. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-15 15:11:55 +02:00
Rene Jochum
fa6818af35 Use https for the Ubuntu repo same as salt-bootstrap. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-14 18:20:04 +02:00
Brian Jackson
15d39babb6 Merge pull request #242 from irtnog/add-s3fs-support 
Add support for s3fs
 2016-07-12 15:43:54 -07:00
Matthew X. Economou
d7be9aba9f Document sample s3fs configuration 2016-07-09 21:23:49 -04:00
Matthew X. Economou
12390494cf Add support for s3fs 2016-07-09 08:29:33 -04:00
Forrest
55864f7cdf Merge pull request #241 from pcdummy/mongodb 
add support for mongodb settings
 2016-07-07 10:22:18 -07:00
Rene Jochum
6ae81a9640 Add support for mongodb connection settings to config templates. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-07 18:44:51 +02:00
Rene Jochum
478fef683b Remove trailing whitespaces in config templates. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-07 16:22:16 +02:00
Forrest
e1b664f4d3 Merge pull request #240 from mwpher/master 
Add support for OpenBSD in map.jinja
 2016-07-01 19:49:46 -07:00
Matthew Pherigo
621e1f218c Add support for OpenBSD in map.jinja 2016-07-01 21:25:06 -05:00
Forrest
5f03ce9db1 Merge pull request #234 from rhertzog/pkgrepo-update 
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
 2016-06-30 09:21:18 -07:00
Forrest
137868bcc1 Merge pull request #237 from msonawane/master 
add module_config for minions
 2016-06-26 18:40:47 -07:00
Manoj Sonawane
98d591eab2 add module_config for minions 2016-06-27 01:34:05 +00:00
Forrest
6b96bda5cd Merge pull request #235 from rhertzog/master-config-fix 
JSON encode values embedded in the salt-master's configuration file
 2016-06-20 14:11:46 -07:00
Raphaël Hertzog
ee06702fca Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions 
repo.saltstack.com handles all currently supported Debian releases as well
as all supported Ubuntu releases so this change should be fine.

Part of #180.
 2016-06-20 22:36:54 +02:00
Raphaël Hertzog
182098fc16 JSON encode values embedded in the salt-master's configuration file 
This avoids problems when values are strings containing colons. And it
mimicks what was already done for the salt-minion's configuration file.

Fixes #233.
 2016-06-20 22:24:20 +02:00
Forrest
a96f7093fb Merge pull request #226 from Sjd-Risca/lxcprofile 
Lxcprofile
 2016-06-07 11:09:58 -07:00
risca
ca42d40ef9 added support for LXC profiles 2016-06-07 19:46:08 +02:00
Forrest
3bc5aa3bce Merge pull request #231 from rocket-labs-sysadmins/master 
GitPython package name is fixed for RedHat-based OS
 2016-05-30 11:32:02 -07:00
kabakaev
f16e012687 Merge pull request #1 from TiagoTT/patch-1 
Fixing GitPython package name for RedHat OS family. Tested on CentOS 7.
 2016-05-30 14:56:44 +02:00
Tiago Teresa Teodósio
6690e8b103 Fixing GitPython package name for RedHat OS family. Tested on CentOS 7. 2016-05-30 13:50:16 +02:00
Forrest
d3476bae04 Merge pull request #230 from bersace/json-render 
Render config as JSON
 2016-05-29 22:43:29 -07:00
Étienne BERSAC
adad72741e Render config as JSON 2016-05-29 20:43:45 +02:00
Forrest
7f41dff871 Merge pull request #229 from mchugh19/master 
Support engine configuration
 2016-05-27 21:40:39 -07:00
Christian McHugh
ac4ed62c03 Support engine configuration 2016-05-27 23:27:55 -05:00
Forrest
76de5f9285 Merge pull request #227 from bradthurber/master-auth-ldap-support 
Add support for master eauth LDAP config
 2016-05-26 12:19:37 -07:00
Brad Thurber
b9ae603fd7 Add support for master eauth LDAP config 2016-05-26 10:52:10 -04:00
Forrest
4388d06963 Merge pull request #225 from bradthurber/non-templated-cloud-config 
Ability to create non-templated cloud maps/providers/profiles
 2016-05-06 11:56:31 -07:00
Brad Thurber
b3a3fa4d72 Ability to create non-templated cloud config files (maps/providers/profiles). 2016-05-06 14:45:41 -04:00
Forrest
0a601fc310 Merge pull request #224 from bradthurber/allow-empty-gitfs-keys 
allow gitfs.keys state to function without error when no keys
 2016-05-02 10:26:00 -07:00
Brad Thurber
d2df211011 allow state to function without errors if no keys are find in pilar 2016-05-02 09:13:38 -04:00
Forrest
8ed58c6528 Merge pull request #221 from bradthurber/new-gitfs-functionality 
add new gitfs functionality
 2016-04-28 12:37:53 -07:00
Brad Thurber
39479cafe9 add missing gitfs parms to minion config file as well (for use by standalone minions) 2016-04-28 09:43:13 -04:00
Brad Thurber
939aa37028 Cleanup and make closer to the PR submitted for the mainline salt repo master config file 2016-04-20 15:10:55 -04:00
Brad Thurber
c4ef48c5e8 add new gitfs functionality 2016-04-19 12:51:17 -04:00
puneet kandhari
6578fb2ae2 Merge pull request #219 from UtahDave/master 
Use the latest stable salt from repo.saltstack.com
 2016-04-04 13:31:54 -05:00
David Boucha
cca75d93d7 Use the latest stable salt from repo.saltstack.com 2016-04-04 12:28:35 -06:00
puneet kandhari
d0d4a6cc6b Merge pull request #218 from UtahDave/master 
Comment out second master config example
 2016-04-04 13:05:02 -05:00
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
 2016-04-04 11:48:20 -06:00
Wolodja Wentland
633ce3630f Merge pull request #216 from centromere/driver-version-check 
Added version check for provider/driver backwards compatibility
 2016-04-01 08:22:01 +02:00
John Galt
e26b805279 Added version check for provider/driver backwards compatibility 2016-03-31 23:17:35 -07:00
Nitin Madhok
29d4a55828 Merge pull request #215 from centromere/provider-fix 
Renamed "provider" to "driver"
 2016-03-31 22:48:17 -04:00
John Galt
c4208bb661 Renamed "provider" to "driver" 2016-03-31 19:39:55 -07:00
Forrest
4acd1711a2 Merge pull request #214 from irtnog/fix-paths-freebsd 
Prefix configuration files with the suitable O/S-specific pathname
 2016-03-29 11:23:08 -07:00
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`.
 2016-03-29 13:36:46 -04:00