forked from evolix/ansible-roles
remove trailing whitespaces
This commit is contained in:
parent
9ca68a16dd
commit
7dc6f0b849
|
@ -10,7 +10,7 @@
|
||||||
force: no
|
force: no
|
||||||
tags:
|
tags:
|
||||||
- apache
|
- apache
|
||||||
|
|
||||||
- name: Load IP whitelist task
|
- name: Load IP whitelist task
|
||||||
include: ip_whitelist.yml
|
include: ip_whitelist.yml
|
||||||
|
|
||||||
|
|
|
@ -104,7 +104,7 @@
|
||||||
|
|
||||||
- debug:
|
- debug:
|
||||||
var: chrootbind_run.stdout_lines
|
var: chrootbind_run.stdout_lines
|
||||||
when:
|
when:
|
||||||
- bind_chroot_set | bool
|
- bind_chroot_set | bool
|
||||||
- chrootbind_run.stdout | length > 0
|
- chrootbind_run.stdout | length > 0
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
- include: do_commit.yml
|
- include: do_commit.yml
|
||||||
vars:
|
vars:
|
||||||
git_folder: "/etc"
|
git_folder: "/etc"
|
||||||
when:
|
when:
|
||||||
- _etc_git.stat.exists
|
- _etc_git.stat.exists
|
||||||
- _etc_git.stat.isdir
|
- _etc_git.stat.isdir
|
||||||
|
|
||||||
|
@ -23,5 +23,5 @@
|
||||||
vars:
|
vars:
|
||||||
git_folder: "/usr/share/scripts"
|
git_folder: "/usr/share/scripts"
|
||||||
when:
|
when:
|
||||||
- _usr_share_scripts_git.stat.exists
|
- _usr_share_scripts_git.stat.exists
|
||||||
- _usr_share_scripts_git.stat.isdir
|
- _usr_share_scripts_git.stat.isdir
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
- name: SSH configuration
|
- name: SSH configuration
|
||||||
include: ssh.yml
|
include: ssh.yml
|
||||||
when: evolinux_ssh_include | bool
|
when: evolinux_ssh_include | bool
|
||||||
|
|
||||||
### disabled because of a memory leak
|
### disabled because of a memory leak
|
||||||
# - name: Create evolinux users
|
# - name: Create evolinux users
|
||||||
# include_role:
|
# include_role:
|
||||||
|
|
|
@ -3,10 +3,10 @@ fluentd_daemon: td-agent
|
||||||
fluentd_conf_path: /etc/td-agent/td-agent.conf
|
fluentd_conf_path: /etc/td-agent/td-agent.conf
|
||||||
|
|
||||||
fluentd_port: 24230
|
fluentd_port: 24230
|
||||||
fluentd_bind_interface:
|
fluentd_bind_interface:
|
||||||
|
|
||||||
fluentd_host:
|
fluentd_host:
|
||||||
fluentd_host_port:
|
fluentd_host_port:
|
||||||
|
|
||||||
fluentd_flush_interval:
|
fluentd_flush_interval:
|
||||||
fluentd_heartbeat_type:
|
fluentd_heartbeat_type:
|
||||||
|
|
|
@ -19,7 +19,7 @@ haproxy_stats_external_url: "{% if haproxy_stats_ssl %}https:{% else %}http:{% e
|
||||||
haproxy_stats_access_ips: []
|
haproxy_stats_access_ips: []
|
||||||
haproxy_stats_admin_ips: []
|
haproxy_stats_admin_ips: []
|
||||||
haproxy_stats_users: []
|
haproxy_stats_users: []
|
||||||
## use crypt(8) password encryption
|
## use crypt(8) password encryption
|
||||||
# haproxy_stats_users:
|
# haproxy_stats_users:
|
||||||
# - { login: "", password: "" }
|
# - { login: "", password: "" }
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
- name: Warning when ldapvirc file is present and ldap_admin_password is given
|
- name: Warning when ldapvirc file is present and ldap_admin_password is given
|
||||||
debug:
|
debug:
|
||||||
msg: "WARNING: an LDAP admin password is given, but an ldapvirc file already exists. It will not be updated."
|
msg: "WARNING: an LDAP admin password is given, but an ldapvirc file already exists. It will not be updated."
|
||||||
when:
|
when:
|
||||||
- ldap_admin_password | length > 0
|
- ldap_admin_password | length > 0
|
||||||
- root_ldapvirc_path.stat.exists
|
- root_ldapvirc_path.stat.exists
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
- ldap_admin_password | length == 0
|
- ldap_admin_password | length == 0
|
||||||
- not root_ldapvirc_path.stat.exists
|
- not root_ldapvirc_path.stat.exists
|
||||||
|
|
||||||
# Use the generated password or the one found in the file
|
# Use the generated password or the one found in the file
|
||||||
- name: overwrite ldap_admin_password
|
- name: overwrite ldap_admin_password
|
||||||
set_fact:
|
set_fact:
|
||||||
ldap_admin_password: "{{ new_ldap_admin_password.stdout }}"
|
ldap_admin_password: "{{ new_ldap_admin_password.stdout }}"
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
check_mode: no
|
check_mode: no
|
||||||
register: new_ldap_admin_password
|
register: new_ldap_admin_password
|
||||||
|
|
||||||
# Use the password found in the file
|
# Use the password found in the file
|
||||||
- name: overwrite ldap_admin_password
|
- name: overwrite ldap_admin_password
|
||||||
set_fact:
|
set_fact:
|
||||||
ldap_admin_password: "{{ new_ldap_admin_password.stdout }}"
|
ldap_admin_password: "{{ new_ldap_admin_password.stdout }}"
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
- ldap_nagios_password | length == 0
|
- ldap_nagios_password | length == 0
|
||||||
- not nagios_monitoring_plugins_path.stat.exists
|
- not nagios_monitoring_plugins_path.stat.exists
|
||||||
|
|
||||||
# Use the generated password or the one found in the file
|
# Use the generated password or the one found in the file
|
||||||
- name: overwrite ldap_nagios_password (from apg)
|
- name: overwrite ldap_nagios_password (from apg)
|
||||||
set_fact:
|
set_fact:
|
||||||
ldap_nagios_password: "{{ new_ldap_nagios_password.stdout }}"
|
ldap_nagios_password: "{{ new_ldap_nagios_password.stdout }}"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
failed_when: False
|
failed_when: False
|
||||||
changed_when: False
|
changed_when: False
|
||||||
register: is_cron_installed
|
register: is_cron_installed
|
||||||
|
|
||||||
- name: "log rotation script"
|
- name: "log rotation script"
|
||||||
template:
|
template:
|
||||||
src: rotate_logstash_logs.j2
|
src: rotate_logstash_logs.j2
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
|
|
||||||
- name: "{{ lxc_php_version }} - Install dependency packages"
|
- name: "{{ lxc_php_version }} - Install dependency packages"
|
||||||
lxc_container:
|
lxc_container:
|
||||||
name: "{{ lxc_php_version }}"
|
name: "{{ lxc_php_version }}"
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
lxc_container:
|
lxc_container:
|
||||||
name: "{{ lxc_php_version }}"
|
name: "{{ lxc_php_version }}"
|
||||||
container_command: "DEBIAN_FRONTEND=noninteractive apt update"
|
container_command: "DEBIAN_FRONTEND=noninteractive apt update"
|
||||||
|
|
||||||
- name: "{{ lxc_php_version }} - Install PHP packages"
|
- name: "{{ lxc_php_version }} - Install PHP packages"
|
||||||
lxc_container:
|
lxc_container:
|
||||||
name: "{{ lxc_php_version }}"
|
name: "{{ lxc_php_version }}"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
galaxy_info:
|
galaxy_info:
|
||||||
author: Evolix
|
author: Evolix
|
||||||
description: Creation of LXC Containers
|
description: Creation of LXC Containers
|
||||||
|
|
||||||
issue_tracker_url: https://gitea.evolix.org/evolix/ansible-roles/issues
|
issue_tracker_url: https://gitea.evolix.org/evolix/ansible-roles/issues
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
- name: Percona Tools is enabled
|
- name: Percona Tools is enabled
|
||||||
command: percona-release enable tools release
|
command: percona-release enable tools release
|
||||||
# changed_when:
|
# changed_when:
|
||||||
# register: percona__release_enable_tools
|
# register: percona__release_enable_tools
|
||||||
|
|
||||||
- name: APT cache is up-to-date
|
- name: APT cache is up-to-date
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
---
|
---
|
||||||
- name: Install PostGIS extention
|
- name: Install PostGIS extention
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
- postgis
|
- postgis
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
failed_when: False
|
failed_when: False
|
||||||
changed_when: False
|
changed_when: False
|
||||||
register: is_cron_installed
|
register: is_cron_installed
|
||||||
|
|
||||||
- name: enable sa-update.sh cron
|
- name: enable sa-update.sh cron
|
||||||
lineinfile:
|
lineinfile:
|
||||||
dest: /etc/cron.d/sa-update
|
dest: /etc/cron.d/sa-update
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
failed_when: False
|
failed_when: False
|
||||||
check_mode: no
|
check_mode: no
|
||||||
register: _squid_systemd_active
|
register: _squid_systemd_active
|
||||||
|
|
||||||
- name: Squid systemd overrides directory exists
|
- name: Squid systemd overrides directory exists
|
||||||
file:
|
file:
|
||||||
dest: /etc/systemd/system/squid.service.d/
|
dest: /etc/systemd/system/squid.service.d/
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
tags:
|
tags:
|
||||||
- evoadmin-mail
|
- evoadmin-mail
|
||||||
|
|
||||||
- name: Active evoadminmail VHost
|
- name: Active evoadminmail VHost
|
||||||
file:
|
file:
|
||||||
src: "/etc/nginx/sites-available/evoadminmail.conf"
|
src: "/etc/nginx/sites-available/evoadminmail.conf"
|
||||||
dest: "/etc/nginx/sites-enabled/evoadminmail.conf"
|
dest: "/etc/nginx/sites-enabled/evoadminmail.conf"
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
src: "/etc/nginx/sites-available/roundcube.conf"
|
src: "/etc/nginx/sites-available/roundcube.conf"
|
||||||
dest: "/etc/nginx/sites-enabled/roundcube.conf"
|
dest: "/etc/nginx/sites-enabled/roundcube.conf"
|
||||||
state: link
|
state: link
|
||||||
when: roundcube_webserver == "nginx"
|
when: roundcube_webserver == "nginx"
|
||||||
notify: reload nginx
|
notify: reload nginx
|
||||||
|
|
||||||
- name: enable roundcube link in default site index
|
- name: enable roundcube link in default site index
|
||||||
|
|
Loading…
Reference in a new issue