mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-20 01:11:26 -07:00
* fixed validation-modules for apache2_mod_proxy.py
* fixed validation-modules for apache2_module.py
* fixed validation-modules for deploy_helper.py
The ignore lines were put back in place because
add_file_common_args=True is used and the module inherits a number of
options that do not show up in the documentation (nor should they).
* fixed validation-modules for ejabberd_user.py
* fixed validation-modules for gunicorn.py
* fixed validation-modules for htpasswd.py
* fixed validation-modules for jenkins_job.py
* fixed validation-modules for jenkins_job_info.py
* fixed validation-modules for jenkins_plugin.py
* fixed validation-modules for jenkins_script.py
* fixed validation-modules for jira.py
* fixed validation-modules for nginx_status_facts.py
* fixed validation-modules for rundeck_acl_policy.py
* fixed validation-modules for rundeck_project.py
* fixed validation-modules for supervisorctl.py
* fixed validation-modules for taiga_issue.py
* fixed pylint mistake in plugins/modules/web_infrastructure/jenkins_job_info.py
* removed ignore lines for almost-all web_infrastructure modules
* rolled back ignore lines for nested sophos_utm modules that were not adjusted
* Removed doc-missing-type from ignore-2.11.txt for deploy_helper and jenkins_plugin
* When adding lines back to ignore files, we added more than it was before. Removing.
* Rolled back deprecation line in ignore-2.9.txt for nginx_status_facts
* Rolled back yet another line in ignore-2.9.txt for nginx_status_facts
* Fixed argument_spec and docs for crypt_scheme parameter in htpasswd, per PR
* Added extends_documentation_fragment:files to deploy_helper and jenkins_plugin
* Removed long-deprecated option params from jenkins_plugin, removed validate-modules lines from ignore files for that module
* Update plugins/modules/web_infrastructure/htpasswd.py
Co-authored-by: Felix Fontein <felix@fontein.de>
Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit 85371e7b6d
)
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
5a826a5cb7
commit
901bca58bb
19 changed files with 180 additions and 166 deletions
|
@ -16,30 +16,35 @@ description:
|
|||
- This is used by web servers such as Apache and Nginx for basic authentication.
|
||||
options:
|
||||
path:
|
||||
type: path
|
||||
required: true
|
||||
aliases: [ dest, destfile ]
|
||||
description:
|
||||
- Path to the file that contains the usernames and passwords
|
||||
name:
|
||||
type: str
|
||||
required: true
|
||||
aliases: [ username ]
|
||||
description:
|
||||
- User name to add or remove
|
||||
password:
|
||||
type: str
|
||||
required: false
|
||||
description:
|
||||
- Password associated with user.
|
||||
- Must be specified if user does not exist yet.
|
||||
crypt_scheme:
|
||||
type: str
|
||||
required: false
|
||||
choices: ["apr_md5_crypt", "des_crypt", "ldap_sha1", "plaintext"]
|
||||
default: "apr_md5_crypt"
|
||||
description:
|
||||
- Encryption scheme to be used. As well as the four choices listed
|
||||
here, you can also use any other hash supported by passlib, such as
|
||||
md5_crypt and sha256_crypt, which are linux passwd hashes. If you
|
||||
do so the password file will not be compatible with Apache or Nginx
|
||||
- 'Some of the available choices might be: C(apr_md5_crypt), C(des_crypt), C(ldap_sha1), C(plaintext)'
|
||||
state:
|
||||
type: str
|
||||
required: false
|
||||
choices: [ present, absent ]
|
||||
default: "present"
|
||||
|
@ -195,11 +200,11 @@ def check_file_attrs(module, changed, message):
|
|||
|
||||
def main():
|
||||
arg_spec = dict(
|
||||
path=dict(required=True, aliases=["dest", "destfile"]),
|
||||
name=dict(required=True, aliases=["username"]),
|
||||
password=dict(required=False, default=None, no_log=True),
|
||||
crypt_scheme=dict(required=False, default="apr_md5_crypt"),
|
||||
state=dict(required=False, default="present"),
|
||||
path=dict(type='path', required=True, aliases=["dest", "destfile"]),
|
||||
name=dict(type='str', required=True, aliases=["username"]),
|
||||
password=dict(type='str', required=False, default=None, no_log=True),
|
||||
crypt_scheme=dict(type='str', required=False, default="apr_md5_crypt"),
|
||||
state=dict(type='str', required=False, default="present", choices=["present", "absent"]),
|
||||
create=dict(type='bool', default=True),
|
||||
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue