Add valid-until fields on security

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/ChangeLog b/ChangeLog
index 060b51a14ec12e6f668dc8e0ae8b817642e25744..bc89250ea24de1613efcc1a2bd9adda55ce06373 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-23  Joerg Jaspert  <joerg@debian.org>
+
+       * config/debian-security/dak.conf: Set ValidTime
+
+       * config/debian-security/cron.weekly: Added
+
 2008-11-17  Joerg Jaspert  <joerg@debian.org>
 
        * dak/security-install.py: Removed, no longer in use.

diff --git a/config/debian-security/cron.weekly b/config/debian-security/cron.weekly
new file mode 100755 (executable)
index 0000000..fc813ec
--- /dev/null
+++ b/config/debian-security/cron.weekly
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Executed weekly via cron, out of dak's crontab.
+
+set -e
+export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
+. $SCRIPTVARS
+
+################################################################################
+
+# Weekly generation of release files, then pushing mirrors.
+# Used as we have a "Valid-until" field in our release files of 10 days. In case
+# we dont have a security update in that time...
+cd $masterdir
+dak generate-releases
+sudo -u archvsync -H /home/archvsync/signal_security
+
+
+################################################################################

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 68216d57831955a6797c3e6c36b136eb18666079..e3155f48f16e923c3262efea5325a9f63c22c28a 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -140,6 +140,7 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian 4.0 Security Updates";
+       ValidTime 864000; // 10 days
        CodeName "etch";
        OverrideCodeName "etch";
        CopyDotDak "/org/security.debian.org/queue/done/";
@@ -175,6 +176,7 @@ Suite
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian testing Security Updates";
+       ValidTime 864000; // 10 days
        CodeName "lenny";
        OverrideCodeName "lenny";
        CopyDotDak "/org/security.debian.org/queue/done/";