Commit graph

57 commits

Author SHA1 Message Date
James Cammarata
9f9c077878 Merge branch 'issues/6341' of https://github.com/threatgrid/ansible into threatgrid-issues/6341 2014-03-18 10:46:39 -05:00
Michael DeHaan
cac81b1ad9 Merge pull request #6339 from threatgrid/systemd-template-svc-fix
systemd template services must not discard template part
2014-03-16 12:40:44 -05:00
Michael DeHaan
bf33be20e1 Merge pull request #6005 from pgehres/chkconfig
Adding better failure output for chkconfig failures
2014-03-16 12:27:46 -05:00
Cristian Ciupitu
7f681c33a2 Micro-optimization: replace s.find(x)!=-1 with x in s
timeit shows a speedup of ~3x on Python 2.7.5 x86_64.
It also makes the code a bit shorter.
2014-03-16 13:10:28 -04:00
James Tanner
fc33860e5d Force command action to not be executed by the shell unless specifically enabled 2014-03-10 16:13:30 -05:00
Charles Duffy
532cda524f #6341: use shared function for parsing systemd status; check rc code 2014-03-10 01:05:48 -05:00
Charles Duffy
fd5083fe71 #6341: check systemd service status with show subcommand 2014-03-10 00:09:29 -05:00
Charles Duffy
32620cab4d systemd template services must not discard template part 2014-03-07 18:53:15 -06:00
Peter Gehres
a9bf607013 Adding better failure output for chkconfig failures rather than
just saying that the service name is unknown
2014-02-13 23:05:00 -08:00
jctanner
4901af0ef6 Merge pull request #5554 from ttarabul/devel
Use /etc/rc.conf.local for sevice configuration on FreeBSD
2014-02-04 10:59:19 -08:00
Brian Coca
fee79e6501 be permissive with BSD with service enabled upper/lower/mixed cases
Signed-off-by: Brian Coca <briancoca+ansible@gmail.com>
2014-01-28 14:49:57 -05:00
Tyler
5ce664b499 keep /usr/local/etc/rc.conf for backwards compatibility 2014-01-08 14:38:49 -05:00
Tyler
c073438d40 Use /etc/rc.conf.local for sevice configuration on FreeBSD
/etc/rc.conf.local is the preferred location for system-specific
startup configuration, and /usr/local/etc/rc.conf generally isn’t used.

see:
http://www.freebsd.org/doc/handbook/configtuning-core-configuration.html
2014-01-08 13:48:11 -05:00
Jasper N. Brouwer
9dab01c5e2 Swapped conditions of the changed if statements 2013-12-23 09:54:16 +01:00
Jasper N. Brouwer
677f95294e Fixed false positive on initctl as enable_cmd
Also on update-rc.d
In service module
2013-12-04 21:49:00 +01:00
James Tanner
36c4f05891 Add more error detail to the service module for FreeBSD 2013-11-12 00:02:30 -05:00
Michael DeHaan
0e7069d7c1 Undo an inadvertant revert from template changes so we still allow pythonic imports in module land. 2013-10-31 16:53:05 -04:00
James Tanner
8036e6ee23 Revert templating enhancements from 73dbab70 e6c28658 d409352c 9858b1f2 4587528b 9b1fe455 214b0b05 8d3db803 7f9504d1 5031104c 35cb9dc2 2bd8cb57 1e85c754 2013-10-30 10:50:16 -04:00
Michael DeHaan
bc6d454b5e Enable imports to work on a snippet based system, allowing for instance a library of common EC2 functions
to be reused between modules.  See library/system/service and library/system/ping for initial examples.  Can
work the old way to just import 'basic', or can import the new way to import multiple pieces of code from
module_utils/.
2013-10-26 11:09:30 -04:00
James Tanner
f27e2fd285 Fixes #4448 reloaded services should be started if not running 2013-10-25 15:30:02 -04:00
Scott Sturdivant
037dcbb4da If the output of rcvar isn't a key=value pair, ignore it. 2013-10-21 14:20:54 -06:00
Michael DeHaan
ce8b0944a9 Misc pep8 fixes 2013-10-19 13:03:15 -04:00
Michael DeHaan
beae21dd40 Remove examples of module antipattern of setting the choices array for boolean types. 2013-10-11 08:45:13 -04:00
Michael DeHaan
c405a61505 Merge pull request #4336 from orkaa/devel
Fixes service update-rc.d functionality on debian
2013-10-07 05:56:43 -07:00
Martijn Lina
3d16b75096 replace dashes in rc.conf keys (which are based on freebsd rc.d filenames) to underscores 2013-10-04 16:30:39 +02:00
Nace Oroz
1f39663a97 Fixes service update-rc.d functionality on debian 2013-10-02 14:27:38 +02:00
cdigiovanni
6720d0cf70 Added support to disable and enable upstart jobs 2013-09-30 14:50:47 -05:00
James Cammarata
3511687dad Minor tweak to service changed logic from the previous commit 2013-09-19 15:00:25 -05:00
James Cammarata
8bdb95a014 Merge branch 'service-enable-fix' of https://github.com/gottwald/ansible into gottwald-service-enable-fix 2013-09-19 14:59:53 -05:00
Petr Svoboda
f82d3f7fa9 Fix traceback in service module when svc_cmd is None (2nd fix)
When service module is used on unsupported Linux system where init
script is used directly, LinuxService.svc_cmd is None so .endswith()
fails.

