hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

vhost templates from michael

Browse Source
This commit is contained in:
Peter Hormanns 2012-10-30 10:46:25 +01:00
parent a7a0263ed3
commit b92369eea8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java
View File

@ -325,21 +325,21 @@ public class DomainProcessorFactory implements EntityProcessorFactory {
// TODO: This code should be cleaned up after switching to the velocity template engine. // TODO: This code should be cleaned up after switching to the velocity template engine.
query.setParameter("option", "htdocsfallback"); query.setParameter("option", "htdocsfallback");
if (query.getResultList().isEmpty()) { if (query.getResultList().isEmpty()) {
templateVars.put("HTDOCSFALLBACKHTTP", templateVars.put("NOHTDOCSFALLBACKHTTP",
" RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" + " RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" +
" RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" + " RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" +
" RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:80)?$ [novary]\n" + " RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:80)?$ [novary]\n" +
" RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d\n" + " RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d\n" +
" RewriteRule ^(.*) - [redirect=404,last]"); " RewriteRule ^(.*) - [redirect=404,last]\n");
templateVars.put("HTDOCSFALLBACKHTTPS", templateVars.put("NOHTDOCSFALLBACKHTTPS",
" RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" + " RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" +
" RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" + " RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" +
" RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:443)?$ [novary]\n" + " RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:443)?$ [novary]\n" +
" RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d\n" + " RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d\n" +
" RewriteRule ^(.*) - [redirect=404,last]"); " RewriteRule ^(.*) - [redirect=404,last]\n");
} else { } else {
templateVars.put("HTDOCSFALLBACKHTTP", "\n"); templateVars.put("NOHTDOCSFALLBACKHTTP", "\n");
templateVars.put("HTDOCSFALLBACKHTTPS", "\n"); templateVars.put("NOHTDOCSFALLBACKHTTPS", "\n");
} }
Processor domSetupProcessor = new CompoundProcessor( Processor domSetupProcessor = new CompoundProcessor(