From a4240edbc7a4e2bfa531681d3843d80c4f3c42d4 Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 20 Oct 2012 19:08:19 +0200 Subject: [PATCH 1/3] correct vhost templates --- .../src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl | 12 ------------ .../src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl | 12 ------------ 2 files changed, 24 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl index c572834..eede2f5 100644 --- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl +++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl @@ -37,12 +37,6 @@ 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] - {HTDOCSFALLBACKHTTP} AddType application/x-httpd-php .php .php5 .php4 .php3 @@ -91,12 +85,6 @@ 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] - {HTDOCSFALLBACKHTTPS} AddType application/x-httpd-php .php .php5 .php4 .php3 diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl index 058b4aa..b740da3 100644 --- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl +++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl @@ -32,12 +32,6 @@ 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] - {HTDOCSFALLBACKHTTP} @@ -78,12 +72,6 @@ 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] - {HTDOCSFALLBACKHTTPS} From 4e0098e2c287f904abdc7b28d6e89b160e231a5b Mon Sep 17 00:00:00 2001 From: Michael Hierweck Date: Sun, 21 Oct 2012 11:34:33 +0200 Subject: [PATCH 2/3] Some fixes and improvements related to the generation of Apache rewrite rules (Feature: htdocsfallback). --- .../hsadmin/mods/dom/DomainProcessorFactory.java | 12 ++++++------ .../de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl | 16 ++++++++++++++-- .../de/hsadmin/mods/dom/httpd-vhost-static.jtpl | 16 ++++++++++++++-- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java index 3a320a3..2cb54a1 100644 --- a/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/dom/DomainProcessorFactory.java @@ -325,21 +325,21 @@ public class DomainProcessorFactory implements EntityProcessorFactory { // TODO: This code should be cleaned up after switching to the velocity template engine. query.setParameter("option", "htdocsfallback"); if (query.getResultList().isEmpty()) { - templateVars.put("HTDOCSFALLBACKHTTP", + templateVars.put("NOHTDOCSFALLBACKHTTP", " RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" + " RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" + " RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:80)?$ [novary]\n" + " RewriteCond /home/doms/{DOM_HOSTNAME}/subs/${tolower:%1} !-d\n" + - " RewriteRule ^(.*) - [redirect=404,last]"); - templateVars.put("HTDOCSFALLBACKHTTPS", + " RewriteRule ^(.*) - [redirect=404,last]\n"); + templateVars.put("NOHTDOCSFALLBACKHTTPS", " RewriteCond %{REQUEST_URI} !^/cgi-bin/\n" + " RewriteCond %{REQUEST_URI} !^/fastcgi-bin/\n" + " RewriteCond %{HTTP_HOST} ^(.+)\\.{DOM_HOSTNAME}\\.?(:443)?$ [novary]\n" + " RewriteCond /home/doms/{DOM_HOSTNAME}/subs-ssl/${tolower:%1} !-d\n" + - " RewriteRule ^(.*) - [redirect=404,last]"); + " RewriteRule ^(.*) - [redirect=404,last]\n"); } else { - templateVars.put("HTDOCSFALLBACKHTTP", "\n"); - templateVars.put("HTDOCSFALLBACKHTTPS", "\n"); + templateVars.put("NOHTDOCSFALLBACKHTTP", "\n"); + templateVars.put("NOHTDOCSFALLBACKHTTPS", "\n"); } Processor domSetupProcessor = new CompoundProcessor( diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl index eede2f5..b419eb2 100644 --- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl +++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-dynamic.jtpl @@ -36,8 +36,14 @@ 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] - {HTDOCSFALLBACKHTTP} +{NOHTDOCSFALLBACKHTTP} AddType application/x-httpd-php .php .php5 .php4 .php3 Action application/x-httpd-php /fastcgi-bin/phpstub @@ -85,7 +91,13 @@ RewriteEngine On RewriteOptions Inherit - {HTDOCSFALLBACKHTTPS} + 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 diff --git a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl index b740da3..aa43cdb 100644 --- a/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl +++ b/hsarback/src/de/hsadmin/mods/dom/httpd-vhost-static.jtpl @@ -32,7 +32,13 @@ RewriteEngine On RewriteOptions Inherit - {HTDOCSFALLBACKHTTP} + 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} @@ -71,8 +77,14 @@ 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] - {HTDOCSFALLBACKHTTPS} +{NOHTDOCSFALLBACKHTTPS} \ No newline at end of file From 95b5fbd56f7cbcda7f662db0cd010ad6a4a67632 Mon Sep 17 00:00:00 2001 From: Michael Hierweck Date: Tue, 23 Oct 2012 21:44:36 +0200 Subject: [PATCH 3/3] Postfix aliases database moved to /etc/postfix-mailin/aliases. --- .../de/hsadmin/mods/email/EMailAliasProcessorFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/email/EMailAliasProcessorFactory.java b/hsarback/src/de/hsadmin/mods/email/EMailAliasProcessorFactory.java index 6a2f47e..401ce32 100644 --- a/hsarback/src/de/hsadmin/mods/email/EMailAliasProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/email/EMailAliasProcessorFactory.java @@ -20,7 +20,7 @@ public class EMailAliasProcessorFactory implements EntityProcessorFactory { public Processor createCreateProcessor(EntityManager em, T entity) { EMailAlias alias = (EMailAlias) entity; - return new ShellProcessor("postalias -r -i /etc/postfix/aliases", + return new ShellProcessor("postalias -r -i /etc/postfix-mailin/aliases", alias.getName() + ": " + alias.getTarget()); } @@ -30,7 +30,7 @@ public class EMailAliasProcessorFactory implements EntityProcessorFactory { public Processor createUpdateProcessor(EntityManager em, T entity) { EMailAlias alias = (EMailAlias) entity; - return new ShellProcessor("postalias -r -i /etc/postfix/aliases", + return new ShellProcessor("postalias -r -i /etc/postfix-mailin/aliases", alias.getName() + ": " + alias.getTarget()); } @@ -41,6 +41,6 @@ public class EMailAliasProcessorFactory implements EntityProcessorFactory { T entity) { EMailAlias alias = (EMailAlias) entity; return new ShellProcessor( - "postalias -d '" + alias.getName() + "' /etc/postfix/aliases"); + "postalias -d '" + alias.getName() + "' /etc/postfix-mailin/aliases"); } }