From 6f5e13f8b8072595f044d4762c1275276c83b217 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Fri, 29 Nov 2019 14:00:25 +0100 Subject: [PATCH] Add evolix prefix to include_role --- amazon-ec2/README | 2 +- amazon-ec2/amazon-ec2-evolinux.yml | 8 ++++---- apache/tasks/main.yml | 2 +- docker-host/tasks/jessie_backports.yml | 2 +- drbd/tasks/nagios.yml | 2 +- elasticsearch/tasks/additional_scripts.yml | 2 +- etc-git/README.md | 4 ++-- etc-git/tasks/repository.yml | 2 +- evoacme/tasks/certbot.yml | 4 ++-- evocheck/README.md | 2 +- evocheck/tasks/install_local.yml | 2 +- evolinux-base/tasks/etc-evolinux.yml | 2 +- evolinux-base/tasks/hardware.yml | 2 +- evolinux-base/tasks/main.yml | 20 +++++++++---------- evolinux-base/tasks/system.yml | 4 ++-- evolinux-todo/README.md | 2 +- .../tasks/install_package_debian.yml | 2 +- .../tasks/install_vendor_debian.yml | 2 +- filebeat/tasks/main.yml | 2 +- generate-ldif/README.md | 2 +- generate-ldif/tasks/main.yml | 2 +- haproxy/tasks/packages_backports.yml | 2 +- java/tasks/openjdk.yml | 2 +- java/tasks/oracle.yml | 2 +- kibana/tasks/main.yml | 2 +- listupgrade/tasks/main.yml | 2 +- lxc-php/tasks/main.yml | 2 +- lxc-solr/tasks/main.yml | 2 +- memcached/tasks/nrpe.yml | 2 +- minifirewall/tasks/nrpe.yml | 2 +- mysql-oracle/tasks/packages.yml | 4 ++-- mysql-oracle/tasks/utils.yml | 10 +++++----- mysql/tasks/utils.yml | 8 ++++---- nagios-nrpe/tasks/main.yml | 2 +- nginx/tasks/packages_backports.yml | 2 +- opendkim/tasks/main.yml | 2 +- packweb-apache/tasks/phpmyadmin.yml | 2 +- percona/tasks/main.yml | 2 +- postfix/tasks/packmail.yml | 2 +- postgresql/tasks/locales.yml | 2 +- rabbitmq/tasks/munin.yml | 2 +- rabbitmq/tasks/nrpe.yml | 2 +- redis/tasks/default-munin.yml | 2 +- redis/tasks/instance-munin.yml | 2 +- redmine/tasks/main.yml | 2 +- remount-usr/README.md | 2 +- spamassasin/tasks/main.yml | 2 +- tomcat/tasks/nagios.yml | 2 +- varnish/tasks/munin.yml | 2 +- vrrpd/tasks/main.yml | 2 +- webapps/evoadmin-web/tasks/packages.yml | 4 ++-- webapps/evoadmin-web/tasks/user.yml | 2 +- 52 files changed, 76 insertions(+), 76 deletions(-) diff --git a/amazon-ec2/README b/amazon-ec2/README index 15f8b129..30b5891f 100644 --- a/amazon-ec2/README +++ b/amazon-ec2/README @@ -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 ``` diff --git a/amazon-ec2/amazon-ec2-evolinux.yml b/amazon-ec2/amazon-ec2-evolinux.yml index d9d79347..d4e125a7 100644 --- a/amazon-ec2/amazon-ec2-evolinux.yml +++ b/amazon-ec2/amazon-ec2-evolinux.yml @@ -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 diff --git a/apache/tasks/main.yml b/apache/tasks/main.yml index a461a8d4..f5e20cfd 100644 --- a/apache/tasks/main.yml +++ b/apache/tasks/main.yml @@ -140,7 +140,7 @@ - apache - include_role: - name: remount-usr + name: evolix/remount-usr tags: - apache diff --git a/docker-host/tasks/jessie_backports.yml b/docker-host/tasks/jessie_backports.yml index 727ee7c8..bb06e62e 100644 --- a/docker-host/tasks/jessie_backports.yml +++ b/docker-host/tasks/jessie_backports.yml @@ -1,6 +1,6 @@ --- - include_role: - name: apt + name: evolix/apt tasks_from: backports.yml tags: - packages diff --git a/drbd/tasks/nagios.yml b/drbd/tasks/nagios.yml index 91b06c57..ea436a5b 100644 --- a/drbd/tasks/nagios.yml +++ b/drbd/tasks/nagios.yml @@ -9,7 +9,7 @@ - drbd - include_role: - name: remount-usr + name: evolix/remount-usr tags: - drbd diff --git a/elasticsearch/tasks/additional_scripts.yml b/elasticsearch/tasks/additional_scripts.yml index 837acd6d..96d10d4b 100644 --- a/elasticsearch/tasks/additional_scripts.yml +++ b/elasticsearch/tasks/additional_scripts.yml @@ -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" diff --git a/etc-git/README.md b/etc-git/README.md index 2d3c3840..9823206d 100644 --- a/etc-git/README.md +++ b/etc-git/README.md @@ -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" diff --git a/etc-git/tasks/repository.yml b/etc-git/tasks/repository.yml index 587c6f79..04078836 100644 --- a/etc-git/tasks/repository.yml +++ b/etc-git/tasks/repository.yml @@ -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" diff --git a/evoacme/tasks/certbot.yml b/evoacme/tasks/certbot.yml index 003c92d0..44fe4bb5 100644 --- a/evoacme/tasks/certbot.yml +++ b/evoacme/tasks/certbot.yml @@ -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: diff --git a/evocheck/README.md b/evocheck/README.md index 807b9a44..ce9999c0 100644 --- a/evocheck/README.md +++ b/evocheck/README.md @@ -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 diff --git a/evocheck/tasks/install_local.yml b/evocheck/tasks/install_local.yml index e33d565e..cb390cd2 100644 --- a/evocheck/tasks/install_local.yml +++ b/evocheck/tasks/install_local.yml @@ -1,6 +1,6 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr when: evocheck_bin_dir | search ("/usr") tags: - evocheck diff --git a/evolinux-base/tasks/etc-evolinux.yml b/evolinux-base/tasks/etc-evolinux.yml index fddc82a8..56b0a976 100644 --- a/evolinux-base/tasks/etc-evolinux.yml +++ b/evolinux-base/tasks/etc-evolinux.yml @@ -10,4 +10,4 @@ # state: directory - include_role: - name: evolinux-todo + name: evolix/evolinux-todo diff --git a/evolinux-base/tasks/hardware.yml b/evolinux-base/tasks/hardware.yml index fa43afca..d14f90c6 100644 --- a/evolinux-base/tasks/hardware.yml +++ b/evolinux-base/tasks/hardware.yml @@ -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" diff --git a/evolinux-base/tasks/main.yml b/evolinux-base/tasks/main.yml index 12f60807..031afe73 100644 --- a/evolinux-base/tasks/main.yml +++ b/evolinux-base/tasks/main.yml @@ -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 diff --git a/evolinux-base/tasks/system.yml b/evolinux-base/tasks/system.yml index dbf9cbd9..fb01d238 100644 --- a/evolinux-base/tasks/system.yml +++ b/evolinux-base/tasks/system.yml @@ -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 diff --git a/evolinux-todo/README.md b/evolinux-todo/README.md index 52c397c7..536490fa 100644 --- a/evolinux-todo/README.md +++ b/evolinux-todo/README.md @@ -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 ``` diff --git a/evomaintenance/tasks/install_package_debian.yml b/evomaintenance/tasks/install_package_debian.yml index 2c811d79..a5da77ea 100644 --- a/evomaintenance/tasks/install_package_debian.yml +++ b/evomaintenance/tasks/install_package_debian.yml @@ -2,7 +2,7 @@ - name: Evolix public repositry is installed include_role: - name: apt + name: evolix/apt tasks_from: evolix_public.yml tags: - evomaintenance diff --git a/evomaintenance/tasks/install_vendor_debian.yml b/evomaintenance/tasks/install_vendor_debian.yml index 744db54a..757dee16 100644 --- a/evomaintenance/tasks/install_vendor_debian.yml +++ b/evomaintenance/tasks/install_vendor_debian.yml @@ -12,7 +12,7 @@ - evomaintenance - include_role: - name: remount-usr + name: evolix/remount-usr tags: - evomaintenance diff --git a/filebeat/tasks/main.yml b/filebeat/tasks/main.yml index e02ff6ab..6bec3be7 100644 --- a/filebeat/tasks/main.yml +++ b/filebeat/tasks/main.yml @@ -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 diff --git a/generate-ldif/README.md b/generate-ldif/README.md index a71be619..afc194a7 100644 --- a/generate-ldif/README.md +++ b/generate-ldif/README.md @@ -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 diff --git a/generate-ldif/tasks/main.yml b/generate-ldif/tasks/main.yml index 35da06be..4ff7e376 100644 --- a/generate-ldif/tasks/main.yml +++ b/generate-ldif/tasks/main.yml @@ -1,6 +1,6 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr when: general_scripts_dir | search("/usr") - name: "copy generateldif.sh" diff --git a/haproxy/tasks/packages_backports.yml b/haproxy/tasks/packages_backports.yml index 3be91268..d7d0c1fd 100644 --- a/haproxy/tasks/packages_backports.yml +++ b/haproxy/tasks/packages_backports.yml @@ -1,7 +1,7 @@ --- - include_role: - name: apt + name: evolix/apt tasks_from: backports.yml tags: - haproxy diff --git a/java/tasks/openjdk.yml b/java/tasks/openjdk.yml index 9b4f0b7d..770704af 100644 --- a/java/tasks/openjdk.yml +++ b/java/tasks/openjdk.yml @@ -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: diff --git a/java/tasks/oracle.yml b/java/tasks/oracle.yml index dd80303b..41e2a012 100644 --- a/java/tasks/oracle.yml +++ b/java/tasks/oracle.yml @@ -41,7 +41,7 @@ - java - include_role: - name: remount-usr + name: evolix/remount-usr - name: Install java package apt: diff --git a/kibana/tasks/main.yml b/kibana/tasks/main.yml index b1e7cb42..46fbe980 100644 --- a/kibana/tasks/main.yml +++ b/kibana/tasks/main.yml @@ -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 }}" diff --git a/listupgrade/tasks/main.yml b/listupgrade/tasks/main.yml index 086cad1f..bb60da30 100644 --- a/listupgrade/tasks/main.yml +++ b/listupgrade/tasks/main.yml @@ -1,7 +1,7 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr - name: Scripts dir is present file: diff --git a/lxc-php/tasks/main.yml b/lxc-php/tasks/main.yml index 7970eb74..8fb9f0a9 100644 --- a/lxc-php/tasks/main.yml +++ b/lxc-php/tasks/main.yml @@ -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" diff --git a/lxc-solr/tasks/main.yml b/lxc-solr/tasks/main.yml index 86ef2500..a18c46dc 100644 --- a/lxc-solr/tasks/main.yml +++ b/lxc-solr/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: LXC configuration include_role: - name: lxc + name: evolix/lxc - name: Ensure containers root directory is 755 file: diff --git a/memcached/tasks/nrpe.yml b/memcached/tasks/nrpe.yml index 178db3ad..21070aec 100644 --- a/memcached/tasks/nrpe.yml +++ b/memcached/tasks/nrpe.yml @@ -1,6 +1,6 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr - name: Is nrpe present ? stat: diff --git a/minifirewall/tasks/nrpe.yml b/minifirewall/tasks/nrpe.yml index ae7951e0..2e9674f7 100644 --- a/minifirewall/tasks/nrpe.yml +++ b/minifirewall/tasks/nrpe.yml @@ -1,7 +1,7 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr - name: /usr/share/scripts exists file: diff --git a/mysql-oracle/tasks/packages.yml b/mysql-oracle/tasks/packages.yml index e77288c5..bc19f305 100644 --- a/mysql-oracle/tasks/packages.yml +++ b/mysql-oracle/tasks/packages.yml @@ -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: diff --git a/mysql-oracle/tasks/utils.yml b/mysql-oracle/tasks/utils.yml index 470ec4c8..ef2fe4a7 100644 --- a/mysql-oracle/tasks/utils.yml +++ b/mysql-oracle/tasks/utils.yml @@ -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 diff --git a/mysql/tasks/utils.yml b/mysql/tasks/utils.yml index a24c49c8..8981a5b4 100644 --- a/mysql/tasks/utils.yml +++ b/mysql/tasks/utils.yml @@ -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 diff --git a/nagios-nrpe/tasks/main.yml b/nagios-nrpe/tasks/main.yml index 0731c74c..291553da 100644 --- a/nagios-nrpe/tasks/main.yml +++ b/nagios-nrpe/tasks/main.yml @@ -46,7 +46,7 @@ - nagios-nrpe - include_role: - name: remount-usr + name: evolix/remount-usr when: nagios_plugins_directory | search ("/usr") tags: - nagios-nrpe diff --git a/nginx/tasks/packages_backports.yml b/nginx/tasks/packages_backports.yml index dbb3a76a..dff73721 100644 --- a/nginx/tasks/packages_backports.yml +++ b/nginx/tasks/packages_backports.yml @@ -1,7 +1,7 @@ --- - include_role: - name: apt + name: evolix/apt tasks_from: backports.yml tags: - nginx diff --git a/opendkim/tasks/main.yml b/opendkim/tasks/main.yml index 1769870a..02c16494 100644 --- a/opendkim/tasks/main.yml +++ b/opendkim/tasks/main.yml @@ -74,7 +74,7 @@ - opendkim - include_role: - name: remount-usr + name: evolix/remount-usr - name: deploy opendkim-add.sh script copy: diff --git a/packweb-apache/tasks/phpmyadmin.yml b/packweb-apache/tasks/phpmyadmin.yml index dfc5e1a9..ac2f96eb 100644 --- a/packweb-apache/tasks/phpmyadmin.yml +++ b/packweb-apache/tasks/phpmyadmin.yml @@ -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 diff --git a/percona/tasks/main.yml b/percona/tasks/main.yml index cce78c3a..f60a1a6a 100644 --- a/percona/tasks/main.yml +++ b/percona/tasks/main.yml @@ -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: diff --git a/postfix/tasks/packmail.yml b/postfix/tasks/packmail.yml index 9f00fa28..fd73070c 100644 --- a/postfix/tasks/packmail.yml +++ b/postfix/tasks/packmail.yml @@ -88,7 +88,7 @@ - postfix - include_role: - name: remount-usr + name: evolix/remount-usr tags: - postfix diff --git a/postgresql/tasks/locales.yml b/postgresql/tasks/locales.yml index a0e6e434..89687a7c 100644 --- a/postgresql/tasks/locales.yml +++ b/postgresql/tasks/locales.yml @@ -1,6 +1,6 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr - name: select locales to be generated locale_gen: diff --git a/rabbitmq/tasks/munin.yml b/rabbitmq/tasks/munin.yml index 1b410d37..cb872391 100644 --- a/rabbitmq/tasks/munin.yml +++ b/rabbitmq/tasks/munin.yml @@ -1,7 +1,7 @@ --- - include_role: - name: remount-usr + name: evolix/remount-usr tags: - rabbitmq - munin diff --git a/rabbitmq/tasks/nrpe.yml b/rabbitmq/tasks/nrpe.yml index 02c7c97b..c4c700df 100644 --- a/rabbitmq/tasks/nrpe.yml +++ b/rabbitmq/tasks/nrpe.yml @@ -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 diff --git a/redis/tasks/default-munin.yml b/redis/tasks/default-munin.yml index 5f2a2dc7..b7edce3a 100644 --- a/redis/tasks/default-munin.yml +++ b/redis/tasks/default-munin.yml @@ -7,7 +7,7 @@ - redis - include_role: - name: remount-usr + name: evolix/remount-usr tags: - redis diff --git a/redis/tasks/instance-munin.yml b/redis/tasks/instance-munin.yml index c8d7cefe..8d0e207c 100644 --- a/redis/tasks/instance-munin.yml +++ b/redis/tasks/instance-munin.yml @@ -7,7 +7,7 @@ - redis - include_role: - name: remount-usr + name: evolix/remount-usr tags: - redis diff --git a/redmine/tasks/main.yml b/redmine/tasks/main.yml index 2b7fd225..eb5c5915 100644 --- a/redmine/tasks/main.yml +++ b/redmine/tasks/main.yml @@ -3,7 +3,7 @@ - include: syslog.yml - include: user.yml - include_role: - name: rbenv + name: evolix/rbenv vars: - username: "{{ redmine_user }}" - include: config.yml diff --git a/remount-usr/README.md b/remount-usr/README.md index 8457200c..d1f2691e 100644 --- a/remount-usr/README.md +++ b/remount-usr/README.md @@ -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 ~~~ diff --git a/spamassasin/tasks/main.yml b/spamassasin/tasks/main.yml index 078e684d..f79a40df 100644 --- a/spamassasin/tasks/main.yml +++ b/spamassasin/tasks/main.yml @@ -44,7 +44,7 @@ - spamassassin - include_role: - name: remount-usr + name: evolix/remount-usr tags: - spamassassin diff --git a/tomcat/tasks/nagios.yml b/tomcat/tasks/nagios.yml index 69c99810..1eb297cf 100644 --- a/tomcat/tasks/nagios.yml +++ b/tomcat/tasks/nagios.yml @@ -5,7 +5,7 @@ state: present - include_role: - name: remount-usr + name: evolix/remount-usr - name: Create Nagios plugins dir file: diff --git a/varnish/tasks/munin.yml b/varnish/tasks/munin.yml index 552c8a34..6e307c49 100644 --- a/varnish/tasks/munin.yml +++ b/varnish/tasks/munin.yml @@ -5,7 +5,7 @@ tags: varnish - include_role: - name: remount-usr + name: evolix/remount-usr tags: varnish - name: Create plugin directory diff --git a/vrrpd/tasks/main.yml b/vrrpd/tasks/main.yml index b4f9b118..b6f4e7f5 100644 --- a/vrrpd/tasks/main.yml +++ b/vrrpd/tasks/main.yml @@ -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 diff --git a/webapps/evoadmin-web/tasks/packages.yml b/webapps/evoadmin-web/tasks/packages.yml index 2938292d..33a2b6d7 100644 --- a/webapps/evoadmin-web/tasks/packages.yml +++ b/webapps/evoadmin-web/tasks/packages.yml @@ -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) diff --git a/webapps/evoadmin-web/tasks/user.yml b/webapps/evoadmin-web/tasks/user.yml index 4780be40..4c635413 100644 --- a/webapps/evoadmin-web/tasks/user.yml +++ b/webapps/evoadmin-web/tasks/user.yml @@ -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 }}"