Commit graph

57 commits

Author SHA1 Message Date
Nehal J Wani
e907622121 jenkins_plugin: doc: Specify version as string (#18858)
If the plugin version expected is, say '1.20', then specifying it
as...
    version: 1.20
... will make the YAML parser interpret it as a float, and the
value obtained by the module will be 1.2 instead of 1.20, which
will cause downloading of wrong version of the module.

This patch updates the docs so that users don't face this issue.
2016-12-21 07:32:23 +01:00
Michael Gugino
250f862573 Fix bug #5328 apache module loading (#19355)
* Fix bug #5328 apache module loading

Currently, the apache2_module module parses apache configs
for correctness when enabling or disabling apache2 modules.

This behavior introduced a conflict condition when transitioning
between mpm modules, such as mpm_worker and mpm_event.

This change accounts for the specific error condition raised
by ``apachectl -M``:
``AH00534: apache2: Configuration error: No MPM loaded.``
When loading or unloading a module with a name that contains 'mpm_',
apache2_module will ignore the error raised by apachectl if stderr
contains 'AH00534'.

Fixes #5328

* Add AH00534 warning

* Added changes from PR #5629

* Modified ignore_configcheck behavior
2016-12-14 13:18:19 -08:00
Carlos E. Garcia
0b8011436d minor spelling changes 2016-12-13 13:51:13 -05:00
Michael Scherer
f9460f3c80 Use type='path' instead of 'str' for deploy_helper 2016-12-13 13:25:45 -05:00
Nehal J Wani
ead0022255 Open temp file only once
mkstemp() returns a tuple containing an OS-level handle to an open file
(as would be returned by os.open()) and the absolute pathname of that
file, in that order.

This patch makes sure that the fd opened by tempfile.mkstemp() is
re-used and closed properly.
2016-12-12 10:11:46 -08:00
Irina Muchnik
9f58e69d63 Fix secure temp file creation (#19096)
* For realz this time

* Fix tempfile.mkstemp (#2)

* back to square one, removing temp file from the mix

* Adding temp back

* Adding tuple  back

* Adding another tuple back

* Trying to get around weird Jenkins behavior of blowing up when both .hpi and jpi file found

* Incorporating PR feedback

* Delete .hpi file instead of backing it up, some basic clean up

* Moving file deletion to the right location

* Blank lines. They always get me.
2016-12-10 09:33:34 -05:00
Fabio Alessandro Locati
c3887138c5 Remove unused quotes (#19150) 2016-12-10 09:28:38 -05:00
Fabio Alessandro Locati
372352f35d Remove unused quotes - web_infrastructure/deploy_helper.py (#19157) 2016-12-10 09:24:36 -05:00
Fabio Alessandro Locati
b811350f00 Native YAML - web_infrastructure/jira.py (#18832) 2016-12-09 08:48:59 -05:00
James Cammarata
011ea55a8f Relocating extras into lib/ansible/modules/ after merge 2016-12-08 11:35:18 -05:00
Toshio Kuratomi
7319104552 Refreshed metadata for core modules 2016-12-08 11:25:35 -05:00
Fabio Alessandro Locati
4d2a3229d3 Call main in conditional way - web_infrastructure 2016-12-08 11:25:35 -05:00
Fabio Alessandro Locati
013be6fa1c Unquote urls in YAML - web_infrastructure (#5794) 2016-12-08 11:25:34 -05:00
Sam Doran
38c0769abb Examples syntax batch5 (#5622)
* Change example syntax on supervisorctl module

* Change example syntax or _ec2_ami_search module

* Change example syntax on cloudformation module

* Change example syntax on ec2 module

* Change example syntax on ec2_facts module

* Change example syntax on ec2_eip module

* Change example syntax on rds module

* Change example syntax on route53 module

* Change example syntax on s3 module

* Change example syntax on digital_ocean module

* Change example syntax on docker_service module

* Change example syntax on cloudformation module

* Change example syntax on gc_storage module

* Change example syntax on gce module

* Change example syntax on gce_mig module

* Change example syntax on _glance_image module

* Change example syntax on _keystone_user module

* Change example syntax on _nova_keypair module

* Change example syntax on _quantum_floating module

* Change example syntax on _quantum_floating_ip_associate module

* Change example syntax on _quantum_network module

* Change example syntax on _quantum_router module

* Change example syntax on _quantum_router_gateway module

* Change example syntax on _quantum_router_interface module

* Change example syntax on _quantum_subnet module

* SQUASH _quantum_subnet

* Add missing quotes
2016-12-08 11:25:31 -05:00
Sam Doran
b56a9852ee Examples syntax batch4 (#5620)
* Change example syntax on authorized_key module

* Change example syntax on cron module

* Change example syntax on group module

* Change example syntax on hostname module

* Change example syntax on seboolean module

* Change example syntax on selinux module

* Change example syntax on service module

* Change example syntax on sysctl module

* Change example syntax on systemd module

* Change example syntax on user module

* Change example syntax on debug module

* Change example syntax on fail module

* Change example syntax on include module

* Change example syntax on include_role module

* Change example syntax on include_vars module

* Change example syntax on pause module

* Change example syntax on wait_for module

* Change example syntax on apache2_module module

* > Change example syntax on django_manage module

* Change example syntax on htpasswd module
2016-12-08 11:25:31 -05:00
Michael Scherer
6806965bda Add no_log on password argument
Also do not use a wildcard import, for later refactoring
2016-12-08 11:25:26 -05:00
Rowan Wookey
914e205eb3 Added work around for Ubuntu Xenial calling php7_module php7.0 2016-12-08 11:25:23 -05:00
Michael Scherer
e6b3c0d88a cleanup import for htpassword module
In order to ease future refactoring, we should avoid importing
'*' from ansible.module_utils.basic.
2016-12-08 11:25:22 -05:00
Vytis Banaitis
3149fdf158 Fix change status on django_manage collectstatic. (#4239)
Ignore blank lines in collectstatic output.
2016-12-08 11:24:55 -05:00
Jan Malte Gerth
9549883e78 reuse already split output for filtering (#4310)
there is no need to call out.split('\n') multiple times (line 275 and 277)
2016-12-08 11:24:49 -05:00
Brian Coca
992b999bde made password no_log in htpasswd 2016-12-08 11:24:40 -05:00
Michael Scherer
31126034b0 Port htpasswd to python3 compatible syntax (#3672) 2016-12-08 11:24:28 -05:00
n0trax
2c3caa33f7 Add checkmode and reduce code duplication (#2417)
- httpd removed from control_binaries
- check for enabled module after running a2enmod/a2dismod
- fail, if user has no permissions to run control_binary
- reduce code duplication
2016-12-08 11:24:26 -05:00
Brian Coca
6a309ee6ab added missing version_added 2016-12-08 11:24:19 -05:00
Pål Nilsen
7e18da79c3 Add optional force parameter for apache2_module (#3251)
* Add optional force parameter for apache2_module

Fixes #2499

* Add documentation for the force parameter

* Clarify in description that -f(orce) is a Debian parameter
2016-12-08 11:24:19 -05:00
Michael Scherer
2ae3dbcc6a Set the locales to avoid issue with screenscrapping
See https://github.com/ansible/ansible-modules-core/pull/2462 for

details on why this could happen
2016-12-08 11:24:16 -05:00
Toshio Kuratomi
ecafdeeaa5 Set some module parameters to type=path 2016-12-08 11:24:08 -05:00
Graham Ullrich
61ac748bad Update django_manage documentation
As of Ansible 2.x, invocation of Django's ```manage.py``` requires a valid "shebang". Additionally, ```manage.py``` must be executable.
The old invocation was hardcoded as ```python manage.py ...``` while the new invocation is ```./manage.py ...```. See [this PR](https://github.com/ansible/ansible-modules-core/pull/1165).
This change allows more flexibility for which Python interpreter is invoked, but breaks existing deployment when ```manage.py``` is not properly configured. This documentation update adds a note explaining the new requirements for ```manage.py```.
2016-12-08 11:24:01 -05:00
Aaron Kurtz
e3782689bc Remove 'cache_table' from required params
Starting in Django 1.7, the createcachetable command looks for cache
table names in the CACHES settings dictionary, so cache_table is no
longer required, but is still allowed.
2016-12-08 11:23:59 -05:00
Toshio Kuratomi
94d163f3ed When the password file does not exist and we're making sure the user isn't in the password file, change error into a warning
Warning catches typos in the filename.  Since the playbook is saying
"make sure this user doesn't have an entry" it makes more sense to warn
than to error.

Fixes #2619
2016-12-08 11:23:50 -05:00
Greg DeKoenigsberg
742b452dc1 @lorin stepping down as maintainer 2016-12-08 11:23:45 -05:00
Brian Coca
721f587e43 made output match multiline, as per posted code from @n0trax fixes #2081 2016-12-08 11:23:41 -05:00
Toshio Kuratomi
e7a48cfb40 Use is_executable from its new location 2016-12-08 11:23:37 -05:00
Adam Ever-Hadani
8fb52e0a8b added support for 'collectstatic clear' in django_manage.py 2016-12-08 11:23:31 -05:00
Igor Khomyakov
9a599e35c1 fixed 'present' 2016-12-08 11:23:25 -05:00
Petros Moisiadis
68ef885e71 make migrate command idempotent with django built-in migrations
Django since version 1.7 has built-in migrations, so no need to have south installed with recent django versions. The 'migrate' command works with built-in migrations without any change, but the output is different than the output produced by south, which breaks idempotence. This commit fixes this.
2016-12-08 11:23:23 -05:00
James Cammarata
5efeeb156b Correctly default crypt_scheme in htpasswd 2016-12-08 11:23:20 -05:00
Chris Faulkner
18b157fbac Report change status on django_manage collectstatic. 2016-12-08 11:23:20 -05:00
Roetman, Victor
fa612a14b1 apache2_module documetation update
requires a2enmod and a2dismod
2016-12-08 11:23:14 -05:00
Lucas David Traverso
20aa4c0cea django_manage: Use shebang in manage.py instead of hardcode python 2016-12-08 11:23:13 -05:00
Tagir Bakirov
8bd367eac7 added 'absent' option to supervisorctl 2016-12-08 11:23:13 -05:00
Igor Khomyakov
03483d2ea5 Check if a service exists 2016-12-08 11:23:13 -05:00
Chris Church
3048626d6e Update docs, add example of using django_manage to run other commands. 2016-12-08 11:23:13 -05:00
Alex King
c8ae53b308 Extend hashes that can be specified by crypt_scheme beyond those understood by Apache/Nginx. 2016-12-08 11:23:12 -05:00
Lorin Hochstein
abf314c258 django_manage: expand ~ in app_path parameter
Allow users to specify app_path parameters that contain ~, for example:

app_path=~/myproject
2016-12-08 11:23:11 -05:00
Toshio Kuratomi
cb776e6190 Fix for when the password file did not exist previously 2016-12-08 11:23:11 -05:00
Jonathan Mainguy
c9d1cc0ce3 remove blank lines from htpasswd file
used standard mktemp()
2016-12-08 11:23:10 -05:00
Greg DeKoenigsberg
eb881d7d5d Proper author info for all remaining modules 2016-12-08 11:23:07 -05:00
Kamil Madac
1ae799f361 Better error handling in supervisorctl module.
If execution of supervisorctl was not successful (exit code > 0),
module silently supress this error and returns changed = false,
which turns to OK task state.
This is very confusing, when supervisorctl needs authentication,
and credentials are not specified in module or are incorrect,
services are not restarted/started/stopped without raising an error.
2016-12-08 11:23:07 -05:00
Florian Apolloner
a925a075a6 Added os.path.expanduser to app_path in django_manage 2016-12-08 11:22:51 -05:00