projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
modules
/
apache2
/
templates
/
default-debian.org.erb
diff --git
a/modules/apache2/templates/default-debian.org.erb
b/modules/apache2/templates/default-debian.org.erb
index
7953348
..
b07bed5
100644
(file)
--- a/
modules/apache2/templates/default-debian.org.erb
+++ b/
modules/apache2/templates/default-debian.org.erb
@@
-21,8
+21,8
@@
out = case fqdn
RemoveType .php .phtml .php3 .phps
php_admin_flag engine off
<Directory /home/don/public_html/cgi>
RemoveType .php .phtml .php3 .phps
php_admin_flag engine off
<Directory /home/don/public_html/cgi>
- SetEnv PERLLIB
"/home/don/perl/usr/share/perl5:/home/don/source/
"
- SetEnv DEBBUGS_CONFIG_FILE
"/home/don/config_internal
"
+ SetEnv PERLLIB
\"/home/don/perl/usr/share/perl5:/home/don/source/\
"
+ SetEnv DEBBUGS_CONFIG_FILE
\"/home/don/config_internal\
"
SetHandler cgi-script
AllowOverride None
Options +ExecCGI
SetHandler cgi-script
AllowOverride None
Options +ExecCGI
@@
-30,6
+30,7
@@
out = case fqdn
Allow from all
</Directory>
"
Allow from all
</Directory>
"
+ when "master.debian.org" then ""
else
"
<IfModule mod_userdir.c>
else
"
<IfModule mod_userdir.c>