Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

* 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  move alias expansion above userforward so that that can be overridden
  Same dash - everywhere
  Add danzi

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index b42993d..405d202 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -21,7 +21,8 @@ nameinfo:
   byrd.debian.org: William Byrd (1543 - July 4th, 1623)
   chopin.debian.org: Frédéric Chopin (March 1st, 1810 - October 17th, 1849)
   cilea.debian.org: Francesco Cilèa (July 26th, 1866 - November 20th, 1950)
-  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 – January 8th, 1713)
+  corelli.debian.org: Arcangelo Corelli (February 17th, 1653 - January 8th, 1713)
+  danzi.debian.org: Franz Ignaz Danzi (June 15th, 1763 - April 13th, 1826)
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - January 16th, 1700)
   duarte.debian.org: Leonora Duarte (July 28th, 1610 - 1678)
@@ -31,7 +32,7 @@ nameinfo:
   field.debian.org: John Field (1782 - 1837)
   finzi.debian.org: Gerald Raphael Finzi (July 14th, 1901 - September 27th, 1956)
   franck.debian.org: Melchior Franck (1579 - June 1st, 1639)
-  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 – July 10th, 1690)
+  gabrielli.debian.org: Domenico Gabrielli (April 15th, 1651 - July 10th, 1690)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (July 2nd, 1714 - November 15th, 1787)
   goedel.debian.org: Kurt Gödel (April 28th, 1906 - January 14th, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7th, 1840 - December 3rd, 1876)
@@ -63,7 +64,7 @@ nameinfo:
   nono.debian.org: Luigi Nono (January 29, 1924 - May 8, 1990)
   orff.debian.org: Carl Orff (July 10th, 1895 - March 29th, 1982)
   paer.debian.org: Ferdinando Paër (July 1st, 1771 - May 3rd, 1839)
-  paganini.debian.org: Niccolò Paganini (October 27th, 1782 – May 27th, 1840)
+  paganini.debian.org: Niccolò Paganini (October 27th, 1782 - May 27th, 1840)
   penalosa.debian.org: Francisco de Peñalosa (c. 1470 - April 1st, 1528)
   pergolesi.debian.org: Giovanni Battista Pergolesi (January 4th, 1710 - March 16th or 17th, 1736)
   peri.debian.org: Jacopo Peri (August 20th, 1561 - August 12th, 1633)
@@ -80,7 +81,7 @@ nameinfo:
   ravel.debian.org: Joseph-Maurice Ravel (March 7th, 1875 - December 28th, 1937)
   respighi.debian.org: Ottorino Respighi (July 9th, 1879 - April 18th, 1936)
   reger.debian.org: Johann Baptist Joseph Maximilian Reger (March 19, 1873 - May 11th, 1916)
-  ries.debian.org: Franz Ries (April 7th, 1846 – January 20th, 1932)
+  ries.debian.org: Franz Ries (April 7th, 1846 - January 20th, 1932)
   rietz.debian.org: August Wilhelm Julius Rietz (December 28th, 1812 - September 12th, 1877)
   rore.debian.org: Cipriano de Rore (occasionally Cypriano) (1515 or 1516 - between September 11 and September 20, 1565)
   rossini.debian.org: Gioachino Rossini (February 29, 1792 - November 13, 1868)
@@ -229,6 +230,7 @@ host_settings:
     - reger.debian.org
     - nono.debian.org
     - spohr.debian.org
+    - danzi.debian.org
   smarthost:
     abel.debian.org: mailout.debian.org
     agnesi.debian.org: mailout.debian.org
@@ -253,6 +255,7 @@ host_settings:
     cilea.debian.org: mailout.debian.org
     corelli.debian.org: mailout.debian.org
     crest.debian.org: mailout.debian.org
+    danzi.debian.org: mailout.debian.org
     dijkstra.debian.org: mailout.debian.org
     duarte.debian.org: mailout.debian.org
     englund.debian.org: mailout.debian.org

diff --git a/modules/exim/templates/eximconf.erb b/modules/exim/templates/eximconf.erb
index e0ddea1..332f73b 100644 (file)
--- a/modules/exim/templates/eximconf.erb
+++ b/modules/exim/templates/eximconf.erb
@@ -1161,6 +1161,30 @@ userforward_verify:
   router_home_directory = ${lookup passwd{$local_part}{${extract{5}{:}{$value}}}fail}
   verify_only
 
+# This is a senmailesque alias file lookup
+virt_aliases:
+  debug_print = "R: virt_aliases for $local_part@$domain"
+  driver = redirect
+  allow_defer
+  allow_fail
+  data = ${if exists{\
+           ${extract{directory}{VDOMAINDATA}{${value}/aliases}}}\
+          {${lookup{$local_part}lsearch*{\
+              ${extract{directory}{VDOMAINDATA}{$value/aliases}}\
+          }}}}
+  directory_transport = address_directory
+  domains = +virtual_domains
+  file_transport = ${if eq {${extract{group_writable}{VDOMAINDATA}}}{true}{address_file_group}{address_file}}
+  cannot_route_message = Unknown user
+  group = ${extract{group}{VDOMAINDATA}}
+  headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
+  pipe_transport = address_pipe
+  qualify_preserve_domain
+  retry_use_local_part
+  transport_current_directory = ${extract{directory}{VDOMAINDATA}}
+  transport_home_directory = ${extract{directory}{VDOMAINDATA}}
+  user = ${extract{user}{VDOMAINDATA}}
+  
 userforward:
   debug_print = "R: userforward for $local_part${local_part_suffix}@$domain"
   driver = redirect
@@ -1335,30 +1359,6 @@ virt_direct_verify:
   transport_current_directory = ${extract{directory}{VDOMAINDATA}}
   verify_only
 
-# This is a senmailesque alias file lookup
-virt_aliases:
-  debug_print = "R: virt_aliases for $local_part@$domain"
-  driver = redirect
-  allow_defer
-  allow_fail
-  data = ${if exists{\
-           ${extract{directory}{VDOMAINDATA}{${value}/aliases}}}\
-          {${lookup{$local_part}lsearch*{\
-              ${extract{directory}{VDOMAINDATA}{$value/aliases}}\
-          }}}}
-  directory_transport = address_directory
-  domains = +virtual_domains
-  file_transport = ${if eq {${extract{group_writable}{VDOMAINDATA}}}{true}{address_file_group}{address_file}}
-  cannot_route_message = Unknown user
-  group = ${extract{group}{VDOMAINDATA}}
-  headers_add = "Delivered-To: ${local_part}${local_part_suffix}@${domain}"
-  pipe_transport = address_pipe
-  qualify_preserve_domain
-  retry_use_local_part
-  transport_current_directory = ${extract{directory}{VDOMAINDATA}}
-  transport_home_directory = ${extract{directory}{VDOMAINDATA}}
-  user = ${extract{user}{VDOMAINDATA}}
-  
 # This is a qmailesque deliver into a directory of .forward files
 virt_direct:
   debug_print = "R: virt_direct for $local_part@$domain"