From 0873bb49e024da81789a446ae4b0c0797f9ba1e3 Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Fri, 29 Nov 2019 14:19:52 +0100 Subject: [PATCH] Add evolix prefix to role dependencies --- clamav/meta/main.yml | 2 +- elasticsearch/meta/main.yml | 2 +- jenkins/meta/main.yml | 2 +- logstash/meta/main.yml | 2 +- packweb-apache/meta/main.yml | 14 +++++++------- postfix/meta/main.yml | 10 +++++----- spamassasin/meta/main.yml | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/clamav/meta/main.yml b/clamav/meta/main.yml index 510b6855..ae652cf8 100644 --- a/clamav/meta/main.yml +++ b/clamav/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - { role: amavis } + - { role: evolix/amavis } diff --git a/elasticsearch/meta/main.yml b/elasticsearch/meta/main.yml index 0f511c51..87df7732 100644 --- a/elasticsearch/meta/main.yml +++ b/elasticsearch/meta/main.yml @@ -25,4 +25,4 @@ galaxy_info: # alphanumeric characters. Maximum 20 tags per role. dependencies: - - { role: java, alternative: 'openjdk', java_version: 8 } + - { role: evolix/java, alternative: 'openjdk', java_version: 8 } diff --git a/jenkins/meta/main.yml b/jenkins/meta/main.yml index 5666a334..7120e512 100644 --- a/jenkins/meta/main.yml +++ b/jenkins/meta/main.yml @@ -24,4 +24,4 @@ galaxy_info: # alphanumeric characters. Maximum 20 tags per role. dependencies: - - { role: java, java_alternative: 'openjdk', java_version: 8 } + - { role: evolix/java, java_alternative: 'openjdk', java_version: 8 } diff --git a/logstash/meta/main.yml b/logstash/meta/main.yml index dff3c72e..489fa419 100644 --- a/logstash/meta/main.yml +++ b/logstash/meta/main.yml @@ -14,4 +14,4 @@ galaxy_info: - jessie dependencies: - - { role: java, java_alternative: 'openjdk', java_version: 8 } + - { role: evolix/java, java_alternative: 'openjdk', java_version: 8 } diff --git a/packweb-apache/meta/main.yml b/packweb-apache/meta/main.yml index 0afeb1e0..a276c53e 100644 --- a/packweb-apache/meta/main.yml +++ b/packweb-apache/meta/main.yml @@ -15,10 +15,10 @@ galaxy_info: - stretch dependencies: - - { role: apache } - - { role: php, php_apache_enable: True, when: packweb_apache_modphp } - - { role: php, php_fpm_enable: True, when: packweb_apache_fpm } - - { role: squid, squid_localproxy_enable: True } - - { role: mysql, when: packweb_mysql_variant == "debian" } - - { role: mysql-oracle, when: packweb_mysql_variant == "oracle" } - - { role: webapps/evoadmin-web, evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}" } + - { role: evolix/apache } + - { role: evolix/php, php_apache_enable: True, when: packweb_apache_modphp } + - { role: evolix/php, php_fpm_enable: True, when: packweb_apache_fpm } + - { role: evolix/squid, squid_localproxy_enable: True } + - { role: evolix/mysql, when: packweb_mysql_variant == "debian" } + - { role: evolix/mysql-oracle, when: packweb_mysql_variant == "oracle" } + - { role: evolix/webapps/evoadmin-web, evoadmin_enable_vhost: "{{ packweb_enable_evoadmin_vhost }}" } diff --git a/postfix/meta/main.yml b/postfix/meta/main.yml index c86b3d0b..fe59228a 100644 --- a/postfix/meta/main.yml +++ b/postfix/meta/main.yml @@ -14,8 +14,8 @@ galaxy_info: - jessie dependencies: - - { role: ldap, ldap_schema: 'cn4evolix.ldif', when: postfix_packmail == True } - - { role: spamassasin, when: postfix_packmail == True } - - { role: clamav, when: postfix_packmail == True } - - { role: opendkim, when: postfix_packmail == True } - - { role: dovecot, when: postfix_packmail == True } + - { role: evolix/ldap, ldap_schema: 'cn4evolix.ldif', when: postfix_packmail == True } + - { role: evolix/spamassasin, when: postfix_packmail == True } + - { role: evolix/clamav, when: postfix_packmail == True } + - { role: evolix/opendkim, when: postfix_packmail == True } + - { role: evolix/dovecot, when: postfix_packmail == True } diff --git a/spamassasin/meta/main.yml b/spamassasin/meta/main.yml index 510b6855..ae652cf8 100644 --- a/spamassasin/meta/main.yml +++ b/spamassasin/meta/main.yml @@ -1,3 +1,3 @@ --- dependencies: - - { role: amavis } + - { role: evolix/amavis }