Commit Graph

4306 Commits

Author SHA1 Message Date
Thomas S Hatch
5d75091788 Add run_salt and run_run to ShellCase 2012-04-21 17:52:29 -06:00
Thomas S Hatch
8276c2548b Change name of clicase to shellcase 2012-04-21 17:51:41 -06:00
Thomas S Hatch
7530f39269 Add some more key tests 2012-04-21 17:47:04 -06:00
Thomas S Hatch
98027c3fb6 Add initial salt-key test 2012-04-21 17:31:46 -06:00
Thomas S Hatch
e301fee420 Add shell tests and shellCase to test structure 2012-04-21 17:27:59 -06:00
Thomas S Hatch
4f3fbe0991 remove unused import 2012-04-21 17:02:18 -06:00
Thomas S Hatch
788eeaa313 Initial addition of CLITest interface 2012-04-21 16:58:03 -06:00
Thomas S Hatch
1e3754878c We can't use Crypto.Random, it is not on Ubuntu 10.04 2012-04-21 15:44:21 -06:00
Thomas S Hatch
bdb9dce5b8 Migrate clean_old_key to m2crypto 2012-04-21 15:20:31 -06:00
Thomas S Hatch
79e5210791 forgot to delete a line from pycrypto rsa 2012-04-21 15:15:00 -06:00
Thomas S Hatch
eff047cf88 Fix method name in master keys 2012-04-21 15:13:39 -06:00
Thomas S Hatch
e7c4289271 no crypt cipher needed for key saving 2012-04-21 15:10:57 -06:00
Thomas S Hatch
c4e28d529d Ref minion.pem on minion side Auth 2012-04-21 15:10:13 -06:00
Thomas S Hatch
01265e4372 Fix error in open mode behavior 2012-04-21 15:03:20 -06:00
Thomas S Hatch
5de3e19044 revert minion payload to m2crypto 2012-04-21 14:57:29 -06:00
Thomas S Hatch
a4199ad6dd load_key does not take the cipher type arg 2012-04-21 14:50:22 -06:00
Thomas S Hatch
e93f5ffccd Fix bad variable in crypto update 2012-04-21 14:49:32 -06:00
Thomas S Hatch
8ecddb972e Change master.py to use M2Crypto 2012-04-21 14:47:05 -06:00
Thomas S Hatch
678795f938 move crypt.py back to M2Crypto 2012-04-21 14:41:07 -06:00
Thomas S Hatch
ad0a741dfd remove unused KDF import, Fix # 1116 2012-04-21 12:45:41 -06:00
James E. Blair
3b3e37de98 Add modules to handle /etc/aliases.
Provides a simple interface to manage standard /etc/aliases files.
Compatible with exim, postfix, or sendmail (runs newaliases if
needed).

Loosely based on the existing /etc/hosts support.
2012-04-21 01:46:54 +00:00
Thomas S Hatch
8ebcf66b1c Read in the old, bad, M2Crypto keys and clean them up for pycrypto 2012-04-20 17:42:43 -06:00
Thomas S Hatch
24bdca62c1 more bad printing 2012-04-20 16:25:53 -06:00
Thomas S Hatch
5a0e74b10c print line is not python2 compat 2012-04-20 15:58:09 -06:00
Thomas S Hatch
218cdb1275 Merge pull request #1115 from emonty/tox-and-python3
Tox and python3
2012-04-20 13:30:13 -07:00
Monty Taylor
c9950cc571 Clean up code for 3.2 2012-04-20 13:20:51 -07:00
Monty Taylor
12fd1315f8 Add tox config.
Add a config file for tox to enable running salt tests in a set of
virtualenvs for different versions of python. Add stanzas to allow
for running tests against 2.6, 2.7 and 3.2.

First step - pip install tox. Then, to run tests in a virtualenv
against all three, simply type:

tox

If you want to  run against just one, try:

tox -epy26

And if you want to see more, do:

tox -v -epy26
2012-04-20 13:19:39 -07:00
Thomas S Hatch
c720526932 Fix oversight in peer verification 2012-04-20 14:15:44 -06:00
Thomas S Hatch
8b8083448f Merge branch 'develop' of github.com:saltstack/salt into develop 2012-04-20 12:02:03 -06:00
Thomas S Hatch
c4b449949d Add random regen at SAuth fork 2012-04-20 12:01:39 -06:00
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