Enmasse adaptation for removal of silly names.

diff --git a/config/debian-non-US/apt.conf b/config/debian-non-US/apt.conf
index 727dc1c9543b1c784f7f635dae77f647e53dc80d..a87caa096fa8ea9c2de32c941fcb674ca5d09915 100644 (file)
--- a/config/debian-non-US/apt.conf
+++ b/config/debian-non-US/apt.conf
@@ -17,7 +17,7 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/org/non-us.debian.org/katie/Contents.top";
+   Contents::Header "/org/non-us.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/proposed-updates/non-US"

diff --git a/config/debian-non-US/apt.conf.stable b/config/debian-non-US/apt.conf.stable
index 660df3a3b13e45e814d64e2bd78cc72f505bbb62..321d5f0507347db2097a1c1ebdba30340c252068 100644 (file)
--- a/config/debian-non-US/apt.conf.stable
+++ b/config/debian-non-US/apt.conf.stable
@@ -16,7 +16,7 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/org/non-us.debian.org/katie/Contents.top";
+   Contents::Header "/org/non-us.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/stable/non-US"

diff --git a/config/debian-non-US/cron.daily b/config/debian-non-US/cron.daily
index a901f6b80fe560c18e53c4bcc812a87f1aa78a35..f5c2d0beabe7ffb99fa4ab4cff5bfd79aabbc0f9 100755 (executable)
--- a/config/debian-non-US/cron.daily
+++ b/config/debian-non-US/cron.daily
@@ -1,9 +1,9 @@
 #! /bin/sh
 #
-# Executed daily via cron, out of troup's crontab.
+# Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US
+export SCRIPTVARS=/org/non-us.debian.org/dak/config/debian-non-US/vars
 . $SCRIPTVARS
 
 ################################################################################
@@ -40,40 +40,40 @@ update-readmenonus
 if [ ! -z "$(find "$accepted" -name \*.changes -maxdepth 1 -mindepth 1)" ]; then
   cd $accepted
   rm -f REPORT
-  kelly -pa *.changes | tee REPORT | \
+  dak process-accepted -pa *.changes | tee REPORT | \
      mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org
   chgrp debadmin REPORT
   chmod 664 REPORT
 else
-  echo "kelly: Nothing to install."
+  echo "dak process-accepted: Nothing to install."
 fi
 
 cd $masterdir
 symlinks -d -r $ftpdir
 
 cd $masterdir
-jenna
+dak make-suite-file-list
 
 # Generate override files
 cd $overridedir
-denise
+dak make-overrides
 # FIXME
 rm -f override.potato.all3
 for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done
 
 # Generate Packages and Sources files
 cd $masterdir
-apt-ftparchive generate apt.conf-non-US
+apt-ftparchive generate apt.conf
 # Generate Release files
-ziyi
+dak generate-releases
 
 # Clean out old packages
-rhona
-shania
+dak clean-suites
+dak clean-queues
 
 # Generate the Maintainers file
 cd $indices
-charisma > .new-maintainers_versions
+dak make-maintainers > .new-maintainers_versions
 mv -f .new-maintainers_versions Maintainers_Versions
 sed -e "s/~[^  ]*\([   ]\)/\1/" < Maintainers_Versions | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 mv -f .new-maintainers Maintainers
@@ -104,9 +104,9 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skippin
 ################################################################################
 
 # Send a report on NEW/BYHAND packages
-helena | mail -e -s "[non-US] NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
+dak queue-report | mail -e -s "[non-US] NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
 # and one on crufty packages
-rene | mail -e -s "[non-US] rene run for $(date +%D)" ftpmaster@ftp-master.debian.org
+dak cruft-report | mail -e -s "Debian non-US cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
 
 ################################################################################
 ulimit -m 90000 -d 90000 -s 10000 -v 90000

diff --git a/config/debian-non-US/cron.hourly b/config/debian-non-US/cron.hourly
index 70999c6ccc3aad08f08a5e0c531e116450438b41..3c31038ed56077b7ef0cdd4b4991296e281228f0 100644 (file)
--- a/config/debian-non-US/cron.hourly
+++ b/config/debian-non-US/cron.hourly
@@ -3,8 +3,8 @@
 # Executed hourly via cron, out of troup's crontab.
 
 set -e
