X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdak.conf;h=7a6364bba1038c770ec5e517151057a32166784f;hb=6f984c8f09377f51ea631e9bbfcd9ab02a39f993;hp=6615e9f97bb8804a8b97329ebb25cbee590d20bf;hpb=5478237fc5dab4de7bd675d3fce56e370ecb6ac0;p=dak.git

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 6615e9f9..7a6364bb 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -1,9 +1,9 @@
 Dinstall
 {
-   PGPKeyring "/org/keyring.debian.org/keyrings/debian-keyring.pgp";
-   GPGKeyring "/org/keyring.debian.org/keyrings/debian-keyring.gpg";
-   SigningKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
-   SigningPubKeyring "/org/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
+   PGPKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
+   GPGKeyring "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
+   SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
+   SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "2D230C5F";
    SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
@@ -13,7 +13,7 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/org/ftp.debian.org/lock/dinstall.lock";
+   LockFile "/srv/ftp.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -61,7 +61,7 @@ Generate-Index-Diffs
 {
    Options
    {
-     TempDir "/org/ftp.debian.org/tiffani";
+     TempDir "/srv/ftp.debian.org/tiffani";
      MaxDiffs { Default 90; };
    };
 };
@@ -73,9 +73,9 @@ Override
 
 Mirror-Split
 {
-  FTPPath "/org/ftp.debian.org/ftp";
-  TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
-  TreeDatabasePath "/org/ftp.debian.org/scratch/dsilvers/treedbs";
+  FTPPath "/srv/ftp.debian.org/ftp";
+  TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots";
+  TreeDatabasePath "/srv/ftp.debian.org/scratch/dsilvers/treedbs";
   BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
   CombinationTrees
   {
@@ -121,13 +121,13 @@ Rm
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/org/ftp.debian.org/web/removals.txt";
+   LogFile "/srv/ftp.debian.org/web/removals.txt";
    Bcc "removed-packages@qa.debian.org";
 };
 
 Import-Archive
 {
-  ExportDir "/org/ftp.debian.org/dak/import-archive-files/";
+  ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 };
 
 Reject-Proposed-Updates
@@ -142,9 +142,9 @@ Import-LDAP-Fingerprints
   LDAPServer "db.debian.org";
   ExtraKeyrings
   {
-    "/org/keyring.debian.org/keyrings/removed-keys.pgp";
-    "/org/keyring.debian.org/keyrings/removed-keys.gpg";
-    "/org/keyring.debian.org/keyrings/extra-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.pgp";
+    "/srv/keyring.debian.org/keyrings/removed-keys.gpg";
+    "/srv/keyring.debian.org/keyrings/extra-keys.pgp";
   };
   KeyServer "wwwkeys.eu.pgp.net";
 };
@@ -159,7 +159,7 @@ Clean-Suites
 
 Process-New
 {
-  AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock";
+  AcceptedLockFile "/srv/ftp.debian.org/lock/unchecked.lock";
 };
 
 Check-Overrides
@@ -285,7 +285,7 @@ Suite
 	};
 	Announce "debian-changes@lists.debian.org";
 	CopyChanges "dists/proposed-updates/";
-	CopyDotDak "/org/ftp.debian.org/queue/proposed-updates/";
+	CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
 	Version "3.1-updates";
 	Origin "Debian";
 	Description "Debian 3.1 Proposed Updates - Not Released";
@@ -523,29 +523,29 @@ SuiteMappings
 
 Dir
 {
-  Root "/org/ftp.debian.org/ftp/";
-  Pool "/org/ftp.debian.org/ftp/pool/";
-  Templates "/org/ftp.debian.org/dak/templates/";
+  Root "/srv/ftp.debian.org/ftp/";
+  Pool "/srv/ftp.debian.org/ftp/pool/";
+  Templates "/srv/ftp.debian.org/dak/templates/";
   PoolRoot "pool/";
-  Lists "/org/ftp.debian.org/database/dists/";
-  Log "/org/ftp.debian.org/log/";
-  Lock "/org/ftp.debian.org/lock";
-  Morgue "/org/ftp.debian.org/morgue/";
+  Lists "/srv/ftp.debian.org/database/dists/";
+  Log "/srv/ftp.debian.org/log/";
+  Lock "/srv/ftp.debian.org/lock";
+  Morgue "/srv/ftp.debian.org/morgue/";
   MorgueReject "reject";
-  Override "/org/ftp.debian.org/scripts/override/";
-  QueueBuild "/org/incoming.debian.org/buildd/";
-  UrgencyLog "/org/ftp.debian.org/testing/urgencies/";
+  Override "/srv/ftp.debian.org/scripts/override/";
+  QueueBuild "/srv/incoming.debian.org/buildd/";
+  UrgencyLog "/srv/ftp.debian.org/testing/urgencies/";
   Queue
   {
-    Accepted "/org/ftp.debian.org/queue/accepted/";
-    Byhand "/org/ftp.debian.org/queue/byhand/";
-    ProposedUpdates "/org/ftp.debian.org/queue/p-u-new/";
-    Done "/org/ftp.debian.org/queue/done/";
-    Holding "/org/ftp.debian.org/queue/holding/";
-    New "/org/ftp.debian.org/queue/new/";
-    Reject "/org/ftp.debian.org/queue/reject/";
-    Unchecked "/org/ftp.debian.org/queue/unchecked/";
-    BTSVersionTrack "/org/ftp.debian.org/queue/bts_version_track/";
+    Accepted "/srv/ftp.debian.org/queue/accepted/";
+    Byhand "/srv/ftp.debian.org/queue/byhand/";
+    ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
+    Done "/srv/ftp.debian.org/queue/done/";
+    Holding "/srv/ftp.debian.org/queue/holding/";
+    New "/srv/ftp.debian.org/queue/new/";
+    Reject "/srv/ftp.debian.org/queue/reject/";
+    Unchecked "/srv/ftp.debian.org/queue/unchecked/";
+    BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
   };
 };
 
@@ -678,7 +678,7 @@ Location
 {
 
   // Pool locations on ftp-master.debian.org
-  /org/ftp.debian.org/ftp/pool/
+  /srv/ftp.debian.org/ftp/pool/
     {
       Archive "ftp-master";
       Type "pool";