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

Fix up paths to install directory

Browse Source
This commit is contained in:
Ben Roberts
2014-11-23 23:41:37 +00:00
parent cafc0d0a08
commit ea5946187f
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/config.pp
View File

@@ -43,21 +43,15 @@ class dokuwiki::config (
$superuser = $dokuwiki::superuser, $superuser = $dokuwiki::superuser,
) { ) {
if $base_path == '' or $base_path =~ /\/$/ {
$base_path_suffix = ''
} else {
$base_path_suffix = '/'
}
file { file {
"${install_dir}/${base_path}${base_path_suffix}conf/local.php": "${install_dir}/htdocs/${base_path}conf/local.php":
content => template($local_conf_template), content => template($local_conf_template),
owner => 'root', owner => 'root',
group => 'root', group => 'root',
mode => '0444', mode => '0444',
replace => false; replace => false;
"${install_dir}/${base_path}${base_path_suffix}conf/local.protected.php": "${install_dir}/htdocs/${base_path}conf/local.protected.php":
content => template($protected_conf_template), content => template($protected_conf_template),
owner => 'root', owner => 'root',
group => 'root', group => 'root',

12
templates/vhost.conf.erb
View File

@@ -1,7 +1,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName <%= @vhost %> ServerName <%= @vhost %>
DocumentRoot <%= @install_dir %>/<%= @base_path %> DocumentRoot <%= @install_dir %>/htdocs
# Permit larger file uploads # Permit larger file uploads
php_value upload_max_filesize 20M php_value upload_max_filesize 20M
@@ -9,7 +9,7 @@
# for the form metadata # for the form metadata
php_value post_max_size 24M php_value post_max_size 24M
<Directory "<%= @install_dir %>/<%= @base_path %><%= @base_path_suffix %>"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>">
AllowOverride None AllowOverride None
Options +FollowSymLinks Options +FollowSymLinks
Order Allow,Deny Order Allow,Deny
@@ -24,7 +24,7 @@
<%- end -%> <%- end -%>
RewriteEngine on RewriteEngine on
RewriteBase /<%= @base_path %><%= @base_path_suffix %> RewriteBase /<%= @base_path %>
RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L] RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L]
RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L] RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L]
RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1&id=$2 [QSA,L] RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1&id=$2 [QSA,L]
@@ -36,17 +36,17 @@
</Directory> </Directory>
# Explicitly deny access to all code and configuration directories # Explicitly deny access to all code and configuration directories
<Directory "<%= @install_dir %>/<%= @base_path %><%= @base_path_suffix %>/inc"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc">
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</Directory> </Directory>
<Directory "<%= @install_dir %>/<%= @base_path %><%= @base_path_suffix %>/inc/lang"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/inc/lang">
Order Deny,Allow Order Deny,Allow
Deny from all Deny from all
</Directory> </Directory>
<Directory "<%= @install_dir %>/<%= @base_path %><%= @base_path_suffix %>/lib/_fla"> <Directory "<%= @install_dir %>/htdocs<%= @base_path %>/lib/_fla">
## no access to the fla directory ## no access to the fla directory
Order allow,deny Order allow,deny
Deny from all Deny from all