From 1f3c208f95ad99b28e8fbfd1f3028ebdecc43a61 Mon Sep 17 00:00:00 2001
From: "Michael Kaufmann (d00p)" <d00p@froxlor.org>
Date: Tue, 8 Mar 2016 12:44:31 +0100
Subject: [PATCH] show acme.conf only if LE is enabled

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
---
 lib/configfiles/gentoo.xml      | 6 ++++++
 lib/configfiles/jessie.xml      | 4 ++++
 lib/configfiles/precise.xml     | 4 ++++
 lib/configfiles/rhel_centos.xml | 2 ++
 lib/configfiles/trusty.xml      | 6 ++++++
 lib/configfiles/wheezy.xml      | 6 ++++++
 6 files changed, 28 insertions(+)

diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml
index d5ca5b0d..1c945572 100644
--- a/lib/configfiles/gentoo.xml
+++ b/lib/configfiles/gentoo.xml
@@ -65,6 +65,8 @@
 						</content>
 					</file>
 					<file name="/etc/apache2/modules.d/80_acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -95,6 +97,8 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</content>
 					</file>
 					<file name="/etc/apache2/modules.d/80_acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -264,6 +268,8 @@ fastcgi_param  REDIRECT_STATUS    200;
 						</content>
 					</file>
 					<file name="/etc/nginx/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 location /.well-known/acme-challenge {
 	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml
index 9872e732..af94b269 100644
--- a/lib/configfiles/jessie.xml
+++ b/lib/configfiles/jessie.xml
@@ -69,6 +69,8 @@
 						</content>
 					</file>
 					<file name="/etc/apache2/conf-enabled/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -286,6 +288,8 @@ fastcgi_param  REDIRECT_STATUS    200;
 						</content>
 					</file>
 					<file name="/etc/nginx/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 location /.well-known/acme-challenge {
 	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
diff --git a/lib/configfiles/precise.xml b/lib/configfiles/precise.xml
index e007af93..54b8fd38 100644
--- a/lib/configfiles/precise.xml
+++ b/lib/configfiles/precise.xml
@@ -67,6 +67,8 @@
 						</content>
 					</file>
 					<file name="/etc/apache2/conf-enabled/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -245,6 +247,8 @@ fastcgi_param  REDIRECT_STATUS    200;
 						</content>
 					</file>
 					<file name="/etc/nginx/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 location /.well-known/acme-challenge {
 	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml
index a720f2d1..b43e5a03 100644
--- a/lib/configfiles/rhel_centos.xml
+++ b/lib/configfiles/rhel_centos.xml
@@ -49,6 +49,8 @@
 					default="true">
 					<include>//service[@type='http']/general/commands</include>
 					<file name="/etc/httpd/conf.d/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml
index 2b34b631..c606c0bf 100644
--- a/lib/configfiles/trusty.xml
+++ b/lib/configfiles/trusty.xml
@@ -67,6 +67,8 @@
 						</content>
 					</file>
 					<file name="/etc/apache2/conf-enabled/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -97,6 +99,8 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</content>
 					</file>
 					<file name="/etc/apache2/conf-enabled/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -274,6 +278,8 @@ fastcgi_param  REDIRECT_STATUS    200;
 						</content>
 					</file>
 					<file name="/etc/nginx/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 location /.well-known/acme-challenge {
 	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;
diff --git a/lib/configfiles/wheezy.xml b/lib/configfiles/wheezy.xml
index 3e6f2934..431ee576 100644
--- a/lib/configfiles/wheezy.xml
+++ b/lib/configfiles/wheezy.xml
@@ -67,6 +67,8 @@
 						</content>
 					</file>
 					<file name="/etc/apache2/conf-enabled/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -97,6 +99,8 @@ Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}
 						</content>
 					</file>
 					<file name="/etc/apache2/conf-enabled/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
 <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">
@@ -314,6 +318,8 @@ fastcgi_param  REDIRECT_STATUS    200;
 						</content>
 					</file>
 					<file name="/etc/nginx/acme.conf">
+						<visibility mode="true">{{settings.system.leenabled}}
+						</visibility>
 						<content><![CDATA[
 location /.well-known/acme-challenge {
 	alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;