valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,231 Commits 24 Branches 182 Tags 341 MiB
e1a619df0c
Commit Graph

4231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
e1a619df0c Claen up lchar detection 2012-04-25 15:06:33 -06:00
Thomas S Hatch
a750d2359f make more python like 2012-04-25 14:04:36 -06:00
Thomas S Hatch
6ec527809e make file.contains more awesome 2012-04-25 14:00:40 -06:00
Thomas S Hatch
7490a78645 change file states to use new contains api 2012-04-25 13:46:41 -06:00
Thomas S Hatch
a5d5ce7384 Change file.contins to be non destructive 2012-04-25 13:37:49 -06:00
Thomas S Hatch
0c3ccb4955 fix #1097 2012-04-25 12:32:29 -06:00
Thomas S Hatch
518350c805 Catch tracebacks in states and make them failues 
This fixes #1089 and also dramatically changes part of the opld
behavior, it used to be that a traceback would stop a state run but now
the traceback data will be returned in the comment field
 2012-04-25 12:25:23 -06:00
Thomas S Hatch
bdfa9ba9fa Add test interface to network state 2012-04-25 11:34:12 -06:00
Thomas S Hatch
81cf780517 Last commit was the wrong file 2012-04-25 11:15:43 -06:00
Thomas S Hatch
e37f315545 Fix refs to jinja and use get_template 2012-04-25 11:14:13 -06:00
Thomas S Hatch
ae3feaefd1 Merge pull request #1137 from jhutchins/add_templates_back 
Add templates back
 2012-04-25 09:38:30 -07:00
Jeff Hutchins
f433c136ba Rename rh_network folder to rh_ip 2012-04-25 10:35:48 -06:00
Jeff Hutchins
3b69d3c557 Fix setup so it will actually install templates 2012-04-25 10:15:22 -06:00
Jeff Hutchins
418c161aaa Add package data to the setup 2012-04-25 10:06:13 -06:00
Jeff Hutchins
4d09aac68f Revert "Modify template loading" 
This reverts commit 2ddd36f696.

Conflicts:

	salt/modules/rh_ip.py
	salt/modules/rh_netcfg.py
	salt/modules/rh_network.py
 2012-04-25 09:56:07 -06:00
Thomas S Hatch
1bd6fd7e38 Add M2Crypto back to the requirement.txt 2012-04-25 02:12:38 -06:00
Thomas S Hatch
79f874ad5e Add alias to the docs tree 2012-04-25 02:05:53 -06:00
Thomas S Hatch
1807890077 stray print statement 2012-04-25 01:54:02 -06:00
Thomas S Hatch
f29869289c Add import comments 2012-04-25 01:52:53 -06:00
Thomas S Hatch
5b813ffff3 Might be time to go to bed... 2012-04-25 01:49:45 -06:00
Thomas S Hatch
5355d96df7 missed a : 2012-04-25 01:47:58 -06:00
Thomas S Hatch
0826a8c1cc double ip? 2012-04-25 01:47:15 -06:00
Thomas S Hatch
c0615c206c Add import commants 2012-04-25 01:44:31 -06:00
Thomas S Hatch
e4bce16aad remove file client tempfiles 2012-04-25 01:41:24 -06:00
Thomas S Hatch
94ad4a31ed catch string based tempfiles in templates 2012-04-25 01:36:53 -06:00
Thomas S Hatch
8316532a57 clean up tempfiles in utils/templates 2012-04-25 01:26:53 -06:00
Thomas S Hatch
ccfbbded75 clean up file descriptors in template lib 2012-04-25 01:21:57 -06:00
Thomas S Hatch
5b1bde8a49 make fd_ more standard 2012-04-25 01:20:49 -06:00
Thomas S Hatch
f00596a7c0 Trying out ip for size, argue soon or it will stay 2012-04-25 01:05:30 -06:00
Thomas S Hatch
ba6ed0e514 change the network module in cross calls to netcfg 2012-04-25 00:54:07 -06:00
Thomas S Hatch
2ddd36f696 Modify template loading 
Having the templates in seperate files is fine with me, btu we will need
to figure out how to cleanly load them via the setup.py.
rh_network's __virtual__ function was returning network, this created a
collision with the network module, I have renamed it to netcfg. I know I
am an Archer, so if anyone has any suggestions how to rename the netcfg
module I am all ears
 2012-04-25 00:50:53 -06:00
Thomas S Hatch
3cac1bd90e some whitespace 2012-04-24 23:48:17 -06:00
Thomas S Hatch
899f57ce81 Merge pull request #1134 from bretep/networkstate 
Networkstate
 2012-04-24 22:31:19 -07:00
Thomas S Hatch
4662fea037 Merge pull request #1135 from twalk482/patch-1 
Update salt/modules/win_pkg.py
 2012-04-24 21:56:38 -07:00
twalk482
7ff3db6386 Update salt/modules/win_pkg.py 2012-04-24 20:15:24 -07:00
Bret Palsson
788bbaab8e Merge pull request #4 from jhutchins/networkstate 
Networkstate
 2012-04-24 19:05:35 -07:00
Thomas S Hatch
a05f6d067d Add test=True powers to state.single 2012-04-24 17:53:43 -06:00
Thomas S Hatch
3c59dcc744 Make state.single colored! 2012-04-24 17:39:58 -06:00
Thomas S Hatch
5d136a9f61 Add a function to one off a state call 2012-04-24 15:59:34 -06:00
Thomas S Hatch
9b4af6d12c Merge pull request #1132 from rentalita/develop 
Use return code to determine service status in Upstart module.
 2012-04-24 14:23:21 -07:00
Tom Vaughan
f5cb036daa Use return code to determine service status in Upstart module. 
This also broke the "dead" state.

This is because `service` will call `/etc/init.d/<service-name>` for
System V style services. Each of which could have different output.

For example:

    $ sudo invoke-rc.d exim4 stop
     * Stopping MTA                                               [ OK ]
    $ sudo service exim4 status
     * checking separate queue runner daemon...                   [ OK ]
     * checking combined SMTP listener and queue runner daemon... [ OK ]
    $ echo $?
    3
    $ sudo invoke-rc.d exim4 start
     * Starting MTA                                               [ OK ]
    $ sudo service exim4 status
     * checking separate queue runner daemon...                   [ OK ]
     * checking combined SMTP listener and queue runner daemon... [ OK ]
    $ echo $?
    0
 2012-04-24 18:19:57 -03:00
Thomas S Hatch
1cd182bfbb Merge pull request #1131 from rentalita/develop 
Restrict APT package version search to "Version".
 2012-04-24 12:52:02 -07:00
Tom Vaughan
18b7cb742e Restrict APT package version search to "Version". 
For example, `python-setuptools` has both:

    Version: 0.6.24-1ubuntu1
    Python-Version: 2.6, 2.7

and version winds-up as "2.7".
 2012-04-24 16:46:04 -03:00
Thomas S Hatch
7278c06761 Merge pull request #1130 from rentalita/develop 
Two for the price of one.
 2012-04-24 10:22:21 -07:00
Tom Vaughan
20569986d2 Read public key before it is removed. 2012-04-24 12:23:18 -03:00
Tom Vaughan
4292c340e8 Replace shell-isms with python-isms in Upstart service module. 
Everything in salt/modules/upstart.py is run on the minion. Previously
it looked like the 'cmd.run' and 'cmd.retcode' were RPC-like
calls. But that's not the case... Assume at least Python 2.6 and only
the stdlib.
 2012-04-24 12:15:52 -03:00
Jeff Schroeder
5789a02fc2 Merge pull request #1129 from logic/develop 
nginx.version fails on Fedora 16
 2012-04-24 05:25:43 -07:00
Ed Marshall
5927ddfa9c Nginx version numbers only have a single colon, at least on Fedora 16. Just return the last element instead. 2012-04-24 01:24:56 -05:00
Thomas S Hatch
c05e0b1cab Treebeard says: "That wizard should know better" 2012-04-23 21:38:04 -06:00
Thomas S Hatch
817a035a59 Merge pull request #1128 from rentalita/develop 
Fix typo (more or less) in recent commit.
 2012-04-23 20:25:21 -07:00