This extends fix from e2f20db534 also
for state=restarted.

Fixes issue #3533
2013-09-19 14:36:02 -05:00
Ingo Gottwald
08af5f833f Bugfix service module: Only change service state when needed 2013-09-13 22:04:37 +02:00
James Cammarata
0449470f21 Allow service module to manage services not ending in .service
Fixes #3417
2013-09-11 15:48:36 -05:00
James Cammarata
5fe192e5e7 Fixes to the service module for Ubuntu 12.04 (LTS)
Fixes #3615
Fixes #3572
2013-09-10 22:19:15 -05:00
James Cammarata
5e8918cb2c Check for systemd ownership of a service even if an init.d script exists
Also slight modification to the error message in the earlier commit that
modified the update-rc.d detection portion of the code

Fixes #3474
2013-09-10 19:37:51 -05:00
James Cammarata
ef02c6107a Minor fix to account for template service names in systemctl 2013-09-10 11:31:13 -05:00
James Cammarata
f22ffab259 Fix for update-rc.d based systems that also have systemd installed
By default, the service module had assumed that if the system had the
update-rc.d binary, the service was either managed via upstart or standard
sysV init-style scripts. This patch adds a check for systemctl ahead
of the other methods when update-rc.d is detected, and also simplifies
the logic around the detection of systemctl-managed services
2013-09-10 11:15:30 -05:00
James Cammarata
17f683aad7 Added 'reloaded' state to list of states checked for bounced services
Fixes #3556
2013-09-03 09:49:19 -05:00
Petr Svoboda
48b064b55b Fix traceback in service module when svc_cmd is None
When service module is used on unsupported Linux system where init
script is used directly, LinuxService.svc_cmd is None so .endswith()
fails.

Fixes issue #3533
2013-08-08 14:24:20 +02:00
Michael DeHaan
b22428d87e Merge pull request #3426 from trbs/services_sleep_option
sleep option for service module which adds a pauze between stopping and ...
2013-07-12 08:18:22 -07:00
Brian Coca
e0e50b5936 fixed check mode
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
2013-07-08 15:41:39 -04:00
trbs
0d8da6eeb0 sleep option for service module which adds a pauze between stopping and starting a service using state=restarted. This helps for bad scripts that exist immediatly after signaling a process to stop. 2013-07-03 17:08:07 +02:00
Antti Rasinen
c2a4645349 Fix service enable on FreeBSD
Some services have a knob (i.e. rc.conf setting) whose name
differs from that of the script. For example, lockd process
is controlled with a script called lockd, but the rc.conf
value is rpc_lockd_enable.

Fixes issue #3382.
2013-07-03 14:52:23 +03:00
martin f. krafft
3b7b061b07 Expand usage of Python 2.6 if statement
Syntax like "'foo' if bar else 'baz'" is not supported by all Python
versions targetted by Ansible. Hence we break it up.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-23 09:19:27 +02:00
martin f. krafft
22b30b9281 Let update-rc.d set changed flag properly
When update-rc.d is used to enable/disable service, the changed flag was
always true (see #2189). This commit fixes that.

Signed-off-by: martin f. krafft <madduck@madduck.net>
2013-06-22 20:04:37 +02:00
Michael DeHaan
997bf64f3f Fix up some module docs formatting errors. 2013-06-19 22:37:09 -04:00
Michael DeHaan
e4f3c4e286 Clarify module docs 2013-06-18 20:19:29 -04:00
Michael DeHaan
f53bc323a5 Merge pull request #3230 from sayap/openrc
Add OpenRC support to the service module.
2013-06-18 17:13:06 -07:00
Yap Sok Ann
ec265a98e0 Add OpenRC support to the service module. 2013-06-17 11:29:48 +08:00
Jan-Piet Mens
3404a0fc16 DOCS: standardize on EXAMPLES (a.k.a. Docs-JumboPatch JetLag Edition)
Migrated all examples: in DOCUMENTATION=''' string to standalone EXAMPLES=''' string
  Added deprecation warning to moduledev.rst and remove deprecated example from it
  Fixed up a few typos and uppercased some acronyms.
  add consistency to how EXAMPLES are formatted
2013-06-15 20:54:25 +02:00
Michael DeHaan
e6620cdb9a Refine error message. 2013-05-31 15:23:24 -04:00