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

Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Browse Source
This commit is contained in:
Purodha 2013-03-07 17:17:19 +00:00
commit b2b192833c
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/mods/dom/htaccess.vm
View File

@ -1 +1 @@
Redirect permanent / ${protocol}://www.{domain.name}/ Redirect permanent / ${protocol}://www.${domain.name}/

18
hsarback/src/de/hsadmin/mods/dom/httpd-vhost.vm
View File

@ -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

3
hsarback/src/de/hsadmin/mods/pac/Pac.java
View File

@ -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;
} }

3
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -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() {