Thomas S Hatch
b27d506792
Merge pull request #1114 from fatbox/typo_fix
...
fix typo in states/file.py
2012-04-20 10:45:13 -07:00
David Bishop
0e65c72706
fix typo in states/file.py
2012-04-20 13:40:53 -04:00
Thomas S Hatch
caafeec143
Merge pull request #1113 from emonty/replace-m2crypto
...
Update Pycrypto RSA code to deal with list return.
2012-04-20 10:34:36 -07:00
Monty Taylor
1d575107bb
Update Pycrypto RSA code to deal with list return.
2012-04-20 10:33:09 -07:00
Thomas S Hatch
4d6b369ba9
Merge pull request #1112 from emonty/replace-m2crypto
...
Replace M2Crypto RSA with PyCrypto.
2012-04-20 09:58:33 -07:00
Thomas S Hatch
63f2cfa542
Fix sys.doc printout problems with iter returns
2012-04-20 10:55:21 -06:00
Monty Taylor
3867ffb3ef
Replace M2Crypto RSA with PyCrypto.
...
M2Crypto has been abandonded upstream, has many outstanding bugs,
and doesn't build unpatched on Fedora. Since the only thing M2Crypto
is being used for in the salt codebase is RSA support, using the PyCrypto
RSA module instead is pretty straight forward. Additionally, the RSA
module uses sign/verify terminology around our use of private encrypting
known tokens for verification purposes rather than private_encrypt and
public_descrypt, which makes reading the intent a little clearer.
2012-04-20 09:30:33 -07:00
Thomas S Hatch
c465be13a3
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-04-20 10:27:27 -06:00
Thomas S Hatch
ed276a8036
make the minion ids more random
...
The tempfile only checks for local unique values, this adds an extra
layer of random data making the ids more scalable
2012-04-20 10:25:26 -06:00
Thomas S Hatch
5525156858
Merge pull request #1111 from fatbox/vm-info
...
Allow virt.vm_info to return info for a single VM or all VMs
2012-04-20 09:23:07 -07:00
Evan Borgstrom
de50d2ca18
Allow vm_info to return info for a single VM or all VMs
2012-04-20 12:12:11 -04:00
Thomas S Hatch
d2fe9215a4
Merge pull request #1110 from fatbox/fix-sed-inplace
...
Oops, missed the trailing space on the last commit.
2012-04-20 08:36:55 -07:00
Evan Borgstrom
021bad539c
Oops, missed the trailing space
2012-04-20 11:34:40 -04:00
Thomas S Hatch
44c90ef7ed
Merge pull request #1109 from fatbox/fix-sed-inplace
...
If no backup file is specified we should still edit in place
2012-04-20 08:33:21 -07:00
Evan Borgstrom
10a1e2f4e7
If no backup file is specified we should still edit in place
...
Otherwise sed just dumps the output to STDOUT.
We don't want backups when we're editing a lot of conf files because
they can often conflict when you're including a conf dir.
2012-04-20 11:28:47 -04:00
Thomas S Hatch
f1ad3349b2
Merge pull request #1107 from UtahDave/add_win_pkg.py
...
Initial commit of win_pkg.py
2012-04-19 22:51:54 -07:00
David Boucha
777a7ec6e8
Initial commit of win_pkg.py
...
Stub out all the required functions for pkg
Implement pkg.list_pkgs
Verify pkg.version works
2012-04-19 22:42:58 -06:00
Thomas S Hatch
e0692c2b3d
Fix trace when target file is new in a recurse check
2012-04-19 22:21:20 -06:00
Thomas S Hatch
bb6bae9f2c
Fix memory issue in recurse check
2012-04-19 22:03:40 -06:00
Thomas S Hatch
b554a64e59
don't fail on requisites when it is just a test return
2012-04-19 21:31:27 -06:00
Thomas S Hatch
ad4d16c034
Test returns are yellow
2012-04-19 21:13:53 -06:00
Thomas S Hatch
d51b7784c6
the real name, not the string name
2012-04-19 21:02:17 -06:00
Thomas S Hatch
32acf6c27f
Fix test interface to return None in pkg state
2012-04-19 20:51:34 -06:00
Thomas S Hatch
579e923b99
Clean bad ref in ssh_auth test interface
2012-04-19 20:46:23 -06:00
Thomas S Hatch
b2018ccf49
Cleaan up some inconsitancies in the file state's test system
2012-04-19 20:43:23 -06:00
Thomas S Hatch
413fc33219
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-04-19 20:29:30 -06:00
Thomas S Hatch
87f43de128
Merge pull request #1106 from jhutchins/develop
...
Prevent use and use_in from adding requiresite args
2012-04-19 19:12:07 -07:00
Jeff Hutchins
faae601abf
Prevent use and use_in from adding requiresite args
...
This prevents use of use_in from adding require, require_in,
watch, watch_in, use or use_in arguments when agmenting the
aregument list. In geneneral you probably don't want to be
sharing these settings between states, but momre importantly
without this if you use_in and require the same state it will
create a dependancy loop where the state requires itself.
2012-04-19 17:49:12 -06:00
Thomas S Hatch
f62c9512a1
Fix up pkg state errors in test interface
2012-04-19 17:37:27 -06:00
Thomas S Hatch
d848f6dde1
Add hooks the state test interface
2012-04-19 17:32:45 -06:00
Thomas S Hatch
c309e0fe73
initial addition of the test system has been added
2012-04-19 17:23:56 -06:00
Thomas S Hatch
81a948a615
pass correct mode
2012-04-19 16:45:18 -06:00
Thomas S Hatch
86493ab676
dd the tail to _check_recurse
2012-04-19 16:38:58 -06:00
Thomas S Hatch
b7f09a7875
Add test for file.recurse, only one more function before testing!
2012-04-19 16:17:21 -06:00
Thomas S Hatch
a2d888ec43
Add check for file.absent
2012-04-19 13:30:39 -06:00
Thomas S Hatch
d8b85275bc
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-04-19 13:10:12 -06:00
Thomas S Hatch
b6b8db2c95
Add test for file.managed
2012-04-19 13:09:48 -06:00
Thomas S Hatch
735b5b4797
Merge pull request #1105 from rentalita/develop
...
Call update-rc.d with "remove" to disable a service.
2012-04-19 11:43:33 -07:00
Tom Vaughan
d0030677e6
Call update-rc.d with "remove" to disable a service. Also required by #1103 .
2012-04-19 15:37:20 -03:00
Thomas S Hatch
b8218e7a82
Merge pull request #1104 from rentalita/develop
...
Don't call update-rc.d with -n (aka "not really"). Fixes #1103 .
2012-04-19 11:31:28 -07:00
Tom Vaughan
90b87c0806
Don't call update-rc.d with -n (aka "not really"). Fixes #1103 .
2012-04-19 15:21:48 -03:00
Thomas S Hatch
6a8675d68d
Add user and group to file.stats
2012-04-19 11:29:03 -06:00
Thomas S Hatch
aafd9477df
Make use and use_in not set up watchers
2012-04-18 18:08:14 -06:00
Thomas S Hatch
94906acdd3
Start refactoring file.managed state
2012-04-18 18:04:27 -06:00
Thomas S Hatch
c537276670
Add test to file.touch
2012-04-18 16:12:10 -06:00
Thomas S Hatch
58865de911
Add test to file.{comment,uncomment,sed,append}
2012-04-18 15:37:37 -06:00
Thomas S Hatch
fe65d9c352
Add checks for file.absent and file.symlink
2012-04-18 15:17:36 -06:00
Thomas S Hatch
216a80ecf7
return test info
2012-04-18 15:04:53 -06:00
Thomas S Hatch
d8093350c0
Add target to file stats
2012-04-18 14:18:59 -06:00
Thomas S Hatch
69a22af7de
Set the identity on the minions
...
This prevents ram overusage in the master pub interface when using the
WAN autohealing system, this fixes #1094 , make sure the master has also
been updated or this could cause a larger memory leak on the master
2012-04-18 13:15:39 -06:00