From d18af742f5ec3e3d945ad6d27f28dc06d5d65324 Mon Sep 17 00:00:00 2001
From: Timo Goebel <timo.goebel@dm.de>
Date: Wed, 28 Oct 2015 08:43:37 +0100
Subject: [PATCH] fix mod_alias icon path

---
 manifests/puppetlabs.pp      |  4 +++-
 templates/mod/alias.conf.erb | 13 -------------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 templates/mod/alias.conf.erb

diff --git a/manifests/puppetlabs.pp b/manifests/puppetlabs.pp
index 5cebe05..1ee66ff 100644
--- a/manifests/puppetlabs.pp
+++ b/manifests/puppetlabs.pp
@@ -31,6 +31,8 @@
   $confd_dir = $apache::confd_dir
   $conf_dir = $apache::conf_dir
   $mod_dir = $apache::mod_dir
+  $icons_path = $apache::mod::alias::icons_path
+  $icons_options = '-Indexes +MultiViews -FollowSymLinks' # overwrites $apache::mod::alias::icons_options
 
   file { "${confd_dir}/90.hardening.conf":
     ensure  => file,
@@ -53,7 +55,7 @@
   }
 
   File <| title == 'alias.conf' |> {
-    content => template('apache_hardening/mod/alias.conf.erb'),
+    content => template('apache/mod/alias.conf.erb'),
     mode   => '0640',
   }
 
diff --git a/templates/mod/alias.conf.erb b/templates/mod/alias.conf.erb
deleted file mode 100644
index 9482290..0000000
--- a/templates/mod/alias.conf.erb
+++ /dev/null
@@ -1,13 +0,0 @@
-<IfModule alias_module>
-Alias /icons/ "<%= @icons_path %>/"
-<Directory "<%= @icons_path %>">
-    Options -Indexes +MultiViews -FollowSymLinks
-    AllowOverride None
-<%- if scope.function_versioncmp([@apache_version, '2.4']) >= 0 -%>
-    Require all granted
-<%- else -%>
-     Order allow,deny
-     Allow from all
-<%- end -%>
-</Directory>
-</IfModule>
\ No newline at end of file