Commit graph

2550 commits

Author SHA1 Message Date
Thomas S Hatch
7b16bc18be take msgpack out of the setup.py 2012-01-20 19:30:57 -07:00
Thomas S Hatch
77a66402bb move runas to the last arg 2012-01-20 11:25:16 -07:00
Thomas S Hatch
6eb94f9914 look for extension grains 2012-01-20 10:48:11 -07:00
Thomas S Hatch
a1d672cdcb Set up extension_modules opts before loading grains 2012-01-20 10:45:37 -07:00
Thomas S Hatch
532d868fa5 add docs files to the tarball 2012-01-20 10:22:21 -07:00
Thomas S Hatch
22894b373b remove cytest from setup.py 2012-01-20 09:37:46 -07:00
Thomas S Hatch
3f480bfe3b Merge pull request #550 from archtaku/develop
Added ability to run command as another user
2012-01-20 08:18:38 -08:00
Erik Johnson
2262db9468 updated to reflect changes in commit 93423aa2e5 2012-01-20 04:49:22 -06:00
Erik Johnson
93423aa2e5 added ability to run a command as another user 2012-01-20 02:17:42 -06:00
Thomas S Hatch
8fdf7dbfbc Merge pull request #548 from Lanzaa/develop
Salt is now platform dependent. Use get_python_lib(1)
2012-01-19 22:56:57 -08:00
Thomas S Hatch
ad3f74c2c7 update outputter for new data in running tag 2012-01-19 16:53:41 -07:00
Erik Johnson
880a8456ae Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-01-19 17:49:22 -06:00
Thomas S Hatch
43c6057118 Add more data to running tag in state compiler - fixes names bug 2012-01-19 16:42:29 -07:00
Colin B.
21d757ba73 Salt is now platform dependent. Use get_python_lib(1) 2012-01-19 14:01:53 -08:00
Thomas S Hatch
cb80f70cdb Merge pull request #543 from rubic/develop
updated documentation for user, fixed configuration template links
2012-01-18 21:30:21 -08:00
Jeff Bauer
d67c7f5613 updated documentation for user, fixed configuration template links 2012-01-18 23:04:48 -06:00
Thomas S Hatch
9efc214f8e Merge pull request #542 from fatbox/develop
Minor documentation correction on 'context' & 'defaults'
2012-01-18 18:56:40 -08:00
Evan Borgstrom
e640764e21 Allow file.sed to utilize regular expressions that are greedy
This is a slight change to the logic for detecting an edit that allows
for greedy regular expressions.

My use case for this is removing ldap from nsswitch.conf.

    nsswitch_passwd:
      file:
        - sed
        - name: /etc/nsswitch.conf
        - before: '^passwd:.*'
        - after: 'passwd:		files'

Previously `__salt__['file.contains'](name, before, limit)` would return
the updated line because the regexp was greedily matching the after
line. This meant it would re-apply the edit on every application of the
state.
2012-01-18 20:40:11 -05:00
Evan Borgstrom
c8075b3cd5 Merge remote branch 'upstream/develop' into develop 2012-01-18 18:42:00 -05:00
Evan Borgstrom
1cffa188e5 Minor documentation correction on 'context' & 'defaults'
To ensure the YAML structure correctly assigns 'context' & 'defaults' as
dicts the elements under context & defaults need an extra set of
indents.

Example:

- example:
  test: 1

Compiles to: [{'example': None, 'test': 1}]

While:

- example:
    test: 1

Correctly compiles to: [{'example': {'test': 1}}]
2012-01-18 18:38:29 -05:00
Thomas S Hatch
c77a170e6d Merge pull request #541 from fatbox/develop
Allow the mysql module to be configured by a default_file
2012-01-18 14:38:09 -08:00
Evan Borgstrom
18569c45c6 Allow the mysql module to be configured by a default_file
This allows MySQL to be configured via a default file instead of by
specifying the parameters individually in the minion config.

Debian creates a file name /etc/mysql/debian.cnf that contains
credentials for a user equivilent to 'root' so this allows for very
convenient configuration of a minion.
2012-01-18 17:34:53 -05:00
Thomas S Hatch
d113d1b442 Merge branch 'develop' of https://github.com/rubic/salt into rubic-develop 2012-01-18 14:52:42 -07:00
Jeff Bauer
8628876f80 add user to master config 2012-01-18 15:07:57 -06:00
Jeff Bauer
30308b6a5b run salt in user space 2012-01-18 14:29:38 -06:00
Thomas S Hatch
73842f5e1c Merge https://github.com/KB1JWQ/salt into KB1JWQ-dfd82ad 2012-01-18 13:28:26 -07:00
Corey Quinn
a496e46227 Merge branch 'master' of github.com:KB1JWQ/salt 2012-01-18 12:16:06 -08:00
Corey Quinn
dfd82ad0bd Debian/Ubuntu package for upstream acceptance
Applying latest changes for packaging

Fixed typos in man pages

Latest round of changes

More packaging fixups

Fixed salt-common typo

Fixed wildcarding in install files

Removed extra man pages

Removed trailing slash

Fixed links

Moved binaries to proper packages

Fixed man pages

Pathing

Perms tweak

Missing files

Fixed spacing

Fixed another lintian error

build the msgpack stuff

Updating rules and install files

Fixed shebang

Control updates

Fixed copyright file

Fixed lintian

Fixed overrides

cmd.retcode no longer uses subprocess.call since it is broken

fix issue with source_hash and trailing whitespace

Bye-bye pickle, hello msgpack

Add docs for new source powers

Add support for source_hash to be a source hash string

add pure python template type

add return clarifying that no states were found if no states are found

change some strings to use format

add code to cache jobs on the minion if option is set

serialize cache data

was caching the wrong line data

Add cache_jobs to the minion config template

add docs for new config param cache_jobs

make the minions return to the master in addition to returning to
returners

Add capability to designate multiple returns

only run the apache module if apachectl is installed

only load solr module if solr is installed

Debug statement used the wrong variable.

Only load nginx on machines that have nginx installed

Make it more like the apache module
2012-01-18 12:15:01 -08:00
Corey Quinn
61271bf53b Fixed overrides 2012-01-18 11:54:33 -08:00
Corey Quinn
f81e8810ae Fixed lintian 2012-01-18 10:42:07 -08:00
Thomas S Hatch
e5d0214205 Merge pull request #533 from syphernl/develop
Only load nginx on machines that have nginx installed
2012-01-18 10:19:20 -08:00
Corey Quinn
fdd4414603 Fixed copyright file 2012-01-18 10:14:47 -08:00
Frank Klaassen
a2ff2e9cf7 Make it more like the apache module 2012-01-18 19:10:24 +01:00
Frank Klaassen
afc975f7ab Only load nginx on machines that have nginx installed 2012-01-18 19:09:20 +01:00
Thomas S Hatch
80af540ac8 Merge pull request #532 from byronclark/develop
Debug statement used the wrong variable.
2012-01-18 08:29:14 -08:00
Byron Clark
46c7798003 Debug statement used the wrong variable. 2012-01-18 09:22:18 -07:00
Thomas S Hatch
21f20b1258 only load solr module if solr is installed 2012-01-18 00:38:53 -07:00
Thomas S Hatch
172b3037d4 only run the apache module if apachectl is installed 2012-01-18 00:28:10 -07:00
Thomas S Hatch
7269f98881 Add capability to designate multiple returns 2012-01-18 00:18:09 -07:00
Thomas S Hatch
8e5a3a2ae6 make the minions return to the master in addition to returning to
returners
2012-01-18 00:12:28 -07:00
Thomas S Hatch
f89e89d850 add docs for new config param cache_jobs 2012-01-18 00:04:14 -07:00
Thomas S Hatch
302857aca0 Add cache_jobs to the minion config template 2012-01-17 23:59:01 -07:00
Thomas S Hatch
1e13d5b12e was caching the wrong line data 2012-01-17 23:56:45 -07:00
Thomas S Hatch
d925e4f5ce serialize cache data 2012-01-17 23:49:57 -07:00
Thomas S Hatch
b2151521bb add code to cache jobs on the minion if option is set 2012-01-17 23:45:42 -07:00
Thomas S Hatch
f63a38d025 change some strings to use format 2012-01-17 23:26:39 -07:00
Thomas S Hatch
f5dd9ce234 add return clarifying that no states were found if no states are found 2012-01-17 22:46:21 -07:00
Thomas S Hatch
dc2ab21714 add pure python template type 2012-01-17 22:28:21 -07:00
Thomas S Hatch
8767338eb5 Add support for source_hash to be a source hash string 2012-01-17 21:52:15 -07:00
Thomas S Hatch
12791e69a7 Add docs for new source powers 2012-01-17 21:43:04 -07:00