diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-09-14 15:11:41 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-09-14 15:11:41 -0300 |
| commit | 68ed4c37fc3ecaa3470ce9ce9fb29ba726390c71 (patch) | |
| tree | d5fc8255c03214aa590c936f250712a7cd5c3658 /templates | |
| parent | fca2746eee6a3282fde7c97ad57a864afe01c315 (diff) | |
| download | puppet-apache-68ed4c37fc3ecaa3470ce9ce9fb29ba726390c71.tar.gz puppet-apache-68ed4c37fc3ecaa3470ce9ce9fb29ba726390c71.tar.bz2 | |
Fix conf.d inclusion for ubuntu bionic
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/apache2.conf.bionic.erb | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ -224,12 +224,12 @@ LogFormat "%{User-agent}i" agent # 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 |