Commit Graph

2244 Commits

Author SHA1 Message Date
Thomas S Hatch
6c60d1a5ea Fix trace if watch used when there is no watcher function 2011-12-27 21:40:03 -07:00
Jeff Schroeder
5afd19c63c Fix an annoying buglet in TxtOutputter
Also clean up a few logs to use python 3.x string formatting
2011-12-27 19:44:18 -08:00
Thomas S Hatch
f5c07dfbea Throw error is specifed sls is not available 2011-12-27 20:02:55 -07:00
Jeff Schroeder
bb0629e690 Handle Ctrl-c on the syndic or regular minion and log it
- Log a message when the syndic or minion is exiting
    - Cleanly exit and use the same message on all daemons
    - Add places to handle a sigterm or sighup by KeyboardInterrupt
2011-12-27 17:00:52 -08:00
Thomas S Hatch
ab01c7963f Merge pull request #400 from UtahDave/patch-1
Added memory info for Windows.
2011-12-27 15:50:11 -08:00
Jeff Schroeder
c1b3ee3580 Cleanup _ps() in the grains core module 2011-12-27 15:22:59 -08:00
Jeff Schroeder
d8d27ce608 Try various uname flags to get the arch
Some systems such as Debian or Ubuntu don't always support
'uname -m'. When this is the case, fall back to 'uname -p'
and then finally fall back to 'uname -i' to get the  arch.
2011-12-27 15:21:35 -08:00
Jeff Schroeder
a1d4c99e49 Cleanup some code in {master,minion}.py
- General code cleanups
    - Add some more logging or update existing logging
2011-12-27 15:21:09 -08:00
Jeff Schroeder
b2fec1482c Fix some code broken during grain refactoring
I'm looking at you Christer :)
2011-12-27 15:14:57 -08:00
Jeff Schroeder
a75031c5af Fix some comment formatting someone else "fixed" 2011-12-27 14:53:39 -08:00
Jeff Schroeder
3c2e6197d2 Switch a few needless lists into tuples 2011-12-27 14:53:33 -08:00
Jeff Schroeder
4314abd546 Quiet down minion startup
__salt__['cmd.run'] needs to be quiet when running inside the
grains so add a quiet flag to salt.modules.cmd._run and use it.

NOTE: This also quiets down the INFO messages displayed when
      running a command such as: salt-call -g
2011-12-27 14:52:16 -08:00
Corey Quinn
55a806deb6 Testing init scripts 2011-12-27 13:31:13 -08:00
Corey Quinn
582b7a9bab Testing init scripts 2011-12-27 13:30:08 -08:00
Corey Quinn
69661e3b39 Renamed init scripts properly 2011-12-27 12:49:03 -08:00
Thomas S Hatch
9cbb0485fe Merge pull request #401 from UtahDave/patch-2
On Windows the salt-minion seems to run just fine even as a regular user...
2011-12-27 12:34:55 -08:00
Corey Quinn
e5f5bb3c2b Set the scripts to be executable 2011-12-27 12:02:09 -08:00
David Boucha
5dbe6963c4 Switched to using __salt__['cmd.run'] instead of subprocess per the request by Jeff 2011-12-27 12:36:00 -07:00
Corey Quinn
8c368f66ea Missing some deps, cleaned up a couple silly typos 2011-12-27 11:18:04 -08:00
David Boucha
2c1f867a46 On Windows the salt-minion seems to run just fine even as a regular user.
It's possible to check for an admin user using ctypes-    print ctypes.windll.shell32.IsUserAnAdmin(), but it isn't helpful because unless the administrator opened up the terminal as an admin, it will always return 0.

