[Collab-qa-commits] r1840 - in udd: . scripts

[Lucas Nussbaum]

Author: lucas
Date: 2010-11-02 14:07:14 +0000 (Tue, 02 Nov 2010)
New Revision: 1840

Modified:
   udd/config-org.yaml
   udd/scripts/sync-carnivore.sh
Log:
use HTTP to sync carnivore data from qa.debian.org

Modified: udd/config-org.yaml
===================================================================
--- udd/config-org.yaml	2010-11-01 10:38:30 UTC (rev 1839)
+++ udd/config-org.yaml	2010-11-02 14:07:14 UTC (rev 1840)
@@ -446,7 +446,7 @@
 carnivore:
   type: carnivore
   update-command: /org/udd.debian.org/udd/scripts/sync-carnivore.sh
-  path: /org/udd.debian.org/mirrors/qa.debian.org/carnivore/report
+  path: /org/udd.debian.org/mirrors/qa.debian.org-carnivore-report
   emails-table: carnivore_emails
   names-table: carnivore_names
   keys-table: carnivore_keys

Modified: udd/scripts/sync-carnivore.sh
===================================================================
--- udd/scripts/sync-carnivore.sh	2010-11-01 10:38:30 UTC (rev 1839)
+++ udd/scripts/sync-carnivore.sh	2010-11-02 14:07:14 UTC (rev 1840)
@@ -2,9 +2,6 @@
 
 set -e
 umask 002
-SRC=he at merkel.debian.org:/org/qa.debian.org/carnivore
-TARGET=/org/udd.debian.org/mirrors/qa.debian.org/
-
-mkdir $TARGET &>/dev/null || true
-
-rsync --quiet -e  "ssh -i /org/udd.debian.org/.ssh/id_carnivore_sync" -avz $SRC $TARGET
+pw=$(</org/udd.debian.org/udd-qa.debian.org-password)
+TARGET=/org/udd.debian.org/mirrors/qa.debian.org-carnivore-report
+echo http://udd:${pw}@qa.debian.org/carnivore-report | wget -q -O $TARGET -i -