[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] Before processing unchecked fetch new packages from usper



---
 config/debian/unchecked.functions   | 9 ++++++++-
 config/debian/unchecked.tasks       | 1 +
 config/homedir/ssh/ftpmaster-config | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/config/debian/unchecked.functions b/config/debian/unchecked.functions
index 87fbda0..5302621 100644
--- a/config/debian/unchecked.functions
+++ b/config/debian/unchecked.functions
@@ -11,4 +11,11 @@ function precronscript() {
         exit 0
     fi
     TMPFILES="${TMPFILES} ${LOCK_UNCHECKED}"
-}
\ No newline at end of file
+}
+
+function fetchqueuedpackages() {
+    # Sync new uploaded packages from the central upload queue host.
+    log "Sync new uploads from upload queues"
+    cd ${unchecked}
+    rsync -aq --remove-source-files upload-master:/does/not/matter . || true
+}
diff --git a/config/debian/unchecked.tasks b/config/debian/unchecked.tasks
index eeec0c1..e617724 100644
--- a/config/debian/unchecked.tasks
+++ b/config/debian/unchecked.tasks
@@ -4,6 +4,7 @@ punew                  stable-new                 p-u-new                    fal
 opunew                 oldstable-new              o-p-u-new                  false   false
 backports_policy       none                       backports-policy           false   false
 cleanpolicy            none                       cleanpolicy                false   false
+fetchqueuedpackages    none                       fetchqueuedpackages        false   false
 do_unchecked           none                       unchecked                  false   false
 scancontents           none                       contentsscan               false   false
 pg_timestamp           postunchecked              none                       false   false
diff --git a/config/homedir/ssh/ftpmaster-config b/config/homedir/ssh/ftpmaster-config
index 7ebda2b..e895fee 100644
--- a/config/homedir/ssh/ftpmaster-config
+++ b/config/homedir/ssh/ftpmaster-config
@@ -9,6 +9,9 @@ ForwardAgent no
 StrictHostKeyChecking yes
 PasswordAuthentication no
 BatchMode yes
+ControlMaster auto
+ControlPath ~/.ssh_pipe_%h_%p_%r
+ControlPersist yes
 
 Host bugs-sync
   Hostname bugs-master.debian.org
@@ -54,3 +57,8 @@ Host external-security
   Hostname seger.debian.org
   User dak
   IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/push_external_files
+
+Host upload-master
+  Hostname usper.debian.org
+  User dak
+  IdentityFile /srv/ftp-master.debian.org/scripts/s3kr1t/ssh/sync_new_uploads
-- 
2.1.4


Reply to: