forked from evolix/ansible-roles
evoadmin-web: use python/yaml native values
This commit is contained in:
parent
6a89f253e9
commit
ce02a68a8d
|
@ -35,7 +35,7 @@ And force it to update:
|
|||
evoadmin_sudoers_conf_force: True
|
||||
|
||||
# Set evoadmin-web sudoers file
|
||||
evoadmin_htpasswd: true
|
||||
evoadmin_htpasswd: True
|
||||
|
||||
Overwrite its template:
|
||||
- "templates/evoadmin-web/htpasswd.{{ inventory_hostname }}.j2"
|
||||
|
@ -43,4 +43,4 @@ Overwrite its template:
|
|||
- "templates/evoadmin-web/htpasswd.j2"
|
||||
- "htpasswd.j2"
|
||||
And force it to update:
|
||||
evoadmin_htpasswd_force: true
|
||||
evoadmin_htpasswd_force: True
|
||||
|
|
|
@ -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,23 +10,23 @@ evoadmin_scripts_dir: /usr/share/scripts/evoadmin
|
|||
evoadmin_host: "evoadmin.{{ ansible_fqdn }}"
|
||||
evoadmin_username: evoadmin
|
||||
|
||||
evoadmin_multi_php: false
|
||||
evoadmin_enable_vhost: true
|
||||
evoadmin_multi_php: 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_htpasswd_force: false
|
||||
evoadmin_htpasswd: false
|
||||
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_htpasswd_force: False
|
||||
evoadmin_htpasswd: 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 }}"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
- name: "Create /etc/evolinux"
|
||||
file:
|
||||
dest: "/etc/evolinux"
|
||||
recurse: true
|
||||
recurse: True
|
||||
state: directory
|
||||
|
||||
- name: Configure web-add config file
|
||||
|
|
|
@ -7,6 +7,6 @@
|
|||
|
||||
- name: Patch ProFTPd config file
|
||||
patch:
|
||||
remote_src: false
|
||||
remote_src: False
|
||||
src: ftp/evolinux.conf.diff
|
||||
dest: /etc/proftpd/conf.d/z-evolinux.conf
|
||||
|
|
|
@ -38,7 +38,7 @@
|
|||
apt:
|
||||
name: '{{ item }}'
|
||||
state: present
|
||||
allow_unauthenticated: true
|
||||
allow_unauthenticated: True
|
||||
with_items:
|
||||
- php5-pam
|
||||
when: ansible_distribution_release == "jessie"
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
user:
|
||||
name: www-evoadmin
|
||||
groups: shadow
|
||||
append: true
|
||||
append: True
|
||||
when: ansible_distribution_release == "jessie"
|
||||
|
||||
- name: "Create www-evoadmin (Debian 9 or later)"
|
||||
|
@ -53,7 +53,7 @@
|
|||
repo: https://forge.evolix.org/evoadmin-web.git
|
||||
dest: "{{ evoadmin_document_root }}"
|
||||
version: jessie
|
||||
update: false
|
||||
update: False
|
||||
when: ansible_distribution_release == "jessie"
|
||||
|
||||
- name: "Clone evoadmin repository (Debian 9 or later)"
|
||||
|
@ -61,7 +61,7 @@
|
|||
repo: https://forge.evolix.org/evoadmin-web.git
|
||||
dest: "{{ evoadmin_document_root }}"
|
||||
version: master
|
||||
update: false
|
||||
update: False
|
||||
when: ansible_distribution_major_version | version_compare('9', '>=')
|
||||
|
||||
- name: Change ownership on git repository
|
||||
|
@ -69,7 +69,7 @@
|
|||
dest: "{{ evoadmin_document_root }}"
|
||||
owner: "{{ evoadmin_username }}"
|
||||
group: "{{ evoadmin_username }}"
|
||||
recurse: true
|
||||
recurse: True
|
||||
|
||||
- name: Create evoadmin log directory
|
||||
file:
|
||||
|
@ -85,7 +85,7 @@
|
|||
- name: "Create {{ evoadmin_scripts_dir }}"
|
||||
file:
|
||||
dest: "{{ evoadmin_scripts_dir }}"
|
||||
# recurse: true
|
||||
# recurse: True
|
||||
mode: "0700"
|
||||
state: directory
|
||||
|
||||
|
@ -99,9 +99,9 @@
|
|||
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: false
|
||||
warn: False
|
||||
|
||||
- name: Add evoadmin sudoers file
|
||||
template:
|
||||
|
|
Loading…
Reference in a new issue