[dak/security] move config to config

[Thomas Viehmann <tv@beamnet.de>]

---
 config/debian/dak.conf |    5 +++++
 dak/show_deferred.py   |    6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 4377530..75ea43e 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -126,6 +126,11 @@ Show-New
   HTMLPath "/srv/ftp.debian.org/web/new/";
 }
 
+Show-Deferred
+{
+  LinkPath "/srv/ftp.debian.org/web/deferred/";
+}
+
 Import-Users-From-Passwd
 {
   ValidGID "800";
diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 6952922..81c117b 100755
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -176,10 +176,8 @@ def init():
     Arguments = [('h',"help","Show-Deferred::Options::Help"),
                  ("p","link-path","Show-Deferred::LinkPath","HasArg")]
     for i in ["help"]:
-        if not Cnf.has_key("Show-Deferred::Options::LinkPath"):
-            Cnf["Show-Deferred::Options::LinkPath"] = "/org/ftp.debian.org/web/deferred/"
-    if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
-          Cnf["Show-Deferred::Options::%s" % (i)] = ""
+        if not Cnf.has_key("Show-Deferred::Options::%s" % (i)):
+            Cnf["Show-Deferred::Options::%s" % (i)] = ""
     args = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
     Options = Cnf.SubTree("Show-Deferred::Options")
     if Options["help"]:
-- 
1.5.6.5