Add evolix prefix to include_role

This commit is contained in:
Victor LABORIE 2019-11-29 14:00:25 +01:00
parent 6e918d166e
commit 6f5e13f8b8
52 changed files with 76 additions and 76 deletions

View File

@ -52,7 +52,7 @@ In your main evolinux playbook put this play before Evolinux one:
tasks: tasks:
- include_role: - include_role:
name: amazon-ec2 name: evolix/amazon-ec2
tasks_from: create-instance.yml tasks_from: create-instance.yml
``` ```

View File

@ -10,10 +10,10 @@
tasks: tasks:
- include_role: - include_role:
name: amazon-ec2 name: evolix/amazon-ec2
tasks_from: setup.yml tasks_from: setup.yml
- include_role: - include_role:
name: amazon-ec2 name: evolix/amazon-ec2
tasks_from: create-instance.yml tasks_from: create-instance.yml
- name: Install Evolinux - name: Install Evolinux
@ -52,11 +52,11 @@
post_tasks: post_tasks:
- include_role: - include_role:
name: etc-git name: evolix/etc-git
tasks_from: commit.yml tasks_from: commit.yml
vars: vars:
commit_message: "Ansible post-run Evolinux playbook" commit_message: "Ansible post-run Evolinux playbook"
- include_role: - include_role:
name: evocheck name: evolix/evocheck
tasks_from: exec.yml tasks_from: exec.yml

View File

@ -140,7 +140,7 @@
- apache - apache
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- apache - apache

View File

@ -1,6 +1,6 @@
--- ---
- include_role: - include_role:
name: apt name: evolix/apt
tasks_from: backports.yml tasks_from: backports.yml
tags: tags:
- packages - packages

View File

@ -9,7 +9,7 @@
- drbd - drbd
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- drbd - drbd

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: elasticsearch_additional_scripts_dir | search ("/usr") when: elasticsearch_additional_scripts_dir | search ("/usr")
- name: "{{ elasticsearch_additional_scripts_dir }} exists" - name: "{{ elasticsearch_additional_scripts_dir }} exists"

View File

@ -14,7 +14,7 @@ There is also an independant task that can be executed to commit changes made in
pre_tasks: pre_tasks:
- include_role: - include_role:
name: etc-git name: evolix/etc-git
tasks_from: commit.yml tasks_from: commit.yml
vars: vars:
commit_message: "Ansible pre-run my splendid playbook" commit_message: "Ansible pre-run my splendid playbook"
@ -24,7 +24,7 @@ There is also an independant task that can be executed to commit changes made in
post_tasks: post_tasks:
- include_role: - include_role:
name: etc-git name: evolix/etc-git
tasks_from: commit.yml tasks_from: commit.yml
vars: vars:
commit_message: "Ansible post-run my splendid playbook" commit_message: "Ansible post-run my splendid playbook"

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: repository_path | search ("/usr") when: repository_path | search ("/usr")
- name: "{{ repository_path }} is versioned with git" - name: "{{ repository_path }} is versioned with git"

View File

@ -3,7 +3,7 @@
- block: - block:
- name: install jessie-backports - name: install jessie-backports
include_role: include_role:
name: apt name: evolix/apt
tasks_from: backports.yml tasks_from: backports.yml
- name: Add exceptions for certbot dependencies - name: Add exceptions for certbot dependencies
@ -21,7 +21,7 @@
state: latest state: latest
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Remove certbot symlink for apt install - name: Remove certbot symlink for apt install
file: file:

View File

@ -10,7 +10,7 @@ A separate `exec.yml` file can be imported manually in playbooks or roles to exe
``` ```
- include_role: - include_role:
name: evocheck name: evolix/evocheck
tasks_from: exec.yml tasks_from: exec.yml
``` ```
## Variables ## Variables

View File

@ -1,6 +1,6 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: evocheck_bin_dir | search ("/usr") when: evocheck_bin_dir | search ("/usr")
tags: tags:
- evocheck - evocheck

View File

@ -10,4 +10,4 @@
# state: directory # state: directory
- include_role: - include_role:
name: evolinux-todo name: evolix/evolinux-todo

View File

