Merged changes form upstream.

hsarback/bin/de/hsadmin/mods/dom/htaccess.jtpl

@@ -0,0 +1,2 @@
+<!-- BEGIN: main -->Redirect permanent / {PROTOCOL}://www.{DOMAIN}/
+<!-- END: main -->

hsarback/bin/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl

@@ -0,0 +1,106 @@
+<!-- BEGIN: main --># 
+# This file is managed by HSAdmin.
+# Do not edit manually. Changes will be overwritten.
+#
+
+<VirtualHost {DOM_IPNUMBER}:80 {DOM_IPNUMBEREX}:80>
+
+    ServerName {DOM_HOSTNAME}
+    ServerAlias *.{DOM_HOSTNAME}
+    ServerAdmin webmaster@{DOM_HOSTNAME}
+
+    SuexecUserGroup {DOM_USERNAME} {PAC}
+
+    DocumentRoot /home/doms/{DOM_HOSTNAME}/htdocs
+
+    Alias /cgi-bin/ /home/doms/{DOM_HOSTNAME}/cgi/
+    Alias /fastcgi-bin/ /home/doms/{DOM_HOSTNAME}/fastcgi/
+
+    <Directory />
+        Options -ExecCGI {INCLUDES} {INDEXES} {MULTIVIEWS} +SymLinksIfOwnerMatch
+    </Directory>
+
+    <Directory /home/doms/{DOM_HOSTNAME}/>
+        AllowOverride AuthConfig FileInfo Indexes Limit
+    </Directory>
+
+    <Location /cgi-bin/>
+        SetHandler cgi-script
+        Options +ExecCGI {INCLUDES} -Indexes -MultiViews +SymLinksIfOwnerMatch
+    </Location>
+
+    <Location /fastcgi-bin/>
+        SetHandler fcgid-script
+        Options +ExecCGI {INCLUDES} -Indexes -MultiViews +SymLinksIfOwnerMatch
+    </Location>
+
+    RewriteEngine On
+    RewriteOptions Inherit
+
+    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:[0-9]+)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} -d
+    RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1}$1 [last]     
+    
+{NOHTDOCSFALLBACKHTTP}
+
+    AddType application/x-httpd-php .php .php5 .php4 .php3
+    Action application/x-httpd-php /fastcgi-bin/phpstub
+
+</VirtualHost>
+
+<VirtualHost {DOM_IPNUMBER}:443 {DOM_IPNUMBEREX}:443>
+
+    ServerName {DOM_HOSTNAME}
+    ServerAlias *.{DOM_HOSTNAME}
+    ServerAdmin {DOM_USERNAME}@{HIVE}.hostsharing.net
+
+    SuexecUserGroup {DOM_USERNAME} {PAC}
+
+    SSLEngine On
+    SSLCertificateFile /etc/apache2/pems/default.pem
+    SSLCertificateChainFile /etc/apache2/pems/default.chain.pem
+    SSLCertificateFile /etc/apache2/pems/{PAC}.pem
+    SSLCertificateChainFile /etc/apache2/pems/{PAC}.chain.pem
+
+    DocumentRoot /home/doms/{DOM_HOSTNAME}/htdocs-ssl
+
+    Alias /cgi-bin/ /home/doms/{DOM_HOSTNAME}/cgi-ssl/
+    Alias /fastcgi-bin/ /home/doms/{DOM_HOSTNAME}/fastcgi-ssl/
+
+    <Directory />
+        SSLRequireSSL On
+        Options -ExecCGI {INCLUDES} {INDEXES} {MULTIVIEWS} +SymLinksIfOwnerMatch
+    </Directory>
+
+    <Directory /home/doms/{DOM_HOSTNAME}/>
+        AllowOverride AuthConfig FileInfo Indexes Limit
+    </Directory>
+
+    <Location /cgi-bin/>
+        SetHandler cgi-script
+        Options +ExecCGI {INCLUDES} -Indexes -MultiViews +SymLinksIfOwnerMatch
+    </Location>
+
+    <Location /fastcgi-bin/>
+        SetHandler fcgid-script
+        Options +ExecCGI {INCLUDES} -Indexes -MultiViews +SymLinksIfOwnerMatch
+    </Location>
+    
+    RewriteEngine On
+    RewriteOptions Inherit
+    
+    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:[0-9]+)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} -d
+    RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1}$1 [last]    
+    
+{NOHTDOCSFALLBACKHTTPS}
+
+    AddType application/x-httpd-php .php .php5 .php4 .php3
+    Action application/x-httpd-php /fastcgi-bin/phpstub
+
+</VirtualHost>
+<!-- END: main -->

hsarback/bin/de/hsadmin/mods/dom/httpd-vhost-static.jtpl

@@ -0,0 +1,90 @@
+<!-- BEGIN: main --># 
+# This file is managed by HSAdmin.
+# Do not edit manually. Changes will be overwritten.
+#
+
+<VirtualHost {DOM_IPNUMBER}:80 {DOM_IPNUMBEREX}:80>
+
+    ServerName {DOM_HOSTNAME}
+    ServerAlias *.{DOM_HOSTNAME}
+    ServerAdmin webmaster@{DOM_HOSTNAME}
+
+    SuexecUserGroup {DOM_USERNAME} {PAC}
+
+    DocumentRoot /home/doms/{DOM_HOSTNAME}/htdocs
+
+    <Directory />
+        Options -ExecCGI {INCLUDES} {INDEXES} {MULTIVIEWS} +SymLinksIfOwnerMatch
+    </Directory>
+
+    <Directory /home/doms/{DOM_HOSTNAME}/>
+        AllowOverride AuthConfig FileInfo Indexes Limit
+    </Directory>
+
+    <Location /cgi-bin/>
+        Redirect 501 /
+    </Location>
+
+    <Location /fastcgi-bin/>
+        Redirect 501 /
+    </Location>
+
+    RewriteEngine On
+    RewriteOptions Inherit
+    
+    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:[0-9]+)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} -d
+    RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1}$1 [last]     
+    
+{NOHTDOCSFALLBACKHTTP}
+
+</VirtualHost>
+
+<VirtualHost {DOM_IPNUMBER}:443 {DOM_IPNUMBEREX}:443>
+
+    ServerName {DOM_HOSTNAME}
+    ServerAlias *.{DOM_HOSTNAME}
+    ServerAdmin {DOM_USERNAME}@{HIVE}.hostsharing.net
+
+    SuexecUserGroup {DOM_USERNAME} {PAC}
+
+    SSLEngine On
+    SSLCertificateFile /etc/apache2/pems/default.pem
+    SSLCertificateChainFile /etc/apache2/pems/default.chain.pem
+    SSLCertificateFile /etc/apache2/pems/{PAC}.pem
+    SSLCertificateChainFile /etc/apache2/pems/{PAC}.chain.pem
+
+    DocumentRoot /home/doms/{DOM_HOSTNAME}/htdocs-ssl
+
+    <Directory />
+        SSLRequireSSL On
+        Options -ExecCGI {INCLUDES} {INDEXES} {MULTIVIEWS} +SymLinksIfOwnerMatch
+    </Directory>
+
+    <Directory /home/doms/{DOM_HOSTNAME}/>
+        AllowOverride AuthConfig FileInfo Indexes Limit
+    </Directory>
+
+    <Location /cgi-bin/>
+        Redirect 501 /
+    </Location>
+
+    <Location /fastcgi-bin/>
+        Redirect 501 /
+    </Location>    
+    
+    RewriteEngine On
+    RewriteOptions Inherit
+
+    RewriteCond %{REQUEST_URI} !^/cgi-bin/
+    RewriteCond %{REQUEST_URI} !^/fastcgi-bin/    
+    RewriteCond %{HTTP_HOST} ^(.+)\.{DOM_HOSTNAME}\.?(:[0-9]+)?$ [novary]
+    RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} -d
+    RewriteRule ^(.*) /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1}$1 [last]     
+    
+{NOHTDOCSFALLBACKHTTPS}
+
+</VirtualHost>
+<!-- END: main -->

hsarback/bin/de/hsadmin/mods/dom/index.html.jtpl

@@ -0,0 +1,22 @@
+<!-- BEGIN: main --><html>
+
+<head>
+<title>Willkommen bei {DOMAIN}</title>
+</head>
+
+<body bgcolor="orange">
+
+<h1>Willkommen bei {DOMAIN}</h1>
+
+<p>Diese neue Website wurde gerade bei der
+<a href="http://www.hostsharing.net">Hostsharing eG</a>
+f&uuml;r {USER_NAME} eingerichtet.</p>
+
+<p>Der Inhaber der Domain ist bereits per Email unter
+<a href="mailto:webmaster(at){DOMAIN}">webmaster(at){DOMAIN}</a>
+zu erreichen.</p>
+
+</body>
+
+</html>
+<!-- END: main -->

hsarback/bin/de/hsadmin/mods/dom/postgrey-whitelist-recipients.jtpl

@@ -0,0 +1,13 @@
+<!-- BEGIN: main --># 
+# This file is managed by HSAdmin.
+# Do not edit manually. Changes will be overwritten.
+#
+
+abuse@
+postmaster@
+
+####################################################
+
+<!-- BEGIN: iterate -->{DOM}
+<!-- END: iterate -->
+<!-- END: main -->

hsarback/bin/de/hsadmin/mods/dom/test.cgi.jtpl

@@ -0,0 +1,5 @@
+<!-- BEGIN: main -->#!/bin/sh
+echo Content-type: text/plain
+echo
+echo Hello, world
+<!-- END: main -->

hsarback/bin/de/hsadmin/mods/dom/zonefile.jtpl

@@ -0,0 +1,25 @@
+<!-- BEGIN: main -->$TTL 6H
+{DOM_HOSTNAME}. IN SOA dns.hostsharing.net. hostmaster.hostsharing.net. (
+				{SIO}	; serial secs since Jan 1 1970 
+				6H		; refresh (>=10000)
+				1H		; retry (>=1800)
+				1W		; expire
+				1H		; minimum
+)
+
+{DOM_HOSTNAME}.			IN		NS	dns1.hostsharing.net.
+{DOM_HOSTNAME}.			IN		NS	dns2.hostsharing.net.
+{DOM_HOSTNAME}.			IN		NS	dns3.hostsharing.net.
+
+{DOM_HOSTNAME}.			IN		MX	30 mailin1.hostsharing.net.
+{DOM_HOSTNAME}.			IN		MX	30 mailin2.hostsharing.net.
+{DOM_HOSTNAME}.			IN		MX	30 mailin3.hostsharing.net.
+
+{DOM_HOSTNAME}.			IN		A	{DOM_IPNUMBER}
+
+*.{DOM_HOSTNAME}.		IN		MX	30 mailin1.hostsharing.net.
+*.{DOM_HOSTNAME}.		IN		MX	30 mailin2.hostsharing.net.
+*.{DOM_HOSTNAME}.		IN		MX	30 mailin3.hostsharing.net.
+
+*.{DOM_HOSTNAME}.		IN		A	{DOM_IPNUMBER}
+<!-- END: main -->