Commit Graph

13338 Commits

Author SHA1 Message Date
Thomas S Hatch
a57a3b330c Merge pull request #4997 from s0undt3ch/develop
Improved handling of dns_check
2013-05-12 11:08:50 -07:00
Thomas S Hatch
75cf2d6726 Merge pull request #4992 from aboe76/salt_job_print_user
Feauture: Salt runner jobs.py add user to active and printed jobs.
2013-05-12 11:04:36 -07:00
Thomas S Hatch
57fa072c9b Merge pull request #4991 from virtua-network/develop
salt/grains : fix detection of osrelease for SmartOS
2013-05-12 11:03:11 -07:00
Pedro Algarvio
377d99c52d Complete the fix for #4980 started in 31b2574194
* Minor PEP8 and formatting changes.
2013-05-12 18:14:47 +01:00
Pedro Algarvio
b440f94e9d Catch more socket errors. Fixes saltstack/salt-bootstrap#122 2013-05-12 17:46:58 +01:00
Pedro Algarvio
58ed502ff1 Handle DNS check issues. Fixes #4988. Refs saltstack/salt-bootstrap#122. 2013-05-12 17:40:32 +01:00
Pedro Algarvio
d28d0300d9 Don't just exit! Allow the exit to be catch and be handled on the CLI code. 2013-05-12 17:39:07 +01:00
Pedro Algarvio
5a99b3938a Minor formating changes. 2013-05-12 17:29:05 +01:00
Pedro Algarvio
55d17f8bb1 Make our life easier when passing an exit code and message to SaltSyetemExit. 2013-05-12 17:28:06 +01:00
Pedro Algarvio
98081bdb62 Merge pull request #4996 from techhat/apache
Adding htpasswd functions to apache execution module
2013-05-12 08:50:33 -07:00
Joseph Hall
2c58056383 Add options to useradd in apache.py 2013-05-12 09:43:59 -06:00
Joseph Hall
eda5c6f868 Add userdel function to apache.py 2013-05-12 09:42:16 -06:00
Joseph Hall
daf97ca000 Add useradd function to apache.py 2013-05-12 09:38:14 -06:00
mguegan
ddefa122ad salt/grains : add SunOS cpu_flags support
Tested on :

- SunOS 5.11 both sparc and x86

- SmartOS joyent_20130405T010449Z
2013-05-12 15:24:17 +02:00
mguegan
a76042dddd salt/grains : better detection of cpu_model on SunOS platforms
Old version only gives cpu_model on SPARC platforms, but x86
platforms shows only "x86". By using cpu_info:*:brand instead of
cpu_info:*:implementation, you will get something as :
"Intel(r) Xeon(r) CPU E5-2630 0 @ 2.30GHz"
2013-05-12 14:03:26 +02:00
Niels Abspoel
985c448b21 This will print the user who initiated the job
So you can see who has an active job running
and when printing a job result who has initiated it.
This will help auditing a salt job
2013-05-12 11:28:49 +02:00
mguegan
fa16906c67 salt/grains : fix detection of osrelease for SmartOS 2013-05-12 11:13:56 +02:00
Thomas S Hatch
31b2574194 Fix #4980, This has been here for a while and is clearly wrong 2013-05-11 19:29:59 -06:00
Thomas S Hatch
71d79f4149 Merge pull request #4990 from auser/patch-1
Updated key.py to fix isue #4989
2013-05-11 19:52:35 -07:00
Ari
59e9c5a592 Updated key.py to fix
This fixed bug #4989 where delete was not deleting the key when `--yes` was passed
2013-05-11 20:12:26 -06:00
Thomas S Hatch
6728074ad8 Merge pull request #4987 from virtua-network/develop
pkg/solaris : fix typo on salt-master's manifest
2013-05-11 07:22:46 -07:00
Thomas S Hatch
bb36340fc2 Merge pull request #4986 from s0undt3ch/features/module-funcs-alias
Add support for a module to define function names aliases
2013-05-11 07:19:01 -07:00
Thomas S Hatch
5021edb59f Merge pull request #4983 from the-real-ed/timezone-gethwclock-deb-fix
Timezone gethwclock deb fix
2013-05-11 07:10:05 -07:00
mguegan
adc740f710 pkg/solaris : fix typo on salt-master's manifest
A typo on salt-master's manifest prevents its start without salt-minion
on SunOS/Solaris/SmartOS platform. Tested on SmartOS
joyent_20130405T010449Z.
2013-05-11 15:24:32 +02:00
David Boucha
3ef771a41b Merge pull request #4984 from iMilnb/develop
Added more NetBSD support to grains/core.py and called pkgin with full path
2013-05-11 05:57:32 -07:00
Pedro Algarvio
7dbdae8ea2 No more need to workaround for built-in shadowing. Make use of module function aliases. 2013-05-11 13:25:11 +01:00
Pedro Algarvio
3a46dd0d3b Add support for a module to define function names aliases.
If the module has the `__func_alias__` attribute, it must be a dictionary mapping in the form of(key -> value):
```
    <real-func-name> -> <desired-func-name>
```

