From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Sep 2018 18:11:41 +0000 (-0300)
Subject: Fix conf.d inclusion for ubuntu bionic
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=68ed4c37fc3ecaa3470ce9ce9fb29ba726390c71;p=puppet-apache.git

Fix conf.d inclusion for ubuntu bionic
---

diff --git a/templates/apache2.conf.bionic.erb b/templates/apache2.conf.bionic.erb
index e77f9ef..103a254 100644
--- a/templates/apache2.conf.bionic.erb
+++ b/templates/apache2.conf.bionic.erb
@@ -223,13 +223,13 @@ LogFormat "%{User-agent}i" agent
 # Include of directories ignores editors' and dpkg's backup files,
 # see README.Debian for details.
 
+# Include generic snippets of statements
+IncludeOptional conf.d/*.conf
+
 # Include generic snippets of statements
 IncludeOptional conf-enabled/*.conf
 
 # Include the virtual host configurations:
 IncludeOptional sites-enabled/*.conf
 
-# Include generic snippets of statements
-Include /etc/apache2/conf.d/*
-
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet