From ace68db4b4421362c4ea8ad07777a8f07bb265b0 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 28 Feb 2018 17:24:44 +0100 Subject: [PATCH] packweb-apache can use MySQL from Oracle. --- CHANGELOG.md | 1 + packweb-apache/README.md | 1 + packweb-apache/defaults/main.yml | 2 ++ packweb-apache/meta/main.yml | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66e7da49..d7862465 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ The **patch** part changes incrmentally at each release. * nagios-nrpe: add "check_open_files" plugin * nagios-nrpe: mark plugins as executable * mysql-oracle: new role to install MySQL 5.7 with Oracle packages +* packweb-apache: choose mysql variant (default: `debian`) ### Changed * elasticsearch: use ES_TMPDIR variable for custom tmpdir, (from `/etc/default/elasticsearch` instead of changing `/etc/elesticsearch/jvm.options`). diff --git a/packweb-apache/README.md b/packweb-apache/README.md index 99e25da1..e99c285e 100644 --- a/packweb-apache/README.md +++ b/packweb-apache/README.md @@ -11,5 +11,6 @@ See `tasks/main.yml`. Main variables are : * `packweb_enable_evoadmin_vhost` : enable VirtualHost for evoadmin (web interface to create web accounts) +* `packweb_mysql_variant`: which Variant to use for MySQL (`debian` or `oracle`, default: `debian`) The full list of variables (with default values) can be found in `defaults/main.yml`. diff --git a/packweb-apache/defaults/main.yml b/packweb-apache/defaults/main.yml index 8282d081..7f79e90d 100644 --- a/packweb-apache/defaults/main.yml +++ b/packweb-apache/defaults/main.yml @@ -8,3 +8,5 @@ packweb_apache_modphp: True packweb_apache_fpm: False packweb_phpmyadmin_suffix: "" + +packweb_mysql_variant: "debian" diff --git a/packweb-apache/meta/main.yml b/packweb-apache/meta/main.yml index 914dbebb..47348f1a 100644 --- a/packweb-apache/meta/main.yml +++ b/packweb-apache/meta/main.yml @@ -16,4 +16,5 @@ galaxy_info: dependencies: - { role: squid, squid_localproxy_enable: True } - - mysql + - { role: mysql, when: packweb_mysql_variant == "debian" } + - { role: mysql-oracle, when: packweb_mysql_variant == "oracle" }