forked from evolix/ansible-roles
Pass evoadmin-web role through yamllint and ansible-lint
Recommends using true or false values directly instead of the truthy and falsie yes True and etc. This also means that we can get rid of the cast to booleans in some of the checks. The other fixes are mostly in the realm of indentation and whitespace.
This commit is contained in:
parent
1ecc38f9c2
commit
67664ec0e2
|
@ -1,6 +1,6 @@
|
|||
---
|
||||
general_alert_email: "root@localhost"
|
||||
evoadmin_contact_email: Null
|
||||
evoadmin_contact_email: null
|
||||
evoadmin_bounce_email: "{{ evoadmin_contact_email }}"
|
||||
|
||||
evoadmin_home_dir: "/home/{{ evoadmin_username }}"
|
||||
|
@ -10,19 +10,19 @@ evoadmin_scripts_dir: /usr/share/scripts/evoadmin
|
|||
evoadmin_host: "evoadmin.{{ ansible_fqdn }}"
|
||||
evoadmin_username: evoadmin
|
||||
|
||||
evoadmin_enable_vhost: True
|
||||
evoadmin_force_vhost: False
|
||||
evoadmin_config_local_php_force: False
|
||||
evoadmin_sudoers_conf_force: False
|
||||
evoadmin_add_conf_force: False
|
||||
evoadmin_mail_tpl_force: False
|
||||
evoadmin_enable_vhost: true
|
||||
evoadmin_force_vhost: false
|
||||
evoadmin_config_local_php_force: false
|
||||
evoadmin_sudoers_conf_force: false
|
||||
evoadmin_add_conf_force: false
|
||||
evoadmin_mail_tpl_force: false
|
||||
|
||||
evoadmin_tpl_servername: "{{ ansible_fqdn }}"
|
||||
evoadmin_tpl_address: "{{ ansible_default_ipv4.address }}"
|
||||
evoadmin_tpl_phpmyadmin_url: Null
|
||||
evoadmin_tpl_cgi_suffix: Null
|
||||
evoadmin_tpl_phpmyadmin_url: null
|
||||
evoadmin_tpl_cgi_suffix: null
|
||||
evoadmin_tpl_signature: evoadmin
|
||||
evoadmin_tpl_mail_from: root@localhost
|
||||
evoadmin_tpl_mail_bcc: Null
|
||||
evoadmin_tpl_mail_bcc: null
|
||||
evoadmin_tpl_mail_standard: "{{ general_alert_email }}"
|
||||
evoadmin_tpl_mail_urgent: "{{ general_alert_email }}"
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
---
|
||||
galaxy_info:
|
||||
author: Evolix
|
||||
description: Installation of evoadmin-web
|
||||
|
|
|
@ -3,14 +3,14 @@
|
|||
- name: "Create /etc/evolinux"
|
||||
file:
|
||||
dest: "/etc/evolinux"
|
||||
recurse: yes
|
||||
recurse: true
|
||||
state: directory
|
||||
|
||||
- name: Configure web-add config file
|
||||
template:
|
||||
src: "{{ item }}"
|
||||
dest: /etc/evolinux/web-add.conf
|
||||
force: "{{ evoadmin_add_conf_force | bool }}"
|
||||
force: "{{ evoadmin_add_conf_force }}"
|
||||
with_first_found:
|
||||
- "templates/evoadmin-web/web-add.{{ inventory_hostname }}.conf.j2"
|
||||
- "templates/evoadmin-web/web-add.{{ host_group }}.conf.j2"
|
||||
|
@ -22,7 +22,7 @@
|
|||
template:
|
||||
src: "{{ item }}"
|
||||
dest: "{{ evoadmin_scripts_dir }}/web-mail.tpl"
|
||||
force: "{{ evoadmin_mail_tpl_force | bool }}"
|
||||
force: "{{ evoadmin_mail_tpl_force }}"
|
||||
with_first_found:
|
||||
- "templates/evoadmin-web/web-mail.{{ inventory_hostname }}.tpl.j2"
|
||||
- "templates/evoadmin-web/web-mail.{{ host_group }}.tpl.j2"
|
||||
|
|
|
@ -7,6 +7,6 @@
|
|||
|
||||
- name: Patch ProFTPd config file
|
||||
patch:
|
||||
remote_src: no
|
||||
remote_src: false
|
||||
src: ftp/evolinux.conf.diff
|
||||
dest: /etc/proftpd/conf.d/z-evolinux.conf
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
apt:
|
||||
name: '{{ item }}'
|
||||
state: present
|
||||
allow_unauthenticated: yes
|
||||
allow_unauthenticated: true
|
||||
with_items:
|
||||
- php5-pam
|
||||
when: ansible_distribution_release == "jessie"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
user:
|
||||
name: evoadmin
|
||||
comment: "Evoadmin Web Account"
|
||||
home: "{{ evoadmin_home_dir}}"
|
||||
home: "{{ evoadmin_home_dir }}"
|
||||
password: "!"
|
||||
|
||||
- name: Create www-evoadmin group
|
||||
|
@ -16,7 +16,7 @@
|
|||
user:
|
||||
name: www-evoadmin
|
||||
groups: shadow
|
||||
append: yes
|
||||
append: true
|
||||
when: ansible_distribution_release == "jessie"
|
||||
|
||||
- name: "Create www-evoadmin (Debian 9 or later)"
|
||||
|
@ -36,8 +36,10 @@
|
|||
regexp: "{{ item.regexp }}"
|
||||
state: present
|
||||
with_items:
|
||||
- { line: 'evoadmin: root', regexp: '^evoadmin:'}
|
||||
- { line: 'www-evoadmin: root', regexp: '^www-evoadmin:'}
|
||||
- line: 'evoadmin: root'
|
||||
regexp: '^evoadmin:'
|
||||
- line: 'www-evoadmin: root'
|
||||
regexp: '^www-evoadmin:'
|
||||
notify: "newaliases"
|
||||
when: etc_aliases.stat.exists
|
||||
|
||||
|
@ -51,7 +53,7 @@
|
|||
repo: https://forge.evolix.org/evoadmin-web.git
|
||||
dest: "{{ evoadmin_document_root }}"
|
||||
version: jessie
|
||||
update: no
|
||||
update: false
|
||||
when: ansible_distribution_release == "jessie"
|
||||
|
||||
- name: "Clone evoadmin repository (Debian 9 or later)"
|
||||
|
@ -59,7 +61,7 @@
|
|||
repo: https://forge.evolix.org/evoadmin-web.git
|
||||
dest: "{{ evoadmin_document_root }}"
|
||||
version: master
|
||||
update: yes
|
||||
update: false
|
||||
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||
|
||||
- name: Change ownership on git repository
|
||||
|
@ -67,7 +69,7 @@
|
|||
dest: "{{ evoadmin_document_root }}"
|
||||
owner: "{{ evoadmin_username }}"
|
||||
group: "{{ evoadmin_username }}"
|
||||
recurse: yes
|
||||
recurse: true
|
||||
|
||||
- name: Create evoadmin log directory
|
||||
file:
|
||||
|
@ -97,16 +99,16 @@
|
|||
command: "chmod -R --verbose u=rwX,g=rX,o= {{ evoadmin_document_root }}"
|
||||
register: command_result
|
||||
changed_when: "'changed' in command_result.stdout"
|
||||
# failed_when: False
|
||||
# failed_when: false
|
||||
args:
|
||||
warn: no
|
||||
warn: false
|
||||
|
||||
- name: Add evoadmin sudoers file
|
||||
template:
|
||||
src: "{{ item }}"
|
||||
dest: /etc/sudoers.d/evoadmin
|
||||
mode: "0600"
|
||||
force: "{{ evoadmin_sudoers_conf_force | bool }}"
|
||||
force: "{{ evoadmin_sudoers_conf_force }}"
|
||||
validate: "visudo -cf %s"
|
||||
with_first_found:
|
||||
- "templates/evoadmin-web/sudoers.{{ inventory_hostname }}.j2"
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
template:
|
||||
src: "{{ item }}"
|
||||
dest: /etc/apache2/sites-available/evoadmin.conf
|
||||
force: "{{ evoadmin_force_vhost | bool }}"
|
||||
force: "{{ evoadmin_force_vhost }}"
|
||||
with_first_found:
|
||||
- "templates/evoadmin-web/evoadmin.{{ inventory_hostname }}.conf.j2"
|
||||
- "templates/evoadmin-web/evoadmin.{{ host_group }}.conf.j2"
|
||||
|
@ -48,11 +48,11 @@
|
|||
- name: Copy config file for evoadmin
|
||||
template:
|
||||
src: "{{ item }}"
|
||||
dest: "{{ evoadmin_document_root}}/conf/config.local.php"
|
||||
dest: "{{ evoadmin_document_root }}/conf/config.local.php"
|
||||
mode: "0640"
|
||||
owner: evoadmin
|
||||
group: evoadmin
|
||||
force: "{{ evoadmin_config_local_php_force | bool }}"
|
||||
force: "{{ evoadmin_config_local_php_force }}"
|
||||
with_first_found:
|
||||
- "templates/evoadmin-web/config.local.{{ inventory_hostname }}.php.j2"
|
||||
- "templates/evoadmin-web/config.local.{{ host_group }}.php.j2"
|
||||
|
|
Loading…
Reference in a new issue