It default's of course to the found callable attribute name if no alias is defined.
2013-05-11 13:21:29 +01:00
Emile 'iMil' Heitor
9c53137777 Fixed memtotal for 64bits NetBSD systems 2013-05-11 12:52:17 +02:00
Emile 'iMil' Heitor
53d2ac059a More NetBSD support in grains core: gpudata, virtual, cpu_flags, memory 2013-05-11 12:42:15 +02:00
Edin Sarajlic
580d8f9b7b Since Wheezy /etc/default/rcS no longer contains UTC settings, now located in /etc/adjtime
Reference: http://forums.debian.net/viewtopic.php?p=451275
2013-05-11 19:04:35 +10:00
Edin Sarajlic
bdc83fd758 /etc/default/rcS file does not contain UTC boolean value on Debian Wheezy, causes out-of-bounds exception when attempting to lookup given value 2013-05-11 18:30:30 +10:00
Thomas S Hatch
608d24e308 Merge pull request #4981 from Learnosity/s3fs_is_ignored
Added salt.fileserver.is_file_ignored() support to s3fs
2013-05-10 22:11:13 -07:00
Thomas S Hatch
c4266d7d92 Finish on fix #4967 2013-05-10 22:57:51 -06:00
Thomas S Hatch
f862f342ae database, not user 2013-05-10 22:57:51 -06:00
Thomas S Hatch
f0343c968c Only load postgre_database state if postgres installed
per #4967
2013-05-10 22:57:51 -06:00
Thomas S Hatch
ce31aafe0d Add virtual function for postgres user per #4967 2013-05-10 22:57:51 -06:00
Alan Garfield
33ac5fad81 Added salt.fileserver.is_file_ignored() support 2013-05-11 14:39:07 +10:00
Thomas S Hatch
dae8205489 Merge pull request #4960 from Learnosity/s3fileserver
S3 file server backend support
2013-05-10 21:25:20 -07:00
Thomas S Hatch
245ebb54ee Add mine to toc, fix #4963 2013-05-10 22:12:12 -06:00
Alan Garfield
33f161152b dir_list() implemented, fixed a few minor bugs
Still to implement file_list_emptydirs()
2013-05-11 13:17:15 +10:00
Alan Garfield
be9e0fce80 Url encoded filename to fix handling of files with spaces 2013-05-11 09:41:06 +10:00
Thomas S Hatch
506f8e5b8d Merge pull request #4977 from basepi/groups4903
Fix default group checking in user.present, Fixes #4903
2013-05-10 16:06:22 -07:00
Joseph Hall
4f11b79143 Merge pull request #4979 from cvrebert/patch-1
make ext_pillar vulnerability even more correcter
2013-05-10 15:48:31 -07:00
Chris Rebert
4ae8dca55a make ext_pillar vulnerability even more correcter
fix "varsions" typo
2013-05-10 16:10:58 -06:00
Colton Myers
deabb7dd19 Refine default group checking
We don't want to just ignore the default group -- we just don't want to
try to remove it if it's in the user's group list and not in the state's
group list
2013-05-10 15:37:53 -06:00
Colton Myers
6695505e4d Fix default group checking in user.present, Fixes #4903 2013-05-10 15:31:00 -06:00
Thomas S Hatch
f1706d6870 make ext_pillar vulnerability more correct 2013-05-10 15:24:38 -06:00
Thomas S Hatch
91e138eb6a update 0.15.1 notes 2013-05-10 15:15:00 -06:00
Thomas S Hatch
2f869f8dc3 Update advisories 2013-05-10 15:15:00 -06:00
Emile 'iMil' Heitor
59e9848e5f call pkgin with full path avoids troubles when upgrading 2013-05-10 21:55:04 +02:00