Make sources.list.d entries into templates

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/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