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

diff --git a/files/etc/apt/sources.list.d/backports.org.list b/files/etc/apt/sources.list.d/backports.org.list
deleted file mode 100644 (file)
index 11663c1..0000000
--- a/files/etc/apt/sources.list.d/backports.org.list
+++ /dev/null
@@ -1,7 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-#deb     http://debian.sil.at/backports.org/        lenny-backports main
-deb    http://mirror.netcologne.de/debian-backports/   lenny-backports main 

diff --git a/files/etc/apt/sources.list.d/buildd.list b/files/etc/apt/sources.list.d/buildd.list
deleted file mode 100644 (file)
index 13831d0..0000000
--- a/files/etc/apt/sources.list.d/buildd.list
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-deb https://buildd.debian.org/apt/ lenny main

diff --git a/files/etc/apt/sources.list.d/debian.org.list b/files/etc/apt/sources.list.d/debian.org.list
deleted file mode 100644 (file)
index f0673c3..0000000
--- a/files/etc/apt/sources.list.d/debian.org.list
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-deb     http://db.debian.org/debian-admin          lenny            main

diff --git a/files/etc/apt/sources.list.d/debian.restricted.list b/files/etc/apt/sources.list.d/debian.restricted.list
deleted file mode 100644 (file)
index 666fce8..0000000
--- a/files/etc/apt/sources.list.d/debian.restricted.list
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-deb     http://db.debian.org/debian-admin          lenny-restricted non-free

diff --git a/files/etc/apt/sources.list.d/geoip.list b/files/etc/apt/sources.list.d/geoip.list
deleted file mode 100644 (file)
index b39b6be..0000000
--- a/files/etc/apt/sources.list.d/geoip.list
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-deb     http://db.debian.org/debian-admin          lenny-bind-geoip main

diff --git a/files/etc/apt/sources.list.d/security.list b/files/etc/apt/sources.list.d/security.list
deleted file mode 100644 (file)
index 2dd8072..0000000
--- a/files/etc/apt/sources.list.d/security.list
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-deb     http://security.geo.debian.org/             lenny/updates    main

diff --git a/files/etc/apt/sources.list.d/volatile.list b/files/etc/apt/sources.list.d/volatile.list
deleted file mode 100644 (file)
index fab100b..0000000
--- a/files/etc/apt/sources.list.d/volatile.list
+++ /dev/null
@@ -1,6 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-deb     http://volatile.debian.org/debian-volatile lenny/volatile   main

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index c95df389046197bb78bcb963589191fe87b688e7..7849ac6d12f7f526ebe2183ce642ea7d007ecd8f 100644 (file)
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -17,6 +17,8 @@ nameinfo:
   dijkstra.debian.org: Lowell Dijkstra (b.1952)
   draghi.debian.org: Antonio Draghi (1635 - 16 January  1700)
   duarte.debian.org: Leonora Duarte (28 July  1610 - 1678)
+  fano.debian.org: Guido Alberto Fano (18 March 1875 - 14 August 1961)
+  finzi.debian.org: Gerald Raphael Finzi (14 July 1901 - 27 September 1956)
   gluck.debian.org: Christoph Willibald Ritter von Gluck (2 July 1714 - 15 November 1787)
   goedel.debian.org: Kurt Gödel (April 28, 1906 - January 14, 1978)
   goetz.debian.org: Hermann Gustav Goetz (December 7, 1840 - December 3, 1876)
@@ -139,6 +141,8 @@ host_settings:
     - arcadelt.debian.org
     - argento.debian.org
     - brahms.debian.org
+    - fano.debian.org
+    - finzi.debian.org
     - goedel.debian.org
     - goetz.debian.org
     - lafayette.debian.org
@@ -152,10 +156,15 @@ host_settings:
     - schroeder.debian.org
     - mayer.debian.org
     - rem.debian.org
+  squeeze:
+    - fano.debian.org
+    - finzi.debian.org
   smarthost:
     allegri.debian.org: mailout.debian.org
     ancina.debian.org: mailout.debian.org
     piatti.debian.org: mailout.debian.org
+    fano.debian.org: dijkstra.debian.org
+    finzi.debian.org: dijkstra.debian.org
   mail_port:
     allegri.debian.org: 2025
     ancina.debian.org: 2025

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
new file mode 100644 (file)
index 0000000..11663c1
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/backports.org.list.erb
@@ -0,0 +1,7 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+#deb     http://debian.sil.at/backports.org/        lenny-backports main
+deb    http://mirror.netcologne.de/debian-backports/   lenny-backports main 

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/buildd.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/buildd.list.erb
new file mode 100644 (file)
index 0000000..13831d0
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/buildd.list.erb
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+deb https://buildd.debian.org/apt/ lenny main

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/debian.org.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/debian.org.list.erb
new file mode 100644 (file)
index 0000000..f0673c3
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/debian.org.list.erb
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+deb     http://db.debian.org/debian-admin          lenny            main

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/debian.restricted.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/debian.restricted.list.erb
new file mode 100644 (file)
index 0000000..666fce8
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/debian.restricted.list.erb
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+deb     http://db.debian.org/debian-admin          lenny-restricted non-free

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/geoip.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/geoip.list.erb
new file mode 100644 (file)
index 0000000..b39b6be
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/geoip.list.erb
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+deb     http://db.debian.org/debian-admin          lenny-bind-geoip main

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
new file mode 100644 (file)
index 0000000..2dd8072
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/security.list.erb
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+deb     http://security.geo.debian.org/             lenny/updates    main

diff --git a/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
new file mode 100644 (file)
index 0000000..fab100b
--- /dev/null
+++ b/modules/debian-org/templates/etc/apt/sources.list.d/volatile.list.erb
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+deb     http://volatile.debian.org/debian-volatile lenny/volatile   main

diff --git a/modules/exim/files/per-host/dijkstra.debian.org/local-settings.conf b/modules/exim/files/per-host/dijkstra.debian.org/local-settings.conf
new file mode 100644 (file)
index 0000000..3cb3296
--- /dev/null
+++ b/modules/exim/files/per-host/dijkstra.debian.org/local-settings.conf
@@ -0,0 +1,6 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+MAIL_RELAY = 1

diff --git a/modules/exim/files/per-host/dijkstra.debian.org/manualroute b/modules/exim/files/per-host/dijkstra.debian.org/manualroute
new file mode 100644 (file)
index 0000000..6903bcb
--- /dev/null
+++ b/modules/exim/files/per-host/dijkstra.debian.org/manualroute
@@ -0,0 +1,10 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+## Format:
+## domain: hostname[::port] options
+## example:
+## buildd.debian.org: raff.debian.org::587 byname
+
+finzi.debian.org:          [172.17.12.2]::25