genus
4ff1a746d6
Add master_type option
преди 9 години
genus
a738198d8b
Add verify_master_pubkey_sign
преди 9 години
genus
fffd30fe17
Add master_sign_pubkey option
преди 9 години
puneet kandhari
e5ad08ee1e
Merge pull request #156 from iggy/revert_bad
Revert bad
преди 9 години
Brian Jackson
4c1f57792a
Revert "Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip."
This reverts commit 7bb82b0178
.
преди 9 години
Brian Jackson
6e98d508c4
Revert "Fix salt/api.sls."
This reverts commit 8a1b8dc9db
.
преди 9 години
Brian Jackson
d216a3f651
Revert "Install cherrypy/tornado from pip only if use_pip is True."
This reverts commit 90282eff03
.
преди 9 години
Brian Jackson
8448aa4021
Revert "Fix stuff suggested by @iggy."
This reverts commit c5ae289fa1
.
преди 9 години
Brian Jackson
ed3ab22a13
Revert "Add support for GitPython and salt-ssh on FreeBSD masters"
This reverts commit b03831c0b0
.
преди 9 години
Brian Jackson
f9cb912a65
Revert "salt.api state fails"
This reverts commit 22b8dde1ff
.
преди 9 години
Brian Jackson
ef73e4ce98
Revert "Change variable lookup to match usage in other states"
This reverts commit 14b466e022
.
преди 9 години
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 години
Matthew X. Economou
14b466e022
Change variable lookup to match usage in other states
Done at the maintainer's request.
преди 9 години
puneet kandhari
af8c157e2b
Merge pull request #155 from Oro/patch-1
salt.api state fails
преди 9 години
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 години
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 години
puneet kandhari
96d820a5a0
Merge pull request #152 from pcdummy/master
Fix stuff suggested by @iggy .
преди 9 години
René Jochum
c5ae289fa1
Fix stuff suggested by @iggy .
Signed-off-by: René Jochum <rene@jochums.at>
преди 9 години
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 години
René Jochum
90282eff03
Install cherrypy/tornado from pip only if use_pip is True.
Signed-off-by: René Jochum <rene@jochums.at>
преди 9 години
puneet kandhari
b90fdc6f6a
Merge pull request #150 from pcdummy/master
Advance salt/api.sls, install rest_cherrypy or rest_tornado from pip.
преди 9 години
René Jochum
8a1b8dc9db
Fix salt/api.sls.
Signed-off-by: René Jochum <rene@jochums.at>
преди 9 години
René Jochum
7bb82b0178
Advance sal/api.sls, install rest_cherrypy or rest_tornado from pip.
Signed-off-by: René Jochum <rene@jochums.at>
преди 9 години
Brian Jackson
779e6c9c63
Merge pull request #122 from matthew-parlette/master
Updated master.d/f_defaults for 2014.7
преди 9 години
puneet kandhari
c21c204dd5
Merge pull request #147 from quixoten/fix_syntax_error
Fix syntax error
преди 9 години
Devin Christensen
645b4c65ce
Fix syntax error
преди 9 години
puneet kandhari
8fcb42819b
Merge pull request #146 from quixoten/fix_syndic
Fix syndic requisites
преди 9 години
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 години
Nitin Madhok
c358d4d1d3
Merge pull request #145 from peterdemin/master
formulas.jinja: python 2.6 support
преди 9 години
Petr Demin
eb421c676f
formulas.jinja: python 2.6 support
преди 9 години
puneet kandhari
4eb6d87870
Merge pull request #144 from peterdemin/master
formulas.jinja: python 2.6 support
преди 9 години
Petr Demin
d4180295e3
formulas.jinja: python 2.6 support
преди 9 години
puneet kandhari
975dd08885
Merge pull request #143 from aboe76/slspath_variable
Remove hardcoded paths with {{ slspath }} variable
преди 9 години
Niels Abspoel
6ec31374cb
Remove hardcoded paths with {{ slspath }} variable
преди 9 години
Brian Jackson
62a13de7d5
Merge pull request #141 from willshersystems/develop
The git command line tool is a requirement of pygit2
преди 9 години
Matt Willsher
1cf72d85f8
The git command line tool is a requirement of pygit2
преди 9 години
puneet kandhari
8d8371f19d
Merge pull request #139 from willshersystems/centos
Improved support for Enterprise Linux family OSs (CentOS, RHEL etc)
преди 9 години
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 години
Forrest
bffb87c29f
Merge pull request #137 from puneetk/master
Remove Duplicates from defaults.yaml and map.jinja
преди 9 години
puneet kandhari
145b58a9d3
Remove Duplicates from defaults.yaml and map.jinja
преди 9 години
Nitin Madhok
d16abf86b6
Merge pull request #135 from aboe76/fix_empty_formula_pillar
fix empty formulas list in pillar with empty dic.
преди 9 години
Niels Abspoel
14c262fdad
fix empty formulas list in pillar with empty dic.
преди 9 години
Niels Abspoel
efd15e0896
Merge pull request #134 from edvinasme/pillar-roots-format
Fix pillar_roots configuration format in master
преди 9 години
Edvinas Klovas
8992e15882
fix typo
преди 9 години
Edvinas Klovas
47b37f2ffb
Fix pillar_roots configuration format in master
This commit fixes how `pillar_roots` are generated and after this fix the
generated configuration does not contain any unnecessary new lines:
```yaml
pillar_roots:
base:
/srv/salt/dir1
dev:
/srv/salt/dir2
/srv/salt/dir3
locale:
/srv/salt/dir4
```
Before this commit the pillar_roots in `f_defaults.conf` for master would be
generated with a lot of empty lines in between directories, like this:
```yaml
pillar_roots:
base:
/srv/salt/dir1
dev:
/srv/salt/dir2
/srv/salt/dir3
local:
/srv/salt/dir4
```
The minion configuration is not affected and renders fine.
преди 9 години
Brian Jackson
b3db6e2a76
Merge pull request #133 from edvinasme/pillar-update
add pillar_roots for minion and master in pillar.example
преди 9 години
Edvinas Klovas
47b75d05c7
add pillar_roots for minion and master in pillar.example
преди 9 години
Wolodja Wentland
46f44c1dbe
Merge pull request #132 from txomon/patch-2
Cleanup template for easier user reading
преди 9 години
Javier Domingo
4344a1311b
Cleanup template for easier user reading
The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not
преди 9 години
Brian Jackson
54a5c85771
Merge pull request #129 from julienlavergne/setup
fixed missing add-apt-repository command when ubuntu is the server one
преди 9 години