-export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US
+export SCRIPTVARS=/org/non-us.debian.org/dak/config/vars
 . $SCRIPTVARS
 
 cd $masterdir
-julia
+dak import-users-from-passwd

diff --git a/config/debian-non-US/cron.unchecked b/config/debian-non-US/cron.unchecked
index 117b8148725964016f1cec0406613e417040f50c..abd866e2315bacc83de7598a75f383c9ac98cb61 100644 (file)
--- a/config/debian-non-US/cron.unchecked
+++ b/config/debian-non-US/cron.unchecked
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US
+export SCRIPTVARS=/org/non-us.debian.org/dak/config/debian-non-US/vars
 . $SCRIPTVARS
 
 cd $unchecked
@@ -12,7 +12,7 @@ timestamp=$(date "+%Y-%m-%d %H:%M")
 
 if [ ! -z "$changes" ]; then
   echo "$timestamp": "$changes"  >> $report
-  jennifer -a $changes >> $report
+  dak process-unchecked -a $changes >> $report
   echo "--" >> $report
 else
   echo "$timestamp": Nothing to do >> $report

diff --git a/config/debian-non-US/cron.weekly b/config/debian-non-US/cron.weekly
index 0873e752773bf1b6f092daf0a23d88ae367edc5d..4a07f444769534d907f42bc48248eec7cb9fb6f6 100755 (executable)
--- a/config/debian-non-US/cron.weekly
+++ b/config/debian-non-US/cron.weekly
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Run once a week via cron, out of katie's crontab.
+# Run once a week via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US
+export SCRIPTVARS=/org/non-us.debian.org/dak/config/debian-non-US/vars
 . $SCRIPTVARS
 
 ################################################################################
@@ -17,6 +17,6 @@ fi
 # Clean up apt-ftparchive's databases
 
 cd $masterdir
-apt-ftparchive -q clean apt.conf-non-US
+apt-ftparchive -q clean apt.conf
 
 ################################################################################

diff --git a/config/debian-non-US/dak.conf b/config/debian-non-US/dak.conf
index 9763d1be9e9d223fcaa967f21080eeb19bb9a1d8..7c407420c75b219393d3b9e0462b386ce77cbf61 100644 (file)
--- a/config/debian-non-US/dak.conf
+++ b/config/debian-non-US/dak.conf
@@ -13,7 +13,7 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/org/non-us.debian.org/katie/lock";
+   LockFile "/org/non-us.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -29,30 +29,30 @@ Dinstall
    };
 };
 
-Lauren
+Reject-Proposed-Updates
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
 };
 
-Julia
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "udmsearch,postgres,www-data,katie,auric";
+  KnownPostgres "udmsearch,postgres,www-data,dak,auric";
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
    };
- MorgueSubDir "shania";
+ MorgueSubDir "queue";
 };
 
 
-Catherine 
+Poolize
 {
   Options 
   {
@@ -60,7 +60,7 @@ Catherine
   };
 };
 
