maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

show acme.conf only if LE is enabled

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-03-08 12:44:31 +01:00
parent 4330b08c04
commit 1f3c208f95
6 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/configfiles/gentoo.xml
View File

@@ -65,6 +65,8 @@
</content> </content>
</file> </file>
<file name="/etc/apache2/modules.d/80_acme.conf"> <file name="/etc/apache2/modules.d/80_acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/apache2/modules.d/80_acme.conf"> <file name="/etc/apache2/modules.d/80_acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/nginx/acme.conf"> <file name="/etc/nginx/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge; alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;

4
lib/configfiles/jessie.xml
View File

@@ -69,6 +69,8 @@
</content> </content>
</file> </file>
<file name="/etc/apache2/conf-enabled/acme.conf"> <file name="/etc/apache2/conf-enabled/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/nginx/acme.conf"> <file name="/etc/nginx/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge; alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;

4
lib/configfiles/precise.xml
View File

@@ -67,6 +67,8 @@
</content> </content>
</file> </file>
<file name="/etc/apache2/conf-enabled/acme.conf"> <file name="/etc/apache2/conf-enabled/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/nginx/acme.conf"> <file name="/etc/nginx/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge; alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;

2
lib/configfiles/rhel_centos.xml
View File

@@ -49,6 +49,8 @@
default="true"> default="true">
<include>//service[@type='http']/general/commands</include> <include>//service[@type='http']/general/commands</include>
<file name="/etc/httpd/conf.d/acme.conf"> <file name="/etc/httpd/conf.d/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"> <Directory "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge">

6
lib/configfiles/trusty.xml
View File

@@ -67,6 +67,8 @@
</content> </content>
</file> </file>
<file name="/etc/apache2/conf-enabled/acme.conf"> <file name="/etc/apache2/conf-enabled/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/apache2/conf-enabled/acme.conf"> <file name="/etc/apache2/conf-enabled/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/nginx/acme.conf"> <file name="/etc/nginx/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge; alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;

6
lib/configfiles/wheezy.xml
View File

@@ -67,6 +67,8 @@
</content> </content>
</file> </file>
<file name="/etc/apache2/conf-enabled/acme.conf"> <file name="/etc/apache2/conf-enabled/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/apache2/conf-enabled/acme.conf"> <file name="/etc/apache2/conf-enabled/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge" Alias "/.well-known/acme-challenge" "{{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge"
<Directory "{{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> </content>
</file> </file>
<file name="/etc/nginx/acme.conf"> <file name="/etc/nginx/acme.conf">
<visibility mode="true">{{settings.system.leenabled}}
</visibility>
<content><![CDATA[ <content><![CDATA[
location /.well-known/acme-challenge { location /.well-known/acme-challenge {
alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge; alias {{settings.system.letsencryptchallengepath}}/.well-known/acme-challenge;