@ -18,7 +18,7 @@
- name: Add non-free repo for Broadcom NetXtreme II - name: Add non-free repo for Broadcom NetXtreme II
include_role: include_role:
name: apt name: evolix/apt
tasks_from: basics.yml tasks_from: basics.yml
vars: vars:
apt_basics_components: "main contrib non-free" apt_basics_components: "main contrib non-free"

View File

@ -9,7 +9,7 @@
- name: Apt configuration - name: Apt configuration
include_role: include_role:
name: apt name: evolix/apt
vars: vars:
apt_install_basics: "{{ evolinux_apt_replace_default_sources }}" apt_install_basics: "{{ evolinux_apt_replace_default_sources }}"
apt_install_evolix_public: "{{ evolinux_apt_public_sources }}" apt_install_evolix_public: "{{ evolinux_apt_public_sources }}"
@ -17,7 +17,7 @@
- name: /etc versioning with Git - name: /etc versioning with Git
include_role: include_role:
name: etc-git name: evolix/etc-git
when: evolinux_etcgit_include when: evolinux_etcgit_include
- name: /etc/evolinux base - name: /etc/evolinux base
@ -46,12 +46,12 @@
- name: Minifirewall - name: Minifirewall
include_role: include_role:
name: minifirewall name: evolix/minifirewall
when: evolinux_minifirewall_include when: evolinux_minifirewall_include
- name: Evomaintenance - name: Evomaintenance
include_role: include_role:
name: evomaintenance name: evolix/evomaintenance
when: evolinux_evomaintenance_include when: evolinux_evomaintenance_include
- name: SSH configuration - name: SSH configuration
@ -61,7 +61,7 @@
### disabled because of a memory leak ### disabled because of a memory leak
# - name: Create evolinux users # - name: Create evolinux users
# include_role: # include_role:
# name: evolinux-users # name: evolix/evolinux-users
# when: evolinux_users_include # when: evolinux_users_include
- name: Root user configuration - name: Root user configuration
@ -100,25 +100,25 @@
- name: Munin - name: Munin
include_role: include_role:
name: munin name: evolix/munin
when: evolinux_munin_include when: evolinux_munin_include
- name: Nagios/NRPE - name: Nagios/NRPE
include_role: include_role:
name: nagios-nrpe name: evolix/nagios-nrpe
when: evolinux_nagios_nrpe_include when: evolinux_nagios_nrpe_include
- name: fail2ban - name: fail2ban
include_role: include_role:
name: fail2ban name: evolix/fail2ban
when: evolinux_fail2ban_include when: evolinux_fail2ban_include
- name: Listupgrade - name: Listupgrade
include_role: include_role:
name: listupgrade name: evolix/listupgrade
when: evolinux_listupgrade_include when: evolinux_listupgrade_include
- name: Generate ldif script - name: Generate ldif script
include_role: include_role:
name: generate-ldif name: evolix/generate-ldif
when: evolinux_generateldif_include when: evolinux_generateldif_include

View File

@ -34,7 +34,7 @@
# non-interactively (like tzdata ↑) # non-interactively (like tzdata ↑)
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Ensure automagic vim conf is disabled - name: Ensure automagic vim conf is disabled
lineinfile: lineinfile:
@ -120,7 +120,7 @@
when: is_cron_installed.rc == 0 and evolinux_system_cron_random when: is_cron_installed.rc == 0 and evolinux_system_cron_random
- include_role: - include_role:
name: ntpd name: evolix/ntpd
## alert5 ## alert5

View File

@ -10,6 +10,6 @@ A separate `cat.yml` file can be imported manually in playbooks or roles to get
``` ```
- include_role: - include_role:
name: evolinux-todo name: evolix/evolinux-todo
tasks_from: cat.yml tasks_from: cat.yml
``` ```

View File

@ -2,7 +2,7 @@
- name: Evolix public repositry is installed - name: Evolix public repositry is installed
include_role: include_role:
name: apt name: evolix/apt
tasks_from: evolix_public.yml tasks_from: evolix_public.yml
tags: tags:
- evomaintenance - evomaintenance

View File

@ -12,7 +12,7 @@
- evomaintenance - evomaintenance
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- evomaintenance - evomaintenance

View File

@ -56,7 +56,7 @@
- block: - block:
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Logstash plugin is installed - name: Logstash plugin is installed
command: /usr/share/logstash/bin/logstash-plugin install logstash-input-beats command: /usr/share/logstash/bin/logstash-plugin install logstash-input-beats

View File

@ -10,7 +10,7 @@ A separate `exec.yml` task file can be played manually in playbooks or roles to
``` ```
- include_role: - include_role:
name: generate-ldif name: evolix/generate-ldif
tasks_from: exec.yml tasks_from: exec.yml
``` ```
## Variables ## Variables

View File

@ -1,6 +1,6 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: general_scripts_dir | search("/usr") when: general_scripts_dir | search("/usr")
- name: "copy generateldif.sh" - name: "copy generateldif.sh"

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: apt name: evolix/apt
tasks_from: backports.yml tasks_from: backports.yml
tags: tags:
- haproxy - haproxy

View File

@ -7,7 +7,7 @@
- name: Install jessie-backports - name: Install jessie-backports
include_role: include_role:
name: apt name: evolix/apt
tasks_from: backports.yml tasks_from: backports.yml
when: ansible_distribution_release == "jessie" when: ansible_distribution_release == "jessie"
tags: tags:

View File

@ -41,7 +41,7 @@
- java - java
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Install java package - name: Install java package
apt: apt:

View File

@ -91,7 +91,7 @@
# #
# - block: # - block:
# - include_role: # - include_role:
# name: remount-usr # name: evolix/remount-usr
# #
# - name: Move kibana optimize directory # - name: Move kibana optimize directory
# shell: "mv /usr/share/kibana/{{ item }} /var/lib/kibana/{{ item }} && ln -s /var/lib/kibana/{{ item }} /usr/share/kibana/{{ item }}" # shell: "mv /usr/share/kibana/{{ item }} /var/lib/kibana/{{ item }} && ln -s /var/lib/kibana/{{ item }} /usr/share/kibana/{{ item }}"

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Scripts dir is present - name: Scripts dir is present
file: file:

View File

@ -1,7 +1,7 @@
--- ---
- name: LXC configuration - name: LXC configuration
include_role: include_role:
name: lxc name: evolix/lxc
- name: Update APT cache - name: Update APT cache
command: "lxc-attach -n {{name}} -- apt-get update" command: "lxc-attach -n {{name}} -- apt-get update"

View File

@ -1,7 +1,7 @@
--- ---
- name: LXC configuration - name: LXC configuration
include_role: include_role:
name: lxc name: evolix/lxc
- name: Ensure containers root directory is 755 - name: Ensure containers root directory is 755
file: file:

View File

@ -1,6 +1,6 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Is nrpe present ? - name: Is nrpe present ?
stat: stat:

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: /usr/share/scripts exists - name: /usr/share/scripts exists
file: file:

View File

@ -16,7 +16,7 @@
dest: "/root/{{ mysql_apt_config_package }}" dest: "/root/{{ mysql_apt_config_package }}"
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: MySQL APT config package is installed - name: MySQL APT config package is installed
apt: apt:
@ -34,7 +34,7 @@
- meta: flush_handlers - meta: flush_handlers
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: /usr/share/mysql exists - name: /usr/share/mysql exists
file: file:

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
- name: Scripts directory exists - name: Scripts directory exists
@ -56,7 +56,7 @@
when: ansible_distribution_major_version | version_compare('10', '>=') when: ansible_distribution_major_version | version_compare('10', '>=')
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- mytop - mytop
- mysql - mysql
@ -96,7 +96,7 @@
# mysqltuner # mysqltuner
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- mysql - mysql
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
@ -122,7 +122,7 @@
# automatic optimizations # automatic optimizations
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- mysql - mysql
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
@ -195,7 +195,7 @@
# my-add.sh # my-add.sh
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
- name: Install my-add.sh - name: Install my-add.sh

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
- name: Ensure scripts directory exists - name: Ensure scripts directory exists
@ -63,7 +63,7 @@
# mysqltuner # mysqltuner
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
- name: Install mysqltuner - name: Install mysqltuner
@ -99,7 +99,7 @@
# automatic optimizations # automatic optimizations
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
- name: Optimize script for MySQL - name: Optimize script for MySQL
@ -163,7 +163,7 @@
# my-add.sh # my-add.sh
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr") when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
- name: Install my-add.sh - name: Install my-add.sh

View File

@ -46,7 +46,7 @@
- nagios-nrpe - nagios-nrpe
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: nagios_plugins_directory | search ("/usr") when: nagios_plugins_directory | search ("/usr")
tags: tags:
- nagios-nrpe - nagios-nrpe

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: apt name: evolix/apt
tasks_from: backports.yml tasks_from: backports.yml
tags: tags:
- nginx - nginx

View File

@ -74,7 +74,7 @@
- opendkim - opendkim
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: deploy opendkim-add.sh script - name: deploy opendkim-add.sh script
copy: copy:

View File

@ -10,7 +10,7 @@
when: ansible_distribution_major_version | version_compare('9', '<=') when: ansible_distribution_major_version | version_compare('9', '<=')
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
# /!\ Warning: this is a temporary hack as phpmyadmin for Buster is not yet # /!\ Warning: this is a temporary hack as phpmyadmin for Buster is not yet
# available # available

View File

@ -20,7 +20,7 @@
when: not percona__apt_config_package_installed when: not percona__apt_config_package_installed
# - include_role: # - include_role:
# name: remount-usr # name: evolix/remount-usr
- name: Percona APT config package is installed from deb file - name: Percona APT config package is installed from deb file
apt: apt:

View File

@ -88,7 +88,7 @@
- postfix - postfix
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- postfix - postfix

View File

@ -1,6 +1,6 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: select locales to be generated - name: select locales to be generated
locale_gen: locale_gen:

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- rabbitmq - rabbitmq
- munin - munin

View File

@ -6,7 +6,7 @@
state: present state: present
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
# https://raw.githubusercontent.com/CaptPhunkosis/check_rabbitmq/master/check_rabbitmq # https://raw.githubusercontent.com/CaptPhunkosis/check_rabbitmq/master/check_rabbitmq
- name: check_rabbitmq is installed - name: check_rabbitmq is installed

View File

@ -7,7 +7,7 @@
- redis - redis
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- redis - redis

View File

@ -7,7 +7,7 @@
- redis - redis
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- redis - redis

View File

@ -3,7 +3,7 @@
- include: syslog.yml - include: syslog.yml
- include: user.yml - include: user.yml
- include_role: - include_role:
name: rbenv name: evolix/rbenv
vars: vars:
- username: "{{ redmine_user }}" - username: "{{ redmine_user }}"
- include: config.yml - include: config.yml

View File

@ -9,5 +9,5 @@ Include this role in task before write on /usr partition (eg. copy a file) :
~~~ ~~~
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
~~~ ~~~

View File

@ -44,7 +44,7 @@
- spamassassin - spamassassin
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: tags:
- spamassassin - spamassassin

View File

@ -5,7 +5,7 @@
state: present state: present
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
- name: Create Nagios plugins dir - name: Create Nagios plugins dir
file: file:

View File

@ -5,7 +5,7 @@
tags: varnish tags: varnish
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
tags: varnish tags: varnish
- name: Create plugin directory - name: Create plugin directory

View File

@ -1,7 +1,7 @@
--- ---
- name: Install Evolix public repositry - name: Install Evolix public repositry
include_role: include_role:
name: apt name: evolix/apt
tasks_from: evolix_public.yml tasks_from: evolix_public.yml
- name: Install vrrpd packages - name: Install vrrpd packages

View File

@ -1,7 +1,7 @@
--- ---
- include_role: - include_role:
name: apt name: evolix/apt
tasks_from: evolix_public.yml tasks_from: evolix_public.yml
- name: Install PHP packages (Debian 10 and later) - name: Install PHP packages (Debian 10 and later)
@ -14,7 +14,7 @@
# /!\ Warning, this is a temporary hack # /!\ Warning, this is a temporary hack
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
# /!\ Warning, this is a temporary hack # /!\ Warning, this is a temporary hack
- name: Install PHP packages from sid (Debian 10 and later) - name: Install PHP packages from sid (Debian 10 and later)

View File

@ -79,7 +79,7 @@
state: directory state: directory
- include_role: - include_role:
name: remount-usr name: evolix/remount-usr
when: evoadmin_scripts_dir | search ("/usr") when: evoadmin_scripts_dir | search ("/usr")
- name: "Create {{ evoadmin_scripts_dir }}" - name: "Create {{ evoadmin_scripts_dir }}"