diff --git a/manifests/puppetlabs.pp b/manifests/puppetlabs.pp index 5cebe05..247cd79 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 @@ - -Alias /icons/ "<%= @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 -%> - - \ No newline at end of file