Proper jinja spacing
gitea/ansible-roles/pipeline/head This commit looks good
Details
gitea/ansible-roles/pipeline/head This commit looks good
Details
This commit is contained in:
parent
8eae5bba63
commit
7a0e0d81d6
|
@ -19,6 +19,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
* Proper jinja spacing
|
||||||
* evolinux-base: ensure dbus is started and enabled (not by default in the case of an offline netinst)
|
* evolinux-base: ensure dbus is started and enabled (not by default in the case of an offline netinst)
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
|
@ -3,34 +3,34 @@
|
||||||
- name: Launch new instance(s)
|
- name: Launch new instance(s)
|
||||||
ec2:
|
ec2:
|
||||||
state: present
|
state: present
|
||||||
aws_access_key: "{{aws_access_key}}"
|
aws_access_key: "{{ aws_access_key }}"
|
||||||
aws_secret_key: "{{aws_secret_key}}"
|
aws_secret_key: "{{ aws_secret_key }}"
|
||||||
region: "{{aws_region}}"
|
region: "{{ aws_region }}"
|
||||||
image: "{{ec2_base_ami}}"
|
image: "{{ ec2_base_ami }}"
|
||||||
instance_type: "{{ec2_instance_type}}"
|
instance_type: "{{ ec2_instance_type }}"
|
||||||
count: "{{ec2_instance_count}}"
|
count: "{{ ec2_instance_count }}"
|
||||||
assign_public_ip: "{{ec2_public_ip}}"
|
assign_public_ip: "{{ ec2_public_ip }}"
|
||||||
group: "{{ec2_security_group.name}}"
|
group: "{{ ec2_security_group.name }}"
|
||||||
key_name: "{{ec2_keyname}}"
|
key_name: "{{ ec2_keyname }}"
|
||||||
wait: yes
|
wait: yes
|
||||||
register: ec2
|
register: ec2
|
||||||
|
|
||||||
- name: Add newly created instance(s) to inventory
|
- name: Add newly created instance(s) to inventory
|
||||||
add_host:
|
add_host:
|
||||||
hostname: "{{item.public_dns_name}}"
|
hostname: "{{ item.public_dns_name }}"
|
||||||
groupname: launched-instances
|
groupname: launched-instances
|
||||||
ansible_user: admin
|
ansible_user: admin
|
||||||
ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
|
ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
|
||||||
loop: "{{ec2.instances}}"
|
loop: "{{ ec2.instances }}"
|
||||||
|
|
||||||
- debug:
|
- debug:
|
||||||
msg: "Your newly created instance is reachable at: {{item.public_dns_name}}"
|
msg: "Your newly created instance is reachable at: {{ item.public_dns_name }}"
|
||||||
loop: "{{ec2.instances}}"
|
loop: "{{ ec2.instances }}"
|
||||||
|
|
||||||
- name: Wait for SSH to come up on all instances (give up after 2m)
|
- name: Wait for SSH to come up on all instances (give up after 2m)
|
||||||
wait_for:
|
wait_for:
|
||||||
state: started
|
state: started
|
||||||
host: "{{item.public_dns_name}}"
|
host: "{{ item.public_dns_name }}"
|
||||||
port: 22
|
port: 22
|
||||||
timeout: 120
|
timeout: 120
|
||||||
loop: "{{ec2.instances}}"
|
loop: "{{ ec2.instances }}"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{% if bind_chroot_set %}
|
{% if bind_chroot_set %}
|
||||||
{{ bind_chroot_path }}{{bind_log_file}} {
|
{{ bind_chroot_path }}{{ bind_log_file }} {
|
||||||
{% else %}
|
{% else %}
|
||||||
{{bind_log_file}} {
|
{{ bind_log_file }} {
|
||||||
{% endif %}
|
{% endif %}
|
||||||
weekly
|
weekly
|
||||||
missingok
|
missingok
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
# If docher_home sets to /home/, the partition should be mounted with exec option.
|
# If docher_home sets to /home/, the partition should be mounted with exec option.
|
||||||
docker_home: /var/lib/docker
|
docker_home: /var/lib/docker
|
||||||
docker_tmpdir: "{{docker_home}}/tmp"
|
docker_tmpdir: "{{ docker_home }}/tmp"
|
||||||
|
|
||||||
# Chose to use iptables instead of docker-proxy userland process
|
# Chose to use iptables instead of docker-proxy userland process
|
||||||
docker_conf_use_iptables: False
|
docker_conf_use_iptables: False
|
||||||
|
@ -22,7 +22,7 @@ docker_daemon_listening_ip: 0.0.0.0
|
||||||
|
|
||||||
# TLS
|
# TLS
|
||||||
docker_tls_enabled: False
|
docker_tls_enabled: False
|
||||||
docker_tls_path: "{{docker_home}}/tls"
|
docker_tls_path: "{{ docker_home }}/tls"
|
||||||
docker_tls_ca: ca/ca.pem
|
docker_tls_ca: ca/ca.pem
|
||||||
docker_tls_ca_key: ca/ca-key.pem
|
docker_tls_ca_key: ca/ca-key.pem
|
||||||
docker_tls_cert: server/cert.pem
|
docker_tls_cert: server/cert.pem
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: elasticsearch_additional_scripts_dir is search ("/usr")
|
when: elasticsearch_additional_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: "{{ elasticsearch_additional_scripts_dir }} exists"
|
- name: "{{ elasticsearch_additional_scripts_dir }} exists"
|
||||||
file:
|
file:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: repository_path is search ("/usr")
|
when: repository_path is search("/usr")
|
||||||
|
|
||||||
- name: "{{ repository_path }} is versioned with git"
|
- name: "{{ repository_path }} is versioned with git"
|
||||||
command: "git init ."
|
command: "git init ."
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
### File generated by Ansible ###
|
### File generated by Ansible ###
|
||||||
|
|
||||||
SSL_KEY_DIR=${SSL_KEY_DIR:-{{ evoacme_ssl_key_dir }}}
|
SSL_KEY_DIR=${SSL_KEY_DIR:-{{ evoacme_ssl_key_dir } }}
|
||||||
ACME_DIR=${ACME_DIR:-{{ evoacme_acme_dir }}}
|
ACME_DIR=${ACME_DIR:-{{ evoacme_acme_dir } }}
|
||||||
CSR_DIR=${CSR_DIR:-{{ evoacme_csr_dir }}}
|
CSR_DIR=${CSR_DIR:-{{ evoacme_csr_dir } }}
|
||||||
CRT_DIR=${CRT_DIR:-{{ evoacme_crt_dir }}}
|
CRT_DIR=${CRT_DIR:-{{ evoacme_crt_dir } }}
|
||||||
HOOKS_DIR=${HOOKS_DIR:-"{{ evoacme_hooks_dir }}"}
|
HOOKS_DIR=${HOOKS_DIR:-"{{ evoacme_hooks_dir }}"}
|
||||||
LOG_DIR=${LOG_DIR:-{{ evoacme_log_dir }}}
|
LOG_DIR=${LOG_DIR:-{{ evoacme_log_dir } }}
|
||||||
SSL_MINDAY=${SSL_MINDAY:-{{ evoacme_ssl_minday }}}
|
SSL_MINDAY=${SSL_MINDAY:-{{ evoacme_ssl_minday } }}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: evocheck_bin_dir is search ("/usr")
|
when: evocheck_bin_dir is search("/usr")
|
||||||
tags:
|
tags:
|
||||||
- evocheck
|
- evocheck
|
||||||
|
|
||||||
|
|
|
@ -97,7 +97,7 @@
|
||||||
marker: "# ANSIBLE MANAGED"
|
marker: "# ANSIBLE MANAGED"
|
||||||
block: |
|
block: |
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
dbpurgeage = {{ fail2ban_recidive_bantime}}
|
dbpurgeage = {{ fail2ban_recidive_bantime }}
|
||||||
insertafter: EOF
|
insertafter: EOF
|
||||||
create: yes
|
create: yes
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
|
@ -16,7 +16,7 @@ destemail = {{ fail2ban_alert_email or general_alert_email | mandatory }}
|
||||||
|
|
||||||
# ACTIONS
|
# ACTIONS
|
||||||
banaction = iptables-multiport
|
banaction = iptables-multiport
|
||||||
action = %({{fail2ban_default_action}})s
|
action = %({{ fail2ban_default_action }})s
|
||||||
|
|
||||||
|
|
||||||
[sshd]
|
[sshd]
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
- name: Install specific openjdk package
|
- name: Install specific openjdk package
|
||||||
apt:
|
apt:
|
||||||
name: "openjdk-{{ java_version}}-jre-headless"
|
name: "openjdk-{{ java_version }}-jre-headless"
|
||||||
default_release: "{{ java_apt_release }}"
|
default_release: "{{ java_apt_release }}"
|
||||||
state: present
|
state: present
|
||||||
tags:
|
tags:
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: remount-usr
|
name: remount-usr
|
||||||
when: kvm_scripts_dir is search ("/usr")
|
when: kvm_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: add-vm script is present
|
- name: add-vm script is present
|
||||||
copy:
|
copy:
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
msg: Please configure var lxc_php_version
|
msg: Please configure var lxc_php_version
|
||||||
when: lxc_php_version is none
|
when: lxc_php_version is none
|
||||||
|
|
||||||
- name: "Update APT cache in container {{lxc_php_version}}"
|
- name: "Update APT cache in container {{ lxc_php_version }}"
|
||||||
lxc_container:
|
lxc_container:
|
||||||
name: "{{ lxc_php_version }}"
|
name: "{{ lxc_php_version }}"
|
||||||
container_command: "apt-get update"
|
container_command: "apt-get update"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{{ansible_fqdn}}
|
{{ ansible_fqdn }}
|
||||||
|
|
|
@ -39,4 +39,4 @@
|
||||||
mode: '0755'
|
mode: '0755'
|
||||||
|
|
||||||
- name: "Install Solr {{ solr_version }}"
|
- name: "Install Solr {{ solr_version }}"
|
||||||
command: "lxc-attach -n {{name}} -- /root/solr-{{ solr_version }}/bin/install_solr_service.sh /root/solr-{{ solr_version }}.tgz -d /home/solr/{{name}} -p {{ solr_port }}"
|
command: "lxc-attach -n {{ name }} -- /root/solr-{{ solr_version }}/bin/install_solr_service.sh /root/solr-{{ solr_version }}.tgz -d /home/solr/{{ name }} -p {{ solr_port }}"
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
|
|
||||||
- name: Add MongoDB GPG key
|
- name: Add MongoDB GPG key
|
||||||
copy:
|
copy:
|
||||||
src: "server-{{mongodb_version}}.asc"
|
src: "server-{{ mongodb_version }}.asc"
|
||||||
dest: "{{ apt_keyring_dir }}/mongodb-server-{{mongodb_version}}.asc"
|
dest: "{{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc"
|
||||||
force: yes
|
force: yes
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
owner: root
|
owner: root
|
||||||
|
@ -29,16 +29,16 @@
|
||||||
|
|
||||||
- name: Enable APT sources list
|
- name: Enable APT sources list
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb [signed-by={{ apt_keyring_dir }}/mongodb-server-{{mongodb_version}}.asc] http://repo.mongodb.org/apt/debian bullseye/mongodb-org/{{mongodb_version}} main"
|
repo: "deb [signed-by={{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc] http://repo.mongodb.org/apt/debian bullseye/mongodb-org/{{ mongodb_version }} main"
|
||||||
state: present
|
state: present
|
||||||
filename: "mongodb-org-{{mongodb_version}}"
|
filename: "mongodb-org-{{ mongodb_version }}"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Disable unsigned APT sources list
|
- name: Disable unsigned APT sources list
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb http://repo.mongodb.org/apt/debian bullseye/mongodb-org/{{mongodb_version}} main"
|
repo: "deb http://repo.mongodb.org/apt/debian bullseye/mongodb-org/{{ mongodb_version }} main"
|
||||||
state: absent
|
state: absent
|
||||||
filename: "mongodb-org-{{mongodb_version}}"
|
filename: "mongodb-org-{{ mongodb_version }}"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
|
|
||||||
- name: Add MongoDB GPG key
|
- name: Add MongoDB GPG key
|
||||||
copy:
|
copy:
|
||||||
src: "server-{{mongodb_version}}.asc"
|
src: "server-{{ mongodb_version }}.asc"
|
||||||
dest: "{{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc"
|
dest: "{{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc"
|
||||||
force: yes
|
force: yes
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
@ -25,14 +25,14 @@
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb [signed-by={{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc] http://repo.mongodb.org/apt/debian buster/mongodb-org/{{ mongodb_version }} main"
|
repo: "deb [signed-by={{ apt_keyring_dir }}/mongodb-server-{{ mongodb_version }}.asc] http://repo.mongodb.org/apt/debian buster/mongodb-org/{{ mongodb_version }} main"
|
||||||
state: present
|
state: present
|
||||||
filename: "mongodb-org-{{mongodb_version}}"
|
filename: "mongodb-org-{{ mongodb_version }}"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Disable unsigned APT sources list
|
- name: Disable unsigned APT sources list
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/{{ mongodb_version }} main"
|
repo: "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/{{ mongodb_version }} main"
|
||||||
state: absent
|
state: absent
|
||||||
filename: "mongodb-org-{{mongodb_version}}"
|
filename: "mongodb-org-{{ mongodb_version }}"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
|
|
|
@ -14,8 +14,8 @@
|
||||||
|
|
||||||
- name: Add MongoDB GPG key
|
- name: Add MongoDB GPG key
|
||||||
copy:
|
copy:
|
||||||
src: "server-{{mongodb_version}}.asc"
|
src: "server-{{ mongodb_version }}.asc"
|
||||||
dest: "/etc/apt/trusted.gpg.d/mongodb-server-{{mongodb_version}}.asc"
|
dest: "/etc/apt/trusted.gpg.d/mongodb-server-{{ mongodb_version }}.asc"
|
||||||
force: yes
|
force: yes
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
owner: root
|
owner: root
|
||||||
|
@ -23,16 +23,16 @@
|
||||||
|
|
||||||
- name: Enable APT sources list
|
- name: Enable APT sources list
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/{{mongodb_version}} main"
|
repo: "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/{{ mongodb_version }} main"
|
||||||
state: present
|
state: present
|
||||||
filename: "mongodb-org-{{mongodb_version}}"
|
filename: "mongodb-org-{{ mongodb_version }}"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Disable APT sources list
|
- name: Disable APT sources list
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/{{mongodb_version}} main"
|
repo: "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/{{ mongodb_version }} main"
|
||||||
state: absent
|
state: absent
|
||||||
filename: "mongodb-org-{{mongodb_version}}"
|
filename: "mongodb-org-{{ mongodb_version }}"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: Scripts directory exists
|
- name: Scripts directory exists
|
||||||
file:
|
file:
|
||||||
|
@ -106,7 +106,7 @@
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
tags:
|
tags:
|
||||||
- mysql
|
- mysql
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: mysqltuner is installed
|
- name: mysqltuner is installed
|
||||||
# copy:
|
# copy:
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
tags:
|
tags:
|
||||||
- mysql
|
- mysql
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: mysql-optimize.sh is installed
|
- name: mysql-optimize.sh is installed
|
||||||
copy:
|
copy:
|
||||||
|
@ -203,7 +203,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: Install my-add.sh
|
- name: Install my-add.sh
|
||||||
copy:
|
copy:
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: Ensure scripts directory exists
|
- name: Ensure scripts directory exists
|
||||||
file:
|
file:
|
||||||
|
@ -96,7 +96,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: Install mysqltuner
|
- name: Install mysqltuner
|
||||||
# copy:
|
# copy:
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: Optimize script for MySQL
|
- name: Optimize script for MySQL
|
||||||
copy:
|
copy:
|
||||||
|
@ -196,7 +196,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: _mysql_scripts_dir is search ("/usr")
|
when: _mysql_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: Install my-add.sh
|
- name: Install my-add.sh
|
||||||
copy:
|
copy:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# {{ansible_managed}}
|
# {{ ansible_managed }}
|
||||||
|
|
||||||
[mysqld]
|
[mysqld]
|
||||||
{% if mysql_log_bin %}
|
{% if mysql_log_bin %}
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: nagios_plugins_directory is search ("/usr")
|
when: nagios_plugins_directory is search("/usr")
|
||||||
tags:
|
tags:
|
||||||
- nagios-nrpe
|
- nagios-nrpe
|
||||||
- nagios-plugins
|
- nagios-plugins
|
||||||
|
|
|
@ -19,9 +19,9 @@
|
||||||
php_apache_custom_ini_file: "{{ php_apache_conf_dir }}/zzz-evolinux-custom.ini"
|
php_apache_custom_ini_file: "{{ php_apache_conf_dir }}/zzz-evolinux-custom.ini"
|
||||||
php_fpm_defaults_ini_file: "{{ php_fpm_conf_dir }}/z-evolinux-defaults.ini"
|
php_fpm_defaults_ini_file: "{{ php_fpm_conf_dir }}/z-evolinux-defaults.ini"
|
||||||
php_fpm_custom_ini_file: "{{ php_fpm_conf_dir }}/zzz-evolinux-custom.ini"
|
php_fpm_custom_ini_file: "{{ php_fpm_conf_dir }}/zzz-evolinux-custom.ini"
|
||||||
php_fpm_debian_default_pool_file: "{{ php_fpm_pool_dir}}/www.conf"
|
php_fpm_debian_default_pool_file: "{{ php_fpm_pool_dir }}/www.conf"
|
||||||
php_fpm_default_pool_file: "{{ php_fpm_pool_dir}}/www-evolinux-defaults.conf"
|
php_fpm_default_pool_file: "{{ php_fpm_pool_dir }}/www-evolinux-defaults.conf"
|
||||||
php_fpm_default_pool_custom_file: "{{ php_fpm_pool_dir}}/www-evolinux-zcustom.conf"
|
php_fpm_default_pool_custom_file: "{{ php_fpm_pool_dir }}/www-evolinux-zcustom.conf"
|
||||||
php_fpm_default_pool_socket: "/var/run/php/php{{ php_version }}-fpm.sock"
|
php_fpm_default_pool_socket: "/var/run/php/php{{ php_version }}-fpm.sock"
|
||||||
php_fpm_service_name: "php{{ php_version }}-fpm"
|
php_fpm_service_name: "php{{ php_version }}-fpm"
|
||||||
|
|
||||||
|
|
|
@ -17,13 +17,13 @@
|
||||||
|
|
||||||
- name: Allow conf.d/*.conf files to be included in PostgreSQL configuration
|
- name: Allow conf.d/*.conf files to be included in PostgreSQL configuration
|
||||||
lineinfile:
|
lineinfile:
|
||||||
name: "/etc/postgresql/{{postgresql_version}}/main/postgresql.conf"
|
name: "/etc/postgresql/{{ postgresql_version }}/main/postgresql.conf"
|
||||||
line: include_dir = 'conf.d'
|
line: include_dir = 'conf.d'
|
||||||
notify: restart postgresql
|
notify: restart postgresql
|
||||||
|
|
||||||
- name: Create conf.d directory
|
- name: Create conf.d directory
|
||||||
file:
|
file:
|
||||||
name: "/etc/postgresql/{{postgresql_version}}/main/conf.d/"
|
name: "/etc/postgresql/{{ postgresql_version }}/main/conf.d/"
|
||||||
state: directory
|
state: directory
|
||||||
owner: postgres
|
owner: postgres
|
||||||
group: postgres
|
group: postgres
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
- name: Copy PostgreSQL config file
|
- name: Copy PostgreSQL config file
|
||||||
template:
|
template:
|
||||||
src: postgresql.conf.j2
|
src: postgresql.conf.j2
|
||||||
dest: "/etc/postgresql/{{postgresql_version}}/main/conf.d/zz-evolinux.conf"
|
dest: "/etc/postgresql/{{ postgresql_version }}/main/conf.d/zz-evolinux.conf"
|
||||||
owner: postgres
|
owner: postgres
|
||||||
group: postgres
|
group: postgres
|
||||||
mode: "0644"
|
mode: "0644"
|
||||||
|
|
|
@ -12,8 +12,8 @@
|
||||||
- name: Add Munin plugins for PostgreSQL
|
- name: Add Munin plugins for PostgreSQL
|
||||||
file:
|
file:
|
||||||
state: link
|
state: link
|
||||||
src: '/usr/share/munin/plugins/{{item}}'
|
src: '/usr/share/munin/plugins/{{ item }}'
|
||||||
dest: '/etc/munin/plugins/{{item}}'
|
dest: '/etc/munin/plugins/{{ item }}'
|
||||||
loop:
|
loop:
|
||||||
- postgres_bgwriter
|
- postgres_bgwriter
|
||||||
- postgres_checkpoints
|
- postgres_checkpoints
|
||||||
|
@ -26,8 +26,8 @@
|
||||||
- name: Add Munin plugins for PostgreSQL (for specific databases)
|
- name: Add Munin plugins for PostgreSQL (for specific databases)
|
||||||
file:
|
file:
|
||||||
state: link
|
state: link
|
||||||
src: '/usr/share/munin/plugins/{{item[0]}}'
|
src: '/usr/share/munin/plugins/{{ item[0] }}'
|
||||||
dest: '/etc/munin/plugins/{{item[0]}}{{item[1]}}'
|
dest: '/etc/munin/plugins/{{ item[0] }}{{ item[1] }}'
|
||||||
loop: "{{ _plugins | product(_databases) | list }}"
|
loop: "{{ _plugins | product(_databases) | list }}"
|
||||||
vars:
|
vars:
|
||||||
_plugins:
|
_plugins:
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
lineinfile:
|
lineinfile:
|
||||||
name: /etc/nagios/nrpe.d/evolix.cfg
|
name: /etc/nagios/nrpe.d/evolix.cfg
|
||||||
regexp: '^command\[check_pgsql\]='
|
regexp: '^command\[check_pgsql\]='
|
||||||
line: 'command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p "{{postgresql_nrpe_password.stdout}}"'
|
line: 'command[check_pgsql]=/usr/lib/nagios/plugins/check_pgsql -H localhost -l nrpe -p "{{ postgresql_nrpe_password.stdout }}"'
|
||||||
notify: restart nagios-nrpe-server
|
notify: restart nagios-nrpe-server
|
||||||
when: postgresql_create_nrpe_user is changed
|
when: postgresql_create_nrpe_user is changed
|
||||||
when: nrpe_evolix_config.stat.exists
|
when: nrpe_evolix_config.stat.exists
|
||||||
|
|
|
@ -11,6 +11,6 @@
|
||||||
- name: Install postgresql package
|
- name: Install postgresql package
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
- "postgresql-{{postgresql_version}}"
|
- "postgresql-{{ postgresql_version }}"
|
||||||
- pgtop
|
- pgtop
|
||||||
- libdbd-pg-perl
|
- libdbd-pg-perl
|
||||||
|
|
|
@ -11,6 +11,6 @@
|
||||||
- name: Install postgresql package
|
- name: Install postgresql package
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
- "postgresql-{{postgresql_version}}"
|
- "postgresql-{{ postgresql_version }}"
|
||||||
- pgtop
|
- pgtop
|
||||||
- libdbd-pg-perl
|
- libdbd-pg-perl
|
||||||
|
|
|
@ -11,6 +11,6 @@
|
||||||
- name: Install postgresql package
|
- name: Install postgresql package
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
- "postgresql-{{postgresql_version}}"
|
- "postgresql-{{ postgresql_version }}"
|
||||||
- pgtop
|
- pgtop
|
||||||
- libdbd-pg-perl
|
- libdbd-pg-perl
|
||||||
|
|
|
@ -10,8 +10,8 @@
|
||||||
|
|
||||||
- name: Install postgresql package
|
- name: Install postgresql package
|
||||||
apt:
|
apt:
|
||||||
name: '{{item}}'
|
name: '{{ item }}'
|
||||||
loop:
|
loop:
|
||||||
- "postgresql-{{postgresql_version}}"
|
- "postgresql-{{ postgresql_version }}"
|
||||||
- ptop
|
- ptop
|
||||||
- libdbd-pg-perl
|
- libdbd-pg-perl
|
||||||
|
|
|
@ -11,6 +11,6 @@
|
||||||
- name: Install postgresql package
|
- name: Install postgresql package
|
||||||
apt:
|
apt:
|
||||||
name:
|
name:
|
||||||
- "postgresql-{{postgresql_version}}"
|
- "postgresql-{{ postgresql_version }}"
|
||||||
- ptop
|
- ptop
|
||||||
- libdbd-pg-perl
|
- libdbd-pg-perl
|
||||||
|
|
|
@ -31,12 +31,12 @@
|
||||||
|
|
||||||
- name: Add PGDG repository
|
- name: Add PGDG repository
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb [signed-by={{ apt_keyring_dir }}/postgresql.asc] http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main"
|
repo: "deb [signed-by={{ apt_keyring_dir }}/postgresql.asc] http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
|
||||||
- name: Remove unsigned PGDG repository
|
- name: Remove unsigned PGDG repository
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ansible_distribution_release}}-pgdg main"
|
repo: "deb http://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
state: absent
|
state: absent
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
Package: postgresql-{{postgresql_version}} postgresql-client-common postgresql-common libpq5 ptop
|
Package: postgresql-{{ postgresql_version }} postgresql-client-common postgresql-common libpq5 ptop
|
||||||
Pin: release a={{ansible_distribution_release}}-pgdg
|
Pin: release a={{ ansible_distribution_release }}-pgdg
|
||||||
Pin-Priority: 999
|
Pin-Priority: 999
|
||||||
|
|
|
@ -122,8 +122,8 @@
|
||||||
- name: Patch logrotate conf
|
- name: Patch logrotate conf
|
||||||
replace:
|
replace:
|
||||||
name: /etc/logrotate.d/varnish
|
name: /etc/logrotate.d/varnish
|
||||||
regexp: '^(\s+)(/usr/sbin/invoke-rc.d {{item}}.*)'
|
regexp: '^(\s+)(/usr/sbin/invoke-rc.d {{ item }}.*)'
|
||||||
replace: '\1systemctl -q is-active {{item}} && \2'
|
replace: '\1systemctl -q is-active {{ item }} && \2'
|
||||||
loop:
|
loop:
|
||||||
- varnishlog
|
- varnishlog
|
||||||
- varnishncsa
|
- varnishncsa
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
- name: Enable varnish5 munin plugin
|
- name: Enable varnish5 munin plugin
|
||||||
file:
|
file:
|
||||||
src: /usr/local/share/munin/plugins/varnish5_
|
src: /usr/local/share/munin/plugins/varnish5_
|
||||||
dest: "/etc/munin/plugins/varnish5_{{item}}"
|
dest: "/etc/munin/plugins/varnish5_{{ item }}"
|
||||||
state: link
|
state: link
|
||||||
loop:
|
loop:
|
||||||
- memory_usage
|
- memory_usage
|
||||||
|
|
|
@ -80,7 +80,7 @@
|
||||||
|
|
||||||
- include_role:
|
- include_role:
|
||||||
name: evolix/remount-usr
|
name: evolix/remount-usr
|
||||||
when: evoadmin_scripts_dir is search ("/usr")
|
when: evoadmin_scripts_dir is search("/usr")
|
||||||
|
|
||||||
- name: "Create {{ evoadmin_scripts_dir }}"
|
- name: "Create {{ evoadmin_scripts_dir }}"
|
||||||
file:
|
file:
|
||||||
|
|
Loading…
Reference in New Issue