ben/puppet-dokuwiki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade apache config for 2.4 support

Browse Source
This commit is contained in:
Ben Roberts
2016-05-02 12:19:24 +01:00
parent f46648d4c0
commit 84f00126e1
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
templates/vhost.conf.erb
View File

@@ -12,8 +12,7 @@
<Directory "<%= @install_dir %>/htdocs<%= @base_path %>"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>">
AllowOverride None AllowOverride None
Options +FollowSymLinks Options +FollowSymLinks
Order Allow,Deny Require all granted
Allow from All
<%- if @auth_type == 'authldap' && @use_sso -%> <%- if @auth_type == 'authldap' && @use_sso -%>
AuthType Basic AuthType Basic
@@ -37,24 +36,19 @@
# Explicitly deny access to all code and configuration directories # Explicitly deny access to all code and configuration directories
<Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc">
Order Deny,Allow Require all denied
Deny from all
</Directory> </Directory>
<Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc/lang"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc/lang">
Order Deny,Allow Require all denied
Deny from all
</Directory> </Directory>
<Directory "<%= @install_dir %>/htdocs<%= @base_path %>/lib/_fla"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/lib/_fla">
## no access to the fla directory Require all denied
Order allow,deny
Deny from all
</Directory> </Directory>
<Directory /etc/dokuwiki> <Directory /etc/dokuwiki>
Order Deny,Allow Require all denied
Deny from all
</Directory> </Directory>
</VirtualHost> </VirtualHost>