So unless further testing reveals that salt MUST be run as an administrator, check_root() should just return true when on Windows.
2011-12-27 12:11:13 -07:00
David Boucha
7dc6986fed Added memory info for Windows. 2011-12-27 11:48:25 -07:00
Corey Quinn
3cf980ed09 Merge branch 'develop' of https://github.com/saltstack/salt into debpackages 2011-12-27 08:54:16 -08:00
Thomas S Hatch
77cdf0bf08 Merge pull request #399 from KB1JWQ/debpackages
Fixed Debian - Ubuntu packages
2011-12-27 08:45:36 -08:00
Thomas S Hatch
b635705665 Merge pull request #397 from whiteinge/salt-yumdelimiter
Changed default package name delimiter on yum module for consistency
2011-12-27 08:44:35 -08:00
Corey Quinn
60e75873db Merge remote branch 'upstream/develop' into debpackages 2011-12-27 06:59:08 -08:00
Corey Quinn
0a60dfd855 Got the wildcarding correct finally 2011-12-27 05:21:48 -08:00
Corey Quinn
e68196e0e4 Fixed rules file 2011-12-27 05:15:14 -08:00
Corey Quinn
6a48404458 Fixed a wildcard 2011-12-27 04:59:44 -08:00
Corey Quinn
c974b0f5c8 Fixed typo 2011-12-27 04:56:22 -08:00
Corey Quinn
439550e8ed Removed extra AUTHORS file 2011-12-27 04:53:13 -08:00
Corey Quinn
f2b664589e Added original creation script 2011-12-27 04:52:04 -08:00
Corey Quinn
3581d3e343 Fixed control file 2011-12-27 04:03:04 -08:00
Corey Quinn
b5dfe80ef3 Fixed changelog 2011-12-27 03:55:12 -08:00
Corey Quinn
b7893fc199 Fixed changelog 2011-12-27 03:53:31 -08:00
Corey Quinn
6be41a0e2e Updated changelog 2011-12-27 03:44:19 -08:00
Corey Quinn
976fcedc4d Removed useless patches directory 2011-12-27 03:37:41 -08:00
Corey Quinn
8ce0f3f16c Removed .pc tree 2011-12-27 03:35:30 -08:00
Corey Quinn
877f60df3d Removed unnecessary files for packaging 2011-12-27 01:48:13 -08:00
Seth House
f09005021a Changed default package name delimiter on yum module for consistency
Most of the package modules will accept multiple package names delimited
by a space. E.g., ``aptitude install p1 p2 p3`` works and so ``salt '*'
pkg.install 'p1 p2 p3'`` also works.

There's a fallback so any existing code delimited by a comma will still
work. Perhaps this should be added to the other package modules since
it's nice not having to surround with quotes.

That said, there's a subtle difference between calling ``yum install p1
p2 p3`` and calling ``yum install p1; yum install p2; yum install p3``
(this module essentially does the latter) and I'm not sure if that's a
problem or how best it should be reconciled.
2011-12-27 00:12:17 -07:00
Thomas S Hatch
91fb577465 make loader check work on non-unix systems 2011-12-26 22:54:13 -07:00
Thomas S Hatch
9a3ac42232 preliminary windows detection 2011-12-26 22:53:40 -07:00
Thomas S Hatch
8adce94107 Add support to get local file hash 2011-12-26 22:52:46 -07:00
Corey Quinn
0c377230ad Fixed lintian errors on package build 2011-12-26 16:34:06 -08:00
Thomas S Hatch
d890fecde0 Repair issue with 0 byte files 2011-12-26 16:17:42 -07:00
Corey Quinn
b3042c4224 Fixup and added links 2011-12-26 13:35:22 -08:00
Corey Quinn
2eaa2c83c8 Fixed pathing 2011-12-26 13:27:25 -08:00
Corey Quinn
8b90e21e2c Fixed initscript 2011-12-26 13:23:13 -08:00
Corey Quinn
e5d8796f61 Fixed up install and manpages 2011-12-26 13:20:08 -08:00
Corey Quinn
7a57caf981 Missed a comma 2011-12-26 10:55:16 -08:00
Thomas S Hatch
3570db8c6c getting back in the mix :) 2011-12-26 08:25:14 -07:00