-Natalie
+Control-Overrides
 {
   Options
   {
@@ -71,7 +71,7 @@ Natalie
  ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -82,16 +82,16 @@ Melanie
    Bcc "removed-packages@qa.debian.org";
 };
 
-Neve
+Import-Archive
 {
-  ExportDir "/org/non-us.debian.org/katie/neve-files/";
+  ExportDir "/org/non-us.debian.org/dak/import-archive-files/";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
 };
 
 Suite
@@ -158,7 +158,7 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
+       CopyDotDak "/org/non-us.debian.org/queue/proposed-updates/";
        Version "3.0-updates";
        Origin "Debian";
        Description "Debian 3.0 Proposed Updates - Not Released";
@@ -323,7 +323,7 @@ Dir
   Root "/org/non-us.debian.org/ftp/";
   Pool "/org/non-us.debian.org/ftp/pool/";
   PoolRoot "pool/";
-  Templates "/org/non-us.debian.org/katie/templates/";
+  Templates "/org/non-us.debian.org/dak/templates/";
   Override "/org/non-us.debian.org/scripts/override/";
   Lists "/org/non-us.debian.org/database/dists/";
   Log "/org/non-us.debian.org/log/";

diff --git a/config/debian-non-US/vars b/config/debian-non-US/vars
index c69401e24d892a462147d0599705abc0fb2d6df7..e0be968772a9ea360687ddd642ee8759da342ba1 100644 (file)
--- a/config/debian-non-US/vars
+++ b/config/debian-non-US/vars
@@ -5,7 +5,7 @@ ftpdir=$nonushome/ftp
 indices=$ftpdir/indices-non-US
 archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc"
 
-masterdir=$nonushome/katie
+masterdir=$nonushome/dak/config/debian-non-US
 overridedir=$nonushome/scripts/override
 dbdir=$nonushome/database/
 queuedir=$nonushome/queue/

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index f792f23d00c73973c8cf90b840d31eb0cbb10454..2d70b42201f5c340fec7f3943b314ac062846849 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -2,7 +2,7 @@ Dir
 {
    ArchiveDir "/org/security.debian.org/ftp/";
    OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/katie-database/";
+   CacheDir "/org/security.debian.org/dak-database/";
 };
 
 Default
@@ -15,8 +15,8 @@ Default
 
 tree "dists/oldstable/updates"
 {
-   FileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.woody.$(SECTION)";
@@ -27,8 +27,8 @@ tree "dists/oldstable/updates"
 
 tree "dists/stable/updates"
 {
-   FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.sarge.$(SECTION)";
@@ -39,8 +39,8 @@ tree "dists/stable/updates"
 
 tree "dists/testing/updates"
 {
-   FileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_source.list";
+   FileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
    Sections "main contrib non-free";
    Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
    BinOverride "override.etch.$(SECTION)";

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index 463887403d723ed8cd296d900d03b914f8957468..94d2aa3d79206aad57815d28f867bc8ae3acbe98 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -2,7 +2,7 @@ Dir
 {
    ArchiveDir "/org/security.debian.org/buildd/";
    OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/katie-database/";
+   CacheDir "/org/security.debian.org/dak-database/";
 };
 
 Default

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 05f2d1385a06e03d618885e1e2aae718c9507329..7aa42e8aab9721ede7c360edb06d4c3b5a796949 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -1,6 +1,6 @@
 #! /bin/bash
 #
-# Executed after jennifer (merge there??)
+# Executed after cron.unchecked
 
 ARCHS_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
 ARCHS_stable="$ARCHS_oldstable"
@@ -9,7 +9,7 @@ DISTS="oldstable stable testing"
 SSH_SOCKET=~/.ssh/buildd.debian.org.socket
 
 set -e
-export SCRIPTVARS=/org/security.debian.org/katie/vars-security
+export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
 if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 32a459567c411906c92a6136ddb8a5dbbb7b94db..6a1dbcae63f2647f457bd17d20572aa28886a555 100644 (file)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -1,9 +1,9 @@
-#! /bin/sh
+#!/bin/sh
 #
-# Executed daily via cron, out of katie's crontab.
+# Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/security.debian.org/katie/vars-security
+export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
 ################################################################################
@@ -50,23 +50,23 @@ for suite in $suites; do
                 continue;
               fi
               if [ "$suite" = "unstable" ]; then
-                $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+                dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
               fi
            else
-              $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
+              dak control-overrides -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type
            fi
            case $suite in
              oldstable)
                if [ ! "$override_type" = "udeb" ]; then
-                  $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
+                  dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type
                 fi
-               $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+               dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                ;;
              stable)
-               $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+               dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                ;;
              testing)
-               $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
+               dak control-overrides -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type
                ;;
              *) echo "Unknown suite type ($suite)"; exit 1;;
            esac
@@ -95,14 +95,14 @@ wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/bui
 ################################################################################
 
 cd $masterdir
-shania
-rhona
-apt-ftparchive -q clean apt.conf-security
-apt-ftparchive -q clean apt.conf.buildd-security
+dak clean-queues
+dak clean-suites
+apt-ftparchive -q clean apt.conf
+apt-ftparchive -q clean apt.conf.buildd
 
 symlinks -d -r $ftpdir
 
-pg_dump obscurity > /org/security.debian.org/katie-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
+pg_dump obscurity > /org/security.debian.org/dak-backup/dump_$(date +%Y.%m.%d-%H:%M:%S)
 
 # Vacuum the database
 set +e

diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 694a6dde74522eecb3a37edc706db52e3d08d7c6..5b2800865c7daa1091e20cc5c73cc16cf9f387b9 100755 (executable)
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/security.debian.org/katie/vars-security
+export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
 cd $unchecked
@@ -16,7 +16,7 @@ if [ -z "$changes" ]; then
 fi;
 
 echo "$timestamp": "$changes"  >> $report
-jennifer -a $changes >> $report
+dak process-unchecked -a $changes >> $report
 echo "--" >> $report
 
 sh $masterdir/cron.buildd-security

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index e5ef686800ade3e99aa19a0489f302aab235365b..dd3564d19746980f2983ae8d44ac01ec19ffddf1 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -12,7 +12,7 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security.debian.org/katie/lock";
+   LockFile "/org/security.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours
@@ -31,19 +31,19 @@ Dinstall
    SecurityQueueBuild "true";     
    DefaultSuite "Testing";
    SuiteSuffix "updates";
-   OverrideMaintainer "katie@security.debian.org";
+   OverrideMaintainer "dak@security.debian.org";
    StableDislocationSupport "false";
    LegacyStableHasNoSections "false";
 };
 
-Julia
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie,www-data,udmsearch";
+  KnownPostgres "postgres,dak,www-data,udmsearch";
 };
 
-Helena
+Queue-Report
 {
   Directories
   {
@@ -53,16 +53,16 @@ Helena
   };
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
   };
- MorgueSubDir "shania";
+ MorgueSubDir "queue";
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -70,24 +70,24 @@ Melanie
   };
 
   MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-  LogFile "/org/security.debian.org/katie-log/removals.txt";
+  LogFile "/org/security.debian.org/dak-log/removals.txt";
 };
 
-Neve
+Init-Archive
 {
-  ExportDir "/org/security.debian.org/katie/neve-files/";
+  ExportDir "/org/security.debian.org/dak/import-archive-files/";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   QueueBuildStayOfExecution 86400; // 24 hours
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
   OverrideFilename "override.source-only";
 };
 
-Amber
+Security-Install
 {
   ComponentMappings
   {
@@ -103,7 +103,7 @@ Amber
 Suite
 {
   // Priority determines which suite is used for the Maintainers file
-  // as generated by charisma (highest wins).
+  // as generated by 'dak make-maintainers' (highest wins).
 
   Oldstable
   {
@@ -129,14 +129,14 @@ Suite
          s390;
          sparc;
        };
-       Announce "katie@security.debian.org";
+       Announce "dak@security.debian.org";
        Version "3.0";
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian 3.0 Security Updates";
        CodeName "woody";
        OverrideCodeName "woody";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Stable
@@ -164,14 +164,14 @@ Suite
          s390;
          sparc;
        };
-       Announce "katie@security.debian.org";
+       Announce "dak@security.debian.org";
        Version "3.1";
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian 3.1 Security Updates";
        CodeName "sarge";
        OverrideCodeName "sarge";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
   Testing
@@ -199,14 +199,14 @@ Suite
          s390;
          sparc;
        };
-       Announce "katie@security.debian.org";
+       Announce "dak@security.debian.org";
        Version "x.y";
        Origin "Debian";
        Label "Debian-Security";
        Description "Debian x.y Security Updates";
        CodeName "etch";
        OverrideCodeName "etch";
-       CopyKatie "/org/security.debian.org/queue/done/";
+       CopyDotDak "/org/security.debian.org/queue/done/";
   };
 
 };
@@ -224,13 +224,13 @@ Dir
 {
   Root "/org/security.debian.org/ftp/";
   Pool "/org/security.debian.org/ftp/pool/";
-  Katie "/org/security.debian.org/katie/";
-  Templates "/org/security.debian.org/katie/templates/";
+  Dak "/org/security.debian.org/dak/";
+  Templates "/org/security.debian.org/dak/templates/";
   PoolRoot "pool/";
   Override "/org/security.debian.org/override/";
   Lock "/org/security.debian.org/lock/";
-  Lists "/org/security.debian.org/katie-database/dists/";
-  Log "/org/security.debian.org/katie-log/";
+  Lists "/org/security.debian.org/dak-database/dists/";
+  Log "/org/security.debian.org/dak-log/";
   Morgue "/org/security.debian.org/morgue/";
   MorgueReject "reject";
   Override "/org/security.debian.org/scripts/override/";

diff --git a/config/debian-security/vars b/config/debian-security/vars
index 05ccc8c1b3190a1f7da7adc91cc8b9958ed568b8..d5ff7e75768bd16a59d7491ad953afbfc0c80a8b 100644 (file)
--- a/config/debian-security/vars
+++ b/config/debian-security/vars
@@ -2,7 +2,7 @@
 
 base=/org/security.debian.org
 ftpdir=$base/ftp/
-masterdir=$base/katie/
+masterdir=$base/dak/config/debian-security/
 overridedir=$base/override
 queuedir=$base/queue/
 unchecked=$queuedir/unchecked/

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 591a30e776ae3ab6470fbeb27ced881e9b89520a..c5d962706fe51dbbb441ab94c3ff4234434825c0 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -17,7 +17,7 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/org/ftp.debian.org/katie/Contents.top";
+   Contents::Header "/org/ftp.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/proposed-updates"

diff --git a/config/debian/apt.conf.stable b/config/debian/apt.conf.stable
index 05cd21230b68e6733edfd1375568c4ab79c0b47e..1d836295ce9bc73f43af61b8bd8a4aaba3662c8b 100644 (file)
--- a/config/debian/apt.conf.stable
+++ b/config/debian/apt.conf.stable
@@ -16,7 +16,7 @@ Default
 
 TreeDefault
 {
-   Contents::Header "/org/ftp.debian.org/katie/Contents.top";
+   Contents::Header "/org/ftp.debian.org/dak/config/debian/Contents.top";
 };
 
 tree "dists/stable"

diff --git a/config/debian/cron.buildd b/config/debian/cron.buildd
index 4870e7ffc9be491d96aab9962af671dc7fbac727..f59dec092d6ea91d777950cae767a55d462fade4 100644 (file)
--- a/config/debian/cron.buildd
+++ b/config/debian/cron.buildd
@@ -1,11 +1,11 @@
 #! /bin/sh
 #
-# Executed hourly via cron, out of katie's crontab.
+# Executed as part of cron.unchecked
 
 ARCHS="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 77832a0546375c63cbe60aa812b6ea3bd7a6e66a..9c24f911c9493018c11526e79f0bab0cf7dce8eb 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -1,9 +1,9 @@
 #! /bin/sh
 #
-# Executed daily via cron, out of katie's crontab.
+# Executed daily via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ################################################################################
@@ -46,27 +46,27 @@ update-mailingliststxt
 lockfile $LOCKAC
 cd $accepted
 rm -f REPORT
-kelly -pa *.changes | tee REPORT | \
+dak process-unchecked -pa *.changes | tee REPORT | \
      mail -s "Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
 
 cd $masterdir
-cindy
+dak check-overrides
 rm -f $LOCKAC
 
 symlinks -d -r $ftpdir
 
 cd $masterdir
-jenna
+dak make-suite-file-list
 
 # Update fingerprints
-# [JT - disabled, emilie currently can ask questions]
-#emilie
+# [JT - disabled, dak import-ldap-fingerprints currently can ask questions]
+#dak import-ldap-fingerprints
 
 # Generate override files
 cd $overridedir
-denise
+dak make-overrides
 
 # Update task overrides for testing and unstable
 # [JT 2004-02-04 disabled; copying in by hand for now]
@@ -82,13 +82,13 @@ for i in main contrib non-free main.debian-installer; do cat override.sid.$i >>
 cd $masterdir
 apt-ftparchive generate apt.conf
 # Generate *.diff/ incremental updates
-tiffani
+dak generate-index-diffs
 # Generate Release files
-ziyi
+dak generate-releases
 
 # Clean out old packages
-rhona
-shania
+dak clean-suites
+dak clean-queues
 
 # Needs to be rebuilt, as files have moved.  Due to unaccepts, we need to
 # update this before wanna-build is updated.
@@ -123,15 +123,15 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE:  Skippin
 ################################################################################
 
 # Send a report on NEW/BYHAND packages
-helena | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
+dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org
 # and one on crufty packages
-rene | tee $webdir/rene-daily.txt | mail -e -s "rene run for $(date +%D)" ftpmaster@ftp-master.debian.org
+dak cruft-report | tee $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" ftpmaster@ftp-master.debian.org
 
 ################################################################################
 
-# Run billie
+# Run mirror-split
 
-#time billie
+#time dak mirror-split
 
 ################################################################################
 
@@ -140,8 +140,8 @@ ulimit -m 90000 -d 90000 -s 10000 -v 90000
 run-parts --report /org/ftp.debian.org/scripts/distmnt
 
 echo Daily cron scripts successful.
-# Stats pr0n
 
+# Stats pr0n
 cd $masterdir
 update-ftpstats $base/log/* > $base/misc/ftpstats.data
 R --slave --vanilla < $base/misc/ftpstats.R

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 85af9120ff33b0f7e498dee903f3089b6eee6f04..5a756fbd55f6d279bed47ec0f260c85c132cbb11 100644 (file)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -3,9 +3,9 @@
 # Executed hourly via cron, out of troup's crontab.
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 cd $masterdir
-julia
-helena -n > $webdir/new.html
+dak import-users-from-passwd
+dak queue-report -n > $webdir/new.html

diff --git a/config/debian/cron.monthly b/config/debian/cron.monthly
index 99bb434fdd008bb42b40a28ac4702e68c9cd9b53..ac4bf7dd5517b7c30f4a02ae5f993c35f10473d0 100755 (executable)
--- a/config/debian/cron.monthly
+++ b/config/debian/cron.monthly
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Run at the beginning of the month via cron, out of katie's crontab.
+# Run at the beginning of the month via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ################################################################################

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index b14b442df347661f0e9550895cf8ab4f169dc648..124f7f6eb42f90ee23eb19aa140d19b95d464d9e 100644 (file)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 LOCKFILE="$lockdir/unchecked.lock"
@@ -25,14 +25,14 @@ if lockfile -r3 $LOCKFILE; then
 
        if [ ! -z "$changes" ]; then
                echo "$timestamp": "$changes"  >> $report
-               jennifer -a $changes >> $report
+               dak process-unchecked -a $changes >> $report
                echo "--" >> $report
 
                if lockfile -r3 $NOTICE; then
                        LOCKDAILY="YES"
                        psql projectb -A -t -q -c "SELECT filename FROM queue_build WHERE queue = 0 AND suite = 5 AND in_queue = true AND filename ~ 'd(sc|eb)$'" > $dbdir/dists/unstable_accepted.list
                        cd $overridedir
-                       denise &>/dev/null
+                       dak make-overrides &>/dev/null
                        rm -f override.sid.all3 override.sid.all3.src
                        for i in main contrib non-free main.debian-installer; do
                                cat override.sid.$i >> override.sid.all3
@@ -48,4 +48,3 @@ if lockfile -r3 $LOCKFILE; then
                echo "$timestamp": Nothing to do >> $report
        fi
 fi
-

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 8357d2ee8309fbbbbc52e582f8221d7ad158de02..fb5d207edda439e85d1027f7dac10246e387e2c1 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# Run once a week via cron, out of katie's crontab.
+# Run once a week via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/ftp.debian.org/katie/vars
+export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
 ################################################################################

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 89b839c4744ffbe2264f3cca3ef222d84e6573b2..c8b5b679b28c7546c2e125a0c4805b3c9a1d71dd 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -34,7 +34,7 @@ Dinstall
    };
 };
 
-Tiffani
+Generate-Index-Diffs
 {
    Options
    {
@@ -43,12 +43,12 @@ Tiffani
    };
 };
 
-Alicia
+Override
 {
    MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
 };
 
-Billie
+Mirror-Split
 {
   FTPPath "/org/ftp.debian.org/ftp";
   TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
@@ -62,23 +62,23 @@ Billie
   };
 };
 
-Julia
+Import-Users-From-Passwd
 {
   ValidGID "800";
   // Comma separated list of users who are in Postgres but not the passwd file
-  KnownPostgres "postgres,katie";
+  KnownPostgres "postgres,dak";
 };
 
-Shania
+Clean-Queues
 {
   Options
   {
     Days 14;
    };
- MorgueSubDir "shania";
+ MorgueSubDir "queues";
 };
 
-Natalie
+Control-Overrides
 {
   Options
   {
@@ -90,7 +90,7 @@ Natalie
  ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
 };
 
-Melanie
+Rm
 {
   Options
   {
@@ -102,18 +102,18 @@ Melanie
    Bcc "removed-packages@qa.debian.org";
 };
 
-Neve
+Import-Archive
 {
-  ExportDir "/org/ftp.debian.org/katie/neve-files/";
+  ExportDir "/org/ftp.debian.org/dak/import-archive-files/";
 };
 
-Lauren
+Reject-Proposed-Updates
 {
    StableRejector "Martin (Joey) Schulze <joey@debian.org>";
    MoreInfoURL "http://people.debian.org/~joey/3.1r2/";
 };
 
-Emilie
+Import-LDAP-Fingerprints
 {
   LDAPDn "ou=users,dc=debian,dc=org";
   LDAPServer "db.debian.org";
@@ -126,20 +126,20 @@ Emilie
   KeyServer "wwwkeys.eu.pgp.net";
 };
 
-Rhona
+Clean-Suites
 {
   // How long (in seconds) dead packages are left before being killed
   StayOfExecution 129600; // 1.5 days
   QueueBuildStayOfExecution 86400; // 24 hours
-  MorgueSubDir "rhona";
+  MorgueSubDir "pool";
 };
 
-Lisa
+Process-New
 {
   AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock";
 };
 
-Cindy
+Check-Overrides
 {
   OverrideSuites
   {
@@ -262,7 +262,7 @@ Suite
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
-       CopyKatie "/org/ftp.debian.org/queue/proposed-updates/";
+       CopyDotDak "/org/ftp.debian.org/queue/proposed-updates/";
        Version "3.1-updates";
        Origin "Debian";
        Description "Debian 3.1 Proposed Updates - Not Released";
@@ -501,7 +501,7 @@ Dir
 {
   Root "/org/ftp.debian.org/ftp/";
   Pool "/org/ftp.debian.org/ftp/pool/";
-  Templates "/org/ftp.debian.org/katie/templates/";
+  Templates "/org/ftp.debian.org/dak/templates/";
   PoolRoot "pool/";
   Lists "/org/ftp.debian.org/database/dists/";
   Log "/org/ftp.debian.org/log/";

diff --git a/config/debian/vars b/config/debian/vars
index a4e3b5d0187c81604e6595577e6aa097d3f1fed9..8dcc35307da900f119e4eb7118ef34094b790c90 100644 (file)
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -7,7 +7,7 @@ indices=$ftpdir/indices
 archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc"
 
 scriptdir=$base/scripts
-masterdir=$base/katie/
+masterdir=$base/dak/
 dbdir=$base/database/
 lockdir=$base/lock/
 overridedir=$scriptdir/override

diff --git a/config/examples/dak.conf b/config/examples/dak.conf
index 76e0a9a629fa3b7f5a93597100d4ecb5cbbb3293..a47c5c03c917f417c9b080c7ac4a325f9c4205e7 100644 (file)
--- a/config/examples/dak.conf
+++ b/config/examples/dak.conf
@@ -1,23 +1,23 @@
-// Example /etc/katie/katie.conf
+// Example /etc/dak/dak.conf
 
 Config
 {
   // FQDN hostname
-  auric.debian.org
+  raff.debian.org
   {
 
     // Optional hostname as it appears in the database (if it differs
     // from the FQDN hostname).
     DatbaseHostname     "ftp-master";
 
-    // Optional filename of katie's config file; if not present, this
-    // file is assumed to contain katie config info.
-    KatieConfig                "/org/ftp.debian.org/katie/katie.conf";
+    // Optional filename of dak's config file; if not present, this
+    // file is assumed to contain dak config info.
+    DakConfig          "/org/ftp.debian.org/dak/config/debian/dak.conf";
 
     // Optional filename of apt-ftparchive's config file; if not
     // present, the file is assumed to be 'apt.conf' in the same
     // directory as this file.
-    AptConfig          "/org/ftp.debian.org/katie/apt.conf";
+    AptConfig          "/org/ftp.debian.org/dak/config/debian/apt.conf";
   }
 
 }