Krzysztof Pawłowski
3f9e4fc7d4
Fix for centos5 and jinja < 2.6
9 vuotta sitten
genus
4ff1a746d6
Add master_type option
9 vuotta sitten
puneet kandhari
2af4bf3bb5
Merge pull request #161 from genuss/sign_pubkey
Add options for mult-master setup
9 vuotta sitten
puneet kandhari
a5923a0df9
Merge pull request #160 from irtnog/fix-freebsd-pygit2-package
Use the py27-pygit2 package when installing pygit2 on FreeBSD
9 vuotta sitten
Matthew X. Economou
ba9cc2605c
Use the py27-pygit2 package when installing pygit2 on FreeBSD
9 vuotta sitten
Brian Jackson
e7e77d40d9
Merge pull request #158 from irtnog/fix-freebsd-gitpython-package
Use the py27-GitPython package when installing GitPython on FreeBSD
9 vuotta sitten
Matthew X. Economou
ea5a9f1f2c
Merge remote-tracking branch 'upstream/master' into fix-freebsd-gitpython-package
9 vuotta sitten
Brian Jackson
bc0776e4e3
Merge pull request #157 from irtnog/fix-freebsd-saltssh-package
Use the py27-salt package when installing salt-ssh on FreeBSD
9 vuotta sitten
Matthew X. Economou
ef275bd138
Allow customizing the GitPython package name.
9 vuotta sitten
Matthew X. Economou
b477990830
Use the py27-GitPython package when installing GitPython on FreeBSD.
9 vuotta sitten
Matthew X. Economou
85a426ccdf
Add new `salt:python_git` key.
This key defaults to a value of `python-git`.
9 vuotta sitten
Matthew X. Economou
5b93601c78
Use the py27-salt package when installing salt-ssh on FreeBSD
On FreeBSD salt-ssh gets bundled into a single package with the other
SaltStack components (minion, master, etc.).
9 vuotta sitten
genus
a738198d8b
Add verify_master_pubkey_sign
9 vuotta sitten
genus
fffd30fe17
Add master_sign_pubkey option
9 vuotta sitten
puneet kandhari
e5ad08ee1e
Merge pull request #156 from iggy/revert_bad
Revert bad
9 vuotta sitten
Brian Jackson
4c1f57792a
Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip."
This reverts commit 7bb82b0178
.
9 vuotta sitten
Brian Jackson
6e98d508c4
Revert "Fix salt/api.sls."
This reverts commit 8a1b8dc9db
.
9 vuotta sitten
Brian Jackson
d216a3f651
Revert "Install cherrypy/tornado from pip only if use_pip is True."
This reverts commit 90282eff03
.
9 vuotta sitten
Brian Jackson
8448aa4021
Revert "Fix stuff suggested by @iggy."
This reverts commit c5ae289fa1
.
9 vuotta sitten
Brian Jackson
ed3ab22a13
Revert "Add support for GitPython and salt-ssh on FreeBSD masters"
This reverts commit b03831c0b0
.
9 vuotta sitten
Brian Jackson
f9cb912a65
Revert "salt.api state fails"
This reverts commit 22b8dde1ff
.
9 vuotta sitten
Brian Jackson
ef73e4ce98
Revert "Change variable lookup to match usage in other states"
This reverts commit 14b466e022
.
9 vuotta sitten
puneet kandhari
b04fc8c843
Merge pull request #154 from irtnog/add-freebsd-support-saltssh-gitpython
Add support for GitPython and salt-ssh on FreeBSD masters
9 vuotta sitten
Matthew X. Economou
14b466e022
Change variable lookup to match usage in other states
Done at the maintainer's request.
9 vuotta sitten
puneet kandhari
af8c157e2b
Merge pull request #155 from Oro/patch-1
salt.api state fails
9 vuotta sitten
Marco Orovecchia
22b8dde1ff
salt.api state fails
Seems there are several colons missing for salt.api to work correctly, hope I found all of them
9 vuotta sitten
Matthew X. Economou
b03831c0b0
Add support for GitPython and salt-ssh on FreeBSD masters
This change tweaks the GitPython package installation state to support
alternate package names (on FreeBSD, it's called "py27-GitPython").
Also, on FreeBSD salt-ssh is included in the "py27-salt" package by
default, requiring an update to `distro_map`.
9 vuotta sitten
puneet kandhari
96d820a5a0
Merge pull request #152 from pcdummy/master
Fix stuff suggested by @iggy .
9 vuotta sitten
René Jochum
c5ae289fa1
Fix stuff suggested by @iggy .
Signed-off-by: René Jochum <rene@jochums.at>
9 vuotta sitten
puneet kandhari
ac7266a515
Merge pull request #151 from pcdummy/master
Install cherrypy/tornado from pip only if use_pip is True for salt-api.
9 vuotta sitten
René Jochum
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
Signed-off-by: René Jochum <rene@jochums.at>
9 vuotta sitten
puneet kandhari
b90fdc6f6a
Merge pull request #150 from pcdummy/master
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
9 vuotta sitten
René Jochum
8a1b8dc9db
Fix salt/api.sls.
Signed-off-by: René Jochum <rene@jochums.at>
9 vuotta sitten
René Jochum
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
Signed-off-by: René Jochum <rene@jochums.at>
9 vuotta sitten
Brian Jackson
779e6c9c63
Merge pull request #122 from matthew-parlette/master
Updated master.d/f_defaults for 2014.7
9 vuotta sitten
puneet kandhari
c21c204dd5
Merge pull request #147 from quixoten/fix_syntax_error
Fix syntax error
9 vuotta sitten
Devin Christensen
645b4c65ce
Fix syntax error
9 vuotta sitten
puneet kandhari
8fcb42819b
Merge pull request #146 from quixoten/fix_syndic
Fix syndic requisites
9 vuotta sitten
Devin Christensen
8479111cbd
Fix syndic requisites
The syndic service was depending upon itself, which caused the salt run
to fail. This commit fixes that by depending on the salt-master service
rather than the salt-syndic service. I also made it more general by
using IDs to specify the provider rather than the name, which is a bit
less reliable.
9 vuotta sitten
Nitin Madhok
c358d4d1d3
Merge pull request #145 from peterdemin/master
formulas.jinja: python 2.6 support
9 vuotta sitten
Petr Demin
eb421c676f
formulas.jinja: python 2.6 support
9 vuotta sitten
puneet kandhari
4eb6d87870
Merge pull request #144 from peterdemin/master
formulas.jinja: python 2.6 support
9 vuotta sitten
Petr Demin
d4180295e3
formulas.jinja: python 2.6 support
9 vuotta sitten
puneet kandhari
975dd08885
Merge pull request #143 from aboe76/slspath_variable
Remove hardcoded paths with {{ slspath }} variable
9 vuotta sitten
Niels Abspoel
6ec31374cb
Remove hardcoded paths with {{ slspath }} variable
9 vuotta sitten
Brian Jackson
62a13de7d5
Merge pull request #141 from willshersystems/develop
The git command line tool is a requirement of pygit2
9 vuotta sitten
Matt Willsher
1cf72d85f8
The git command line tool is a requirement of pygit2
9 vuotta sitten
puneet kandhari
8d8371f19d
Merge pull request #139 from willshersystems/centos
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
9 vuotta sitten
Matt Willsher
e2d192ba89
Improvements to Enterprise Linux family OSs.
* Install pygit from package
* Add Official Salt ZeroMQ 4 COPR repository
Note that Salt itself is assumed to already to be available to the system via yum, via EPEL for example
9 vuotta sitten
Forrest
bffb87c29f
Merge pull request #137 from puneetk/master
Remove Duplicates from defaults.yaml and map.jinja
9 vuotta sitten