From ce0644e976463fd7bda8ff5d263244c3234fa4ca Mon Sep 17 00:00:00 2001 From: Gregory Colpart Date: Fri, 4 Aug 2017 09:52:51 -0400 Subject: [PATCH] copy general_alert_email/log2mail_alert_email to Apache role --- apache/README.md | 1 + apache/defaults/main.yml | 3 +++ packweb-apache/README.md | 2 +- packweb-apache/defaults/main.yml | 1 - 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apache/README.md b/apache/README.md index bd45539b..66804981 100644 --- a/apache/README.md +++ b/apache/README.md @@ -14,5 +14,6 @@ Main variables are : * `apache_private_ipaddr_whitelist_absent` : list of IP addresses **not** to have in the whitelist; * `apache_private_htpasswd_present` : list of users to have in the private htpasswd ; * `apache_private_htpasswd_absent` : list of users to **not** have in the private htpasswd. +* `log2mail_alert_email`: email address to send Log2mail messages to (default: `general_alert_email`). The full list of variables (with default values) can be found in `defaults/main.yml`. diff --git a/apache/defaults/main.yml b/apache/defaults/main.yml index 65048f14..810a0676 100644 --- a/apache/defaults/main.yml +++ b/apache/defaults/main.yml @@ -12,3 +12,6 @@ apache_evolinux_default_ssl_key: /etc/ssl/private/ssl-cert-snakeoil.key apache_phpmyadmin_set: False apache_phpmyadmin_suffix: "" apache_serverstatus_suffix: "" + +general_alert_email: "root@localhost" +log2mail_alert_email: Null diff --git a/packweb-apache/README.md b/packweb-apache/README.md index a8bae5f0..d3f3f5b6 100644 --- a/packweb-apache/README.md +++ b/packweb-apache/README.md @@ -10,6 +10,6 @@ Everything is in the `tasks/main.yml` file for now. Main variables are : -* `log2mail_alert_email`: email address to send Log2mail messages to (default: `general_alert_email`). +* `packweb_enable_evoadmin_vhost` : enable VirtualHost for evoadmin (web interface to create web accounts) 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 0301183f..9457fd8a 100644 --- a/packweb-apache/defaults/main.yml +++ b/packweb-apache/defaults/main.yml @@ -1,5 +1,4 @@ --- # defaults file for packweb-apache general_alert_email: "root@localhost" -log2mail_alert_email: Null packweb_enable_evoadmin_vhost: True