Browse Source

Add evolix prefix to include_role

tags/10.0.0^2
Victor Laborie 10 months ago
parent
commit
6f5e13f8b8
52 changed files with 76 additions and 76 deletions
  1. +1
    -1
      amazon-ec2/README
  2. +4
    -4
      amazon-ec2/amazon-ec2-evolinux.yml
  3. +1
    -1
      apache/tasks/main.yml
  4. +1
    -1
      docker-host/tasks/jessie_backports.yml
  5. +1
    -1
      drbd/tasks/nagios.yml
  6. +1
    -1
      elasticsearch/tasks/additional_scripts.yml
  7. +2
    -2
      etc-git/README.md
  8. +1
    -1
      etc-git/tasks/repository.yml
  9. +2
    -2
      evoacme/tasks/certbot.yml
  10. +1
    -1
      evocheck/README.md
  11. +1
    -1
      evocheck/tasks/install_local.yml
  12. +1
    -1
      evolinux-base/tasks/etc-evolinux.yml
  13. +1
    -1
      evolinux-base/tasks/hardware.yml
  14. +10
    -10
      evolinux-base/tasks/main.yml
  15. +2
    -2
      evolinux-base/tasks/system.yml
  16. +1
    -1
      evolinux-todo/README.md
  17. +1
    -1
      evomaintenance/tasks/install_package_debian.yml
  18. +1
    -1
      evomaintenance/tasks/install_vendor_debian.yml
  19. +1
    -1
      filebeat/tasks/main.yml
  20. +1
    -1
      generate-ldif/README.md
  21. +1
    -1
      generate-ldif/tasks/main.yml
  22. +1
    -1
      haproxy/tasks/packages_backports.yml
  23. +1
    -1
      java/tasks/openjdk.yml
  24. +1
    -1
      java/tasks/oracle.yml
  25. +1
    -1
      kibana/tasks/main.yml
  26. +1
    -1
      listupgrade/tasks/main.yml
  27. +1
    -1
      lxc-php/tasks/main.yml
  28. +1
    -1
      lxc-solr/tasks/main.yml
  29. +1
    -1
      memcached/tasks/nrpe.yml
  30. +1
    -1
      minifirewall/tasks/nrpe.yml
  31. +2
    -2
      mysql-oracle/tasks/packages.yml
  32. +5
    -5
      mysql-oracle/tasks/utils.yml
  33. +4
    -4
      mysql/tasks/utils.yml
  34. +1
    -1
      nagios-nrpe/tasks/main.yml
  35. +1
    -1
      nginx/tasks/packages_backports.yml
  36. +1
    -1
      opendkim/tasks/main.yml
  37. +1
    -1
      packweb-apache/tasks/phpmyadmin.yml
  38. +1
    -1
      percona/tasks/main.yml
  39. +1
    -1
      postfix/tasks/packmail.yml
  40. +1
    -1
      postgresql/tasks/locales.yml
  41. +1
    -1
      rabbitmq/tasks/munin.yml
  42. +1
    -1
      rabbitmq/tasks/nrpe.yml
  43. +1
    -1
      redis/tasks/default-munin.yml
  44. +1
    -1
      redis/tasks/instance-munin.yml
  45. +1
    -1
      redmine/tasks/main.yml
  46. +1
    -1
      remount-usr/README.md
  47. +1
    -1
      spamassasin/tasks/main.yml
  48. +1
    -1
      tomcat/tasks/nagios.yml
  49. +1
    -1
      varnish/tasks/munin.yml
  50. +1
    -1
      vrrpd/tasks/main.yml
  51. +2
    -2
      webapps/evoadmin-web/tasks/packages.yml
  52. +1
    -1
      webapps/evoadmin-web/tasks/user.yml

+ 1
- 1
amazon-ec2/README View File

@@ -52,7 +52,7 @@ In your main evolinux playbook put this play before Evolinux one:

tasks:
- include_role:
name: amazon-ec2
name: evolix/amazon-ec2
tasks_from: create-instance.yml
```



+ 4
- 4
amazon-ec2/amazon-ec2-evolinux.yml View File

@@ -10,10 +10,10 @@

tasks:
- include_role:
name: amazon-ec2
name: evolix/amazon-ec2
tasks_from: setup.yml
- include_role:
name: amazon-ec2
name: evolix/amazon-ec2
tasks_from: create-instance.yml

- name: Install Evolinux
@@ -52,11 +52,11 @@

post_tasks:
- include_role:
name: etc-git
name: evolix/etc-git
tasks_from: commit.yml
vars:
commit_message: "Ansible post-run Evolinux playbook"

- include_role:
name: evocheck
name: evolix/evocheck
tasks_from: exec.yml

+ 1
- 1
apache/tasks/main.yml View File

@@ -140,7 +140,7 @@
- apache

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- apache



+ 1
- 1
docker-host/tasks/jessie_backports.yml View File

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


+ 1
- 1
drbd/tasks/nagios.yml View File

@@ -9,7 +9,7 @@
- drbd

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- drbd



+ 1
- 1
elasticsearch/tasks/additional_scripts.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr
when: elasticsearch_additional_scripts_dir | search ("/usr")

- name: "{{ elasticsearch_additional_scripts_dir }} exists"


+ 2
- 2
etc-git/README.md View File

@@ -14,7 +14,7 @@ There is also an independant task that can be executed to commit changes made in

pre_tasks:
- include_role:
name: etc-git
name: evolix/etc-git
tasks_from: commit.yml
vars:
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:
- include_role:
name: etc-git
name: evolix/etc-git
tasks_from: commit.yml
vars:
commit_message: "Ansible post-run my splendid playbook"


+ 1
- 1
etc-git/tasks/repository.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr
when: repository_path | search ("/usr")

- name: "{{ repository_path }} is versioned with git"


+ 2
- 2
evoacme/tasks/certbot.yml View File

@@ -3,7 +3,7 @@
- block:
- name: install jessie-backports
include_role:
name: apt
name: evolix/apt
tasks_from: backports.yml

- name: Add exceptions for certbot dependencies
@@ -21,7 +21,7 @@
state: latest

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Remove certbot symlink for apt install
file:


+ 1
- 1
evocheck/README.md View File

@@ -10,7 +10,7 @@ A separate `exec.yml` file can be imported manually in playbooks or roles to exe

```
- include_role:
name: evocheck
name: evolix/evocheck
tasks_from: exec.yml
```
## Variables


+ 1
- 1
evocheck/tasks/install_local.yml View File

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


+ 1
- 1
evolinux-base/tasks/etc-evolinux.yml View File

@@ -10,4 +10,4 @@
# state: directory

- include_role:
name: evolinux-todo
name: evolix/evolinux-todo

+ 1
- 1
evolinux-base/tasks/hardware.yml View File

@@ -18,7 +18,7 @@

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


+ 10
- 10
evolinux-base/tasks/main.yml View File

@@ -9,7 +9,7 @@

- name: Apt configuration
include_role:
name: apt
name: evolix/apt
vars:
apt_install_basics: "{{ evolinux_apt_replace_default_sources }}"
apt_install_evolix_public: "{{ evolinux_apt_public_sources }}"
@@ -17,7 +17,7 @@

- name: /etc versioning with Git
include_role:
name: etc-git
name: evolix/etc-git
when: evolinux_etcgit_include

- name: /etc/evolinux base
@@ -46,12 +46,12 @@

- name: Minifirewall
include_role:
name: minifirewall
name: evolix/minifirewall
when: evolinux_minifirewall_include

- name: Evomaintenance
include_role:
name: evomaintenance
name: evolix/evomaintenance
when: evolinux_evomaintenance_include

- name: SSH configuration
@@ -61,7 +61,7 @@
### disabled because of a memory leak
# - name: Create evolinux users
# include_role:
# name: evolinux-users
# name: evolix/evolinux-users
# when: evolinux_users_include

- name: Root user configuration
@@ -100,25 +100,25 @@

- name: Munin
include_role:
name: munin
name: evolix/munin
when: evolinux_munin_include

- name: Nagios/NRPE
include_role:
name: nagios-nrpe
name: evolix/nagios-nrpe
when: evolinux_nagios_nrpe_include

- name: fail2ban
include_role:
name: fail2ban
name: evolix/fail2ban
when: evolinux_fail2ban_include

- name: Listupgrade
include_role:
name: listupgrade
name: evolix/listupgrade
when: evolinux_listupgrade_include

- name: Generate ldif script
include_role:
name: generate-ldif
name: evolix/generate-ldif
when: evolinux_generateldif_include

+ 2
- 2
evolinux-base/tasks/system.yml View File

@@ -34,7 +34,7 @@
# non-interactively (like tzdata ↑)

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Ensure automagic vim conf is disabled
lineinfile:
@@ -120,7 +120,7 @@
when: is_cron_installed.rc == 0 and evolinux_system_cron_random

- include_role:
name: ntpd
name: evolix/ntpd

## alert5



+ 1
- 1
evolinux-todo/README.md View File

@@ -10,6 +10,6 @@ A separate `cat.yml` file can be imported manually in playbooks or roles to get

```
- include_role:
name: evolinux-todo
name: evolix/evolinux-todo
tasks_from: cat.yml
```

+ 1
- 1
evomaintenance/tasks/install_package_debian.yml View File

@@ -2,7 +2,7 @@

- name: Evolix public repositry is installed
include_role:
name: apt
name: evolix/apt
tasks_from: evolix_public.yml
tags:
- evomaintenance


+ 1
- 1
evomaintenance/tasks/install_vendor_debian.yml View File

@@ -12,7 +12,7 @@
- evomaintenance

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- evomaintenance



+ 1
- 1
filebeat/tasks/main.yml View File

@@ -56,7 +56,7 @@

- block:
- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Logstash plugin is installed
command: /usr/share/logstash/bin/logstash-plugin install logstash-input-beats


+ 1
- 1
generate-ldif/README.md View File

@@ -10,7 +10,7 @@ A separate `exec.yml` task file can be played manually in playbooks or roles to

```
- include_role:
name: generate-ldif
name: evolix/generate-ldif
tasks_from: exec.yml
```
## Variables


+ 1
- 1
generate-ldif/tasks/main.yml View File

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

- name: "copy generateldif.sh"


+ 1
- 1
haproxy/tasks/packages_backports.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: apt
name: evolix/apt
tasks_from: backports.yml
tags:
- haproxy


+ 1
- 1
java/tasks/openjdk.yml View File

@@ -7,7 +7,7 @@

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


+ 1
- 1
java/tasks/oracle.yml View File

@@ -41,7 +41,7 @@
- java

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Install java package
apt:


+ 1
- 1
kibana/tasks/main.yml View File

@@ -91,7 +91,7 @@
#
# - block:
# - include_role:
# name: remount-usr
# name: evolix/remount-usr
#
# - 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 }}"


+ 1
- 1
listupgrade/tasks/main.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Scripts dir is present
file:


+ 1
- 1
lxc-php/tasks/main.yml View File

@@ -1,7 +1,7 @@
---
- name: LXC configuration
include_role:
name: lxc
name: evolix/lxc

- name: Update APT cache
command: "lxc-attach -n {{name}} -- apt-get update"


+ 1
- 1
lxc-solr/tasks/main.yml View File

@@ -1,7 +1,7 @@
---
- name: LXC configuration
include_role:
name: lxc
name: evolix/lxc

- name: Ensure containers root directory is 755
file:


+ 1
- 1
memcached/tasks/nrpe.yml View File

@@ -1,6 +1,6 @@
---
- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Is nrpe present ?
stat:


+ 1
- 1
minifirewall/tasks/nrpe.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: /usr/share/scripts exists
file:


+ 2
- 2
mysql-oracle/tasks/packages.yml View File

@@ -16,7 +16,7 @@
dest: "/root/{{ mysql_apt_config_package }}"

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: MySQL APT config package is installed
apt:
@@ -34,7 +34,7 @@
- meta: flush_handlers

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: /usr/share/mysql exists
file:


+ 5
- 5
mysql-oracle/tasks/utils.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")

- name: Scripts directory exists
@@ -56,7 +56,7 @@
when: ansible_distribution_major_version | version_compare('10', '>=')

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- mytop
- mysql
@@ -96,7 +96,7 @@
# mysqltuner

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- mysql
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
@@ -122,7 +122,7 @@
# automatic optimizations

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- mysql
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")
@@ -195,7 +195,7 @@
# my-add.sh

- include_role:
name: remount-usr
name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")

- name: Install my-add.sh


+ 4
- 4
mysql/tasks/utils.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")

- name: Ensure scripts directory exists
@@ -63,7 +63,7 @@
# mysqltuner

- include_role:
name: remount-usr
name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")

- name: Install mysqltuner
@@ -99,7 +99,7 @@
# automatic optimizations

- include_role:
name: remount-usr
name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")

- name: Optimize script for MySQL
@@ -163,7 +163,7 @@
# my-add.sh

- include_role:
name: remount-usr
name: evolix/remount-usr
when: (mysql_scripts_dir or general_scripts_dir) | search ("/usr")

- name: Install my-add.sh


+ 1
- 1
nagios-nrpe/tasks/main.yml View File

@@ -46,7 +46,7 @@
- nagios-nrpe

- include_role:
name: remount-usr
name: evolix/remount-usr
when: nagios_plugins_directory | search ("/usr")
tags:
- nagios-nrpe


+ 1
- 1
nginx/tasks/packages_backports.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: apt
name: evolix/apt
tasks_from: backports.yml
tags:
- nginx


+ 1
- 1
opendkim/tasks/main.yml View File

@@ -74,7 +74,7 @@
- opendkim

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: deploy opendkim-add.sh script
copy:


+ 1
- 1
packweb-apache/tasks/phpmyadmin.yml View File

@@ -10,7 +10,7 @@
when: ansible_distribution_major_version | version_compare('9', '<=')

- include_role:
name: remount-usr
name: evolix/remount-usr

# /!\ Warning: this is a temporary hack as phpmyadmin for Buster is not yet
# available


+ 1
- 1
percona/tasks/main.yml View File

@@ -20,7 +20,7 @@
when: not percona__apt_config_package_installed

# - include_role:
# name: remount-usr
# name: evolix/remount-usr

- name: Percona APT config package is installed from deb file
apt:


+ 1
- 1
postfix/tasks/packmail.yml View File

@@ -88,7 +88,7 @@
- postfix

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- postfix



+ 1
- 1
postgresql/tasks/locales.yml View File

@@ -1,6 +1,6 @@
---
- include_role:
name: remount-usr
name: evolix/remount-usr

- name: select locales to be generated
locale_gen:


+ 1
- 1
rabbitmq/tasks/munin.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- rabbitmq
- munin


+ 1
- 1
rabbitmq/tasks/nrpe.yml View File

@@ -6,7 +6,7 @@
state: present

- include_role:
name: remount-usr
name: evolix/remount-usr

# https://raw.githubusercontent.com/CaptPhunkosis/check_rabbitmq/master/check_rabbitmq
- name: check_rabbitmq is installed


+ 1
- 1
redis/tasks/default-munin.yml View File

@@ -7,7 +7,7 @@
- redis

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- redis



+ 1
- 1
redis/tasks/instance-munin.yml View File

@@ -7,7 +7,7 @@
- redis

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- redis



+ 1
- 1
redmine/tasks/main.yml View File

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


+ 1
- 1
remount-usr/README.md View File

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

~~~
- include_role:
name: remount-usr
name: evolix/remount-usr
~~~

+ 1
- 1
spamassasin/tasks/main.yml View File

@@ -44,7 +44,7 @@
- spamassassin

- include_role:
name: remount-usr
name: evolix/remount-usr
tags:
- spamassassin



+ 1
- 1
tomcat/tasks/nagios.yml View File

@@ -5,7 +5,7 @@
state: present

- include_role:
name: remount-usr
name: evolix/remount-usr

- name: Create Nagios plugins dir
file:


+ 1
- 1
varnish/tasks/munin.yml View File

@@ -5,7 +5,7 @@
tags: varnish

- include_role:
name: remount-usr
name: evolix/remount-usr
tags: varnish

- name: Create plugin directory


+ 1
- 1
vrrpd/tasks/main.yml View File

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

- name: Install vrrpd packages


+ 2
- 2
webapps/evoadmin-web/tasks/packages.yml View File

@@ -1,7 +1,7 @@
---

- include_role:
name: apt
name: evolix/apt
tasks_from: evolix_public.yml

- name: Install PHP packages (Debian 10 and later)
@@ -14,7 +14,7 @@

# /!\ Warning, this is a temporary hack
- include_role:
name: remount-usr
name: evolix/remount-usr

# /!\ Warning, this is a temporary hack
- name: Install PHP packages from sid (Debian 10 and later)


+ 1
- 1
webapps/evoadmin-web/tasks/user.yml View File

@@ -79,7 +79,7 @@
state: directory

- include_role:
name: remount-usr
name: evolix/remount-usr
when: evoadmin_scripts_dir | search ("/usr")

- name: "Create {{ evoadmin_scripts_dir }}"


Loading…
Cancel
Save