Merging my branch and d00ps branches to trunk

2010-01-22 07:43:29 +00:00
parent 8c55dd6c21
commit eeec43ebd7
119 changed files with 1137 additions and 1589 deletions
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_acl_30_exim4-config_check_rcpt.rul
@@ -11,7 +11,7 @@ acl_check_rcpt:

  .ifdef CHECK_RCPT_LOCAL_LOCALPARTS
  deny
-    domains = +local_domains:+syscp_domain
+    domains = +local_domains:+froxlor_domain
    local_parts = CHECK_RCPT_LOCAL_LOCALPARTS
    message = restricted characters in address
  .endif
@@ -29,7 +29,7 @@ acl_check_rcpt:
    .else
    local_parts = CHECK_RCPT_POSTMASTER
    .endif
-    domains = +local_domains:+syscp_domain
+    domains = +local_domains:+froxlor_domain

  deny
    message = sender envelope address $sender_address is locally blacklisted here. If you think this is wrong, get in touch with postmaster
@@ -95,7 +95,7 @@ acl_check_rcpt:
  .endif

  accept
-    domains = +local_domains:+syscp_domain
+    domains = +local_domains:+froxlor_domain
    endpass
    message = unknown user
    verify = recipient
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_auth_30_froxlor-config
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_auth_30_froxlor-config
@@ -1,30 +1,30 @@
-### auth/30_syscp-config
-#################################
-
-plain_server:
-  driver = plaintext
-  public_name = PLAIN
-  server_condition = "${if and { \
-                        {!eq{$2}{}} \
-                        {!eq{$3}{}} \
-                        {crypteq{$3}{${lookup mysql{SYSCP_AUTH_PLAIN}{$value}fail}}} \
-                        } {yes}{no}}"
-  server_set_id = $2
-  server_prompts = :
-#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
-#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
-#   .endif
-
-login_server:
-  driver = plaintext
-  public_name = LOGIN
-  server_prompts = "Username:: : Password::"
-  server_condition = "${if and { \
-                        {!eq{$1}{}} \
-                        {!eq{$2}{}} \
-                        {crypteq{$2}{${lookup mysql{SYSCP_AUTH_LOGIN}{$value}fail}}} \
-                        } {yes}{no}}"
-  server_set_id = $1
-#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
-#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
+### auth/30_froxlor-config
+#################################
+
+plain_server:
+  driver = plaintext
+  public_name = PLAIN
+  server_condition = "${if and { \
+                        {!eq{$2}{}} \
+                        {!eq{$3}{}} \
+                        {crypteq{$3}{${lookup mysql{FROXLOR_AUTH_PLAIN}{$value}fail}}} \
+                        } {yes}{no}}"
+  server_set_id = $2
+  server_prompts = :
+#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
+#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
+#   .endif
+
+login_server:
+  driver = plaintext
+  public_name = LOGIN
+  server_prompts = "Username:: : Password::"
+  server_condition = "${if and { \
+                        {!eq{$1}{}} \
+                        {!eq{$2}{}} \
+                        {crypteq{$2}{${lookup mysql{FROXLOR_AUTH_LOGIN}{$value}fail}}} \
+                        } {yes}{no}}"
+  server_set_id = $1
+#   .ifndef AUTH_SERVER_ALLOW_NOTLS_PASSWORDS
+#   server_advertise_condition = ${if eq{$tls_cipher}{}{}{*}}
 #   .endif
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_main_10_froxlor-config_options
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_main_10_froxlor-config_options
@@ -0,0 +1,20 @@
+hide mysql_servers = <SQL_HOST>/<SQL_DB>/<SQL_UNPRIVILEGED_USER>/<SQL_UNPRIVILEGED_PASSWORD>
+
+FROXLOR_LOCAL_DOMAIN	= SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1'
+
+FROXLOR_MAILALIAS		= SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \
+				(( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \
+				OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \
+				AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1
+
+FROXLOR_MAILUSER		= SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \
+				email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y'
+
+FROXLOR_PARENT_DOMAIN	= SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \
+				ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain
+
+FROXLOR_AUTH_PLAIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}'
+
+FROXLOR_AUTH_LOGIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}'
+
+domainlist froxlor_domain = mysql;FROXLOR_LOCAL_DOMAIN
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_main_10_syscp-config_options
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_main_10_syscp-config_options
@@ -1,20 +0,0 @@
-hide mysql_servers = <SQL_HOST>/<SQL_DB>/<SQL_UNPRIVILEGED_USER>/<SQL_UNPRIVILEGED_PASSWORD>
-
-SYSCP_LOCAL_DOMAIN	= SELECT domain FROM panel_domains WHERE domain = '${quote_mysql:$domain}' AND isemaildomain = '1'
-
-SYSCP_MAILALIAS		= SELECT REPLACE(destination,' ',',') FROM mail_virtual WHERE \
-				(( email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' ) \
-				OR ( email = '@${quote_mysql:$domain}' AND iscatchall > 0 )) \
-				AND destination <> '' AND destination <> ' ' ORDER BY iscatchall ASC LIMIT 1
-
-SYSCP_MAILUSER		= SELECT CONCAT(homedir,maildir) FROM mail_users WHERE \
-				email = '${quote_mysql:$local_part}@${quote_mysql:$domain}' AND postfix = 'y'
-
-SYSCP_PARENT_DOMAIN	= SELECT parent.domain FROM `panel_domains` AS parent INNER JOIN panel_domains AS alias \
-				ON alias.domain = '${quote_mysql:$domain}' AND parent.id = alias.aliasdomain
-
-SYSCP_AUTH_PLAIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$2}'
-
-SYSCP_AUTH_LOGIN	= SELECT password_enc FROM mail_users WHERE username = '${quote_mysql:$1}'
-
-domainlist syscp_domain = mysql;SYSCP_LOCAL_DOMAIN
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_router_180_froxlor-config
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_router_180_froxlor-config
@@ -0,0 +1,12 @@
+froxlor_mailalias:
+  debug_print = "R: froxlor_mailalias for $local_part@$domain"
+  driver = redirect
+  domains = +froxlor_domain
+  data = ${lookup mysql {FROXLOR_MAILALIAS}{$value}fail}
+
+froxlor_mailuser:
+  debug_print = "R: froxlor_mailuser for $local_part@$domain"
+  driver = redirect
+  domains = +froxlor_domain
+  data = ${lookup mysql {FROXLOR_MAILUSER}{$value}fail}
+  directory_transport = maildir_froxlor
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_router_180_syscp-config
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_router_180_syscp-config
@@ -1,12 +0,0 @@
-syscp_mailalias:
-  debug_print = "R: syscp_mailalias for $local_part@$domain"
-  driver = redirect
-  domains = +syscp_domain
-  data = ${lookup mysql {SYSCP_MAILALIAS}{$value}fail}
-
-syscp_mailuser:
-  debug_print = "R: syscp_mailuser for $local_part@$domain"
-  driver = redirect
-  domains = +syscp_domain
-  data = ${lookup mysql {SYSCP_MAILUSER}{$value}fail}
-  directory_transport = maildir_syscp
--- a/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_transport_30_froxlor-config
+++ b/templates/misc/configfiles/debian_etch/exim4/etc_exim4_conf.d_transport_30_froxlor-config
@@ -1,13 +1,13 @@
-maildir_syscp:
-  debug_print = "T: maildir_syscp for $local_part@$domain"
-  driver = appendfile
-  create_directory
-  delivery_date_add
-  envelope_to_add
-  return_path_add
-  maildir_format
-  directory_mode = 0770
-  mode = 0660
-  mode_fail_narrower = false
-  user = 2000
+maildir_froxlor:
+  debug_print = "T: maildir_froxlor for $local_part@$domain"
+  driver = appendfile
+  create_directory
+  delivery_date_add
+  envelope_to_add
+  return_path_add
+  maildir_format
+  directory_mode = 0770
+  mode = 0660
+  mode_fail_narrower = false
+  user = 2000
  group = 2000