HSAdmin Backend Domains, E-Mail, Datenbanken
Purodha
2013-03-07 b2b192833ce58101b91910798d206b01216d39fc
Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
4 files modified
26 ■■■■ changed files
hsarback/src/de/hsadmin/mods/dom/htaccess.vm 2 ●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm 18 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/Pac.java 3 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java 3 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/dom/htaccess.vm
@@ -1 +1 @@
Redirect permanent / ${protocol}://www.{domain.name}/
Redirect permanent / ${protocol}://www.${domain.name}/
hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
@@ -52,14 +52,14 @@
    RewriteCond %{REQUEST_URI} !^/cgi-bin/
    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
    RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} -d
    RewriteRule ^(.*) /home/doms/${dom.name}/subs/\$\{tolower:%1\}\$1 [last]
    RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# -d
    RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last]
    
#if( !${htdocsfallback} )
    RewriteCond %{REQUEST_URI} !^/cgi-bin/
    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?\$ [novary]
    RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} !-d
    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
    RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# !-d
    RewriteRule ^(.*) - [redirect=404,last]
#end
@@ -125,15 +125,15 @@
    
    RewriteCond %{REQUEST_URI} !^/cgi-bin/
    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
    RewriteCond /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\} -d
    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\}\$1 [last]
    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
    RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# -d
    RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last]
    
#if( !${htdocsfallback} )
    RewriteCond %{REQUEST_URI} !^/cgi-bin/
    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?\$ [novary]
    RewriteCond /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\} !-d
    RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?$ [novary]
    RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# !-d
    RewriteRule ^(.*) - [redirect=404,last]
#end
hsarback/src/de/hsadmin/mods/pac/Pac.java
@@ -211,6 +211,9 @@
    }
    public INetAddress getOldINetAddr() {
        if (oldINetAddr == null) {
            return getCurINetAddr();
        }
        return oldINetAddr;
    }
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -27,7 +27,7 @@
        Hive hive = pac.getHive();
        UnixUser unixUser = getPacAdminUser(pac);
        String password = PasswordTool.generatePassword();
        Processor processor = new CompoundProcessor(
        return new CompoundProcessor(
                createAddUserProc(pacName, unixUser, password), 
                createSetQuotaProc(pac),
                createEtcHostsProc(hive), 
@@ -39,7 +39,6 @@
                createIfUp(pacName),
                createHttpdVirtualProc(hive),
                createAccountingRulesProc());
        return processor;
    }
    private Processor createAccountingRulesProc() {