Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
This commit is contained in:
commit
b2b192833c
@ -1 +1 @@
|
|||||||
Redirect permanent / ${protocol}://www.{domain.name}/
|
Redirect permanent / ${protocol}://www.${domain.name}/
|
||||||
|
@ -52,14 +52,14 @@
|
|||||||
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
||||||
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
||||||
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
|
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
|
||||||
RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} -d
|
RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# -d
|
||||||
RewriteRule ^(.*) /home/doms/${dom.name}/subs/\$\{tolower:%1\}\$1 [last]
|
RewriteRule ^(.*) /home/doms/${dom.name}/subs/#[[${tolower:%1}$1 ]]# [last]
|
||||||
|
|
||||||
#if( !${htdocsfallback} )
|
#if( !${htdocsfallback} )
|
||||||
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
||||||
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
||||||
RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?\$ [novary]
|
RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:80)?$ [novary]
|
||||||
RewriteCond /home/doms/${dom.name}/subs/\$\{tolower:%1\} !-d
|
RewriteCond /home/doms/${dom.name}/subs/#[[${tolower:%1} ]]# !-d
|
||||||
RewriteRule ^(.*) - [redirect=404,last]
|
RewriteRule ^(.*) - [redirect=404,last]
|
||||||
#end
|
#end
|
||||||
|
|
||||||
@ -125,15 +125,15 @@
|
|||||||
|
|
||||||
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
||||||
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
||||||
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?\$ [novary]
|
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:[0-9]+)?$ [novary]
|
||||||
RewriteCond /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\} -d
|
RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# -d
|
||||||
RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\}\$1 [last]
|
RewriteRule ^(.*) /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1}$1 ]]# [last]
|
||||||
|
|
||||||
#if( !${htdocsfallback} )
|
#if( !${htdocsfallback} )
|
||||||
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
RewriteCond %{REQUEST_URI} !^/cgi-bin/
|
||||||
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
RewriteCond %{REQUEST_URI} !^/fastcgi-bin/
|
||||||
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?\$ [novary]
|
RewriteCond %{HTTP_HOST} ^(.+)\.${dom.name}\.?(:443)?$ [novary]
|
||||||
RewriteCond /home/doms/${dom.name}/subs-ssl/\$\{tolower:%1\} !-d
|
RewriteCond /home/doms/${dom.name}/subs-ssl/#[[${tolower:%1} ]]# !-d
|
||||||
RewriteRule ^(.*) - [redirect=404,last]
|
RewriteRule ^(.*) - [redirect=404,last]
|
||||||
#end
|
#end
|
||||||
|
|
||||||
|
@ -211,6 +211,9 @@ public class Pac extends AbstractEntity implements Serializable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public INetAddress getOldINetAddr() {
|
public INetAddress getOldINetAddr() {
|
||||||
|
if (oldINetAddr == null) {
|
||||||
|
return getCurINetAddr();
|
||||||
|
}
|
||||||
return oldINetAddr;
|
return oldINetAddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
|
|||||||
Hive hive = pac.getHive();
|
Hive hive = pac.getHive();
|
||||||
UnixUser unixUser = getPacAdminUser(pac);
|
UnixUser unixUser = getPacAdminUser(pac);
|
||||||
String password = PasswordTool.generatePassword();
|
String password = PasswordTool.generatePassword();
|
||||||
Processor processor = new CompoundProcessor(
|
return new CompoundProcessor(
|
||||||
createAddUserProc(pacName, unixUser, password),
|
createAddUserProc(pacName, unixUser, password),
|
||||||
createSetQuotaProc(pac),
|
createSetQuotaProc(pac),
|
||||||
createEtcHostsProc(hive),
|
createEtcHostsProc(hive),
|
||||||
@ -39,7 +39,6 @@ public class PacProcessorFactory implements EntityProcessorFactory {
|
|||||||
createIfUp(pacName),
|
createIfUp(pacName),
|
||||||
createHttpdVirtualProc(hive),
|
createHttpdVirtualProc(hive),
|
||||||
createAccountingRulesProc());
|
createAccountingRulesProc());
|
||||||
return processor;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Processor createAccountingRulesProc() {
|
private Processor createAccountingRulesProc() {
|
||||||
|
Loading…
Reference in New Issue
Block a user