Skip to content

D
Dak

喜羊羊3508 / Dak
11 个月 前同步成功

通知 1
Star 0
Fork 0
D
Dak

体验新版 GitCode，发现更多精彩内容 >>

提交 17cec6a9 编写于 作者: J James Troup
浏览文件
操作

Enmasse adaptation for removal of silly names.

上级 9ee42504
隐藏空白更改
内联 并排
Showing with 147 addition and 148 deletion
config/debian-non-US/apt.conf
浏览文件 @ 17cec6a9
...@@ -17,7 +17,7 @@ Default ...@@ -17,7 +17,7 @@ Default
TreeDefault 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" tree "dists/proposed-updates/non-US"
......
config/debian-non-US/apt.conf.stable
浏览文件 @ 17cec6a9
...@@ -16,7 +16,7 @@ Default ...@@ -16,7 +16,7 @@ Default
TreeDefault 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" tree "dists/stable/non-US"
......
config/debian-non-US/cron.daily
浏览文件 @ 17cec6a9
#! /bin/sh #! /bin/sh
# #
# Executed daily via cron, out of troup's crontab. # Executed daily via cron, out of dak's crontab.
set -e 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 . $SCRIPTVARS
################################################################################ ################################################################################
...@@ -40,40 +40,40 @@ update-readmenonus ...@@ -40,40 +40,40 @@ update-readmenonus
if [ ! -z "$(find "$accepted" -name \*.changes -maxdepth 1 -mindepth 1)" ]; then if [ ! -z "$(find "$accepted" -name \*.changes -maxdepth 1 -mindepth 1)" ]; then
cd $accepted cd $accepted
rm -f REPORT 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 mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org
chgrp debadmin REPORT chgrp debadmin REPORT
chmod 664 REPORT chmod 664 REPORT
else else
echo "kelly: Nothing to install." echo "dak process-accepted: Nothing to install."
fi fi
cd $masterdir cd $masterdir
symlinks -d -r $ftpdir symlinks -d -r $ftpdir
cd $masterdir cd $masterdir
jenna dak make-suite-file-list
# Generate override files # Generate override files
cd $overridedir cd $overridedir
denise dak make-overrides
# FIXME # FIXME
rm -f override.potato.all3 rm -f override.potato.all3
for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done
# Generate Packages and Sources files # Generate Packages and Sources files
cd $masterdir cd $masterdir
apt-ftparchive generate apt.conf-non-US apt-ftparchive generate apt.conf
# Generate Release files # Generate Release files
ziyi dak generate-releases
# Clean out old packages # Clean out old packages
rhona dak clean-suites
shania dak clean-queues
# Generate the Maintainers file # Generate the Maintainers file
cd $indices cd $indices
charisma > .new-maintainers_versions dak make-maintainers > .new-maintainers_versions
mv -f .new-maintainers_versions 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 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 mv -f .new-maintainers Maintainers
...@@ -104,9 +104,9 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skippin ...@@ -104,9 +104,9 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skippin
################################################################################ ################################################################################
# Send a report on NEW/BYHAND packages # 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 # 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 ulimit -m 90000 -d 90000 -s 10000 -v 90000
......
config/debian-non-US/cron.hourly
浏览文件 @ 17cec6a9
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
# Executed hourly via cron, out of troup's crontab. # Executed hourly via cron, out of troup's crontab.
set -e set -e
export SCRIPTVARS=/org/non-us.debian.org/katie/vars-non-US export SCRIPTVARS=/org/non-us.debian.org/dak/config/vars
. $SCRIPTVARS . $SCRIPTVARS
cd $masterdir cd $masterdir
julia dak import-users-from-passwd
config/debian-non-US/cron.unchecked
浏览文件 @ 17cec6a9
#! /bin/sh #! /bin/sh
set -e 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 . $SCRIPTVARS
cd $unchecked cd $unchecked
...@@ -12,7 +12,7 @@ timestamp=$(date "+%Y-%m-%d %H:%M") ...@@ -12,7 +12,7 @@ timestamp=$(date "+%Y-%m-%d %H:%M")
if [ ! -z "$changes" ]; then if [ ! -z "$changes" ]; then
echo "$timestamp": "$changes" >> $report echo "$timestamp": "$changes" >> $report
jennifer -a $changes >> $report dak process-unchecked -a $changes >> $report
echo "--" >> $report echo "--" >> $report
else else
echo "$timestamp": Nothing to do >> $report echo "$timestamp": Nothing to do >> $report
......
config/debian-non-US/cron.weekly
浏览文件 @ 17cec6a9
#!/bin/sh #!/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 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 . $SCRIPTVARS
################################################################################ ################################################################################
...@@ -17,6 +17,6 @@ fi ...@@ -17,6 +17,6 @@ fi
# Clean up apt-ftparchive's databases # Clean up apt-ftparchive's databases
cd $masterdir cd $masterdir
apt-ftparchive -q clean apt.conf-non-US apt-ftparchive -q clean apt.conf
################################################################################ ################################################################################
config/debian-non-US/dak.conf
浏览文件 @ 17cec6a9
...@@ -13,7 +13,7 @@ Dinstall ...@@ -13,7 +13,7 @@ Dinstall
BugServer "bugs.debian.org"; BugServer "bugs.debian.org";
PackagesServer "packages.debian.org"; PackagesServer "packages.debian.org";
TrackingServer "packages.qa.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"; Bcc "archive@ftp-master.debian.org";
GroupOverrideFilename "override.group-maint"; GroupOverrideFilename "override.group-maint";
FutureTimeTravelGrace 28800; // 8 hours FutureTimeTravelGrace 28800; // 8 hours
...@@ -29,30 +29,30 @@ Dinstall ...@@ -29,30 +29,30 @@ Dinstall
}; };
}; };
Lauren Reject-Proposed-Updates
{ {
StableRejector "Martin (Joey) Schulze <joey@debian.org>"; StableRejector "Martin (Joey) Schulze <joey@debian.org>";
MoreInfoURL "http://people.debian.org/~joey/3.0r4/"; MoreInfoURL "http://people.debian.org/~joey/3.0r4/";
}; };
Julia Import-Users-From-Passwd
{ {
ValidGID "800"; ValidGID "800";
// Comma separated list of users who are in Postgres but not the passwd file // 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 Options
{ {
Days 14; Days 14;
}; };
MorgueSubDir "shania"; MorgueSubDir "queue";
}; };
Catherine Poolize
{ {
Options Options
{ {
...@@ -60,7 +60,7 @@ Catherine ...@@ -60,7 +60,7 @@ Catherine
}; };
}; };
Natalie Control-Overrides
{ {
Options Options
{ {
...@@ -71,7 +71,7 @@ Natalie ...@@ -71,7 +71,7 @@ Natalie
ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name ComponentPosition "suffix"; // Whether the component is prepended or appended to the section name
}; };
Melanie Rm
{ {
Options Options
{ {
...@@ -82,16 +82,16 @@ Melanie ...@@ -82,16 +82,16 @@ Melanie
Bcc "removed-packages@qa.debian.org"; 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 // How long (in seconds) dead packages are left before being killed
StayOfExecution 129600; // 1.5 days StayOfExecution 129600; // 1.5 days
MorgueSubDir "rhona"; MorgueSubDir "pool";
}; };
Suite Suite
...@@ -158,7 +158,7 @@ Suite ...@@ -158,7 +158,7 @@ Suite
}; };
Announce "debian-changes@lists.debian.org"; Announce "debian-changes@lists.debian.org";
CopyChanges "dists/proposed-updates/"; 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"; Version "3.0-updates";
Origin "Debian"; Origin "Debian";
Description "Debian 3.0 Proposed Updates - Not Released"; Description "Debian 3.0 Proposed Updates - Not Released";
...@@ -323,7 +323,7 @@ Dir ...@@ -323,7 +323,7 @@ Dir
Root "/org/non-us.debian.org/ftp/"; Root "/org/non-us.debian.org/ftp/";
Pool "/org/non-us.debian.org/ftp/pool/"; Pool "/org/non-us.debian.org/ftp/pool/";
PoolRoot "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/"; Override "/org/non-us.debian.org/scripts/override/";
Lists "/org/non-us.debian.org/database/dists/"; Lists "/org/non-us.debian.org/database/dists/";
Log "/org/non-us.debian.org/log/"; Log "/org/non-us.debian.org/log/";
......
config/debian-non-US/vars
浏览文件 @ 17cec6a9
...@@ -5,7 +5,7 @@ ftpdir=$nonushome/ftp ...@@ -5,7 +5,7 @@ ftpdir=$nonushome/ftp
indices=$ftpdir/indices-non-US indices=$ftpdir/indices-non-US
archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc" 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 overridedir=$nonushome/scripts/override
dbdir=$nonushome/database/ dbdir=$nonushome/database/
queuedir=$nonushome/queue/ queuedir=$nonushome/queue/
......
config/debian-security/apt.conf
浏览文件 @ 17cec6a9
...@@ -2,7 +2,7 @@ Dir ...@@ -2,7 +2,7 @@ Dir
{ {
ArchiveDir "/org/security.debian.org/ftp/"; ArchiveDir "/org/security.debian.org/ftp/";
OverrideDir "/org/security.debian.org/override/"; OverrideDir "/org/security.debian.org/override/";
CacheDir "/org/security.debian.org/katie-database/"; CacheDir "/org/security.debian.org/dak-database/";
}; };
Default Default
...@@ -15,8 +15,8 @@ Default ...@@ -15,8 +15,8 @@ Default
tree "dists/oldstable/updates" tree "dists/oldstable/updates"
{ {
FileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list"; FileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
SourceFileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_source.list"; SourceFileList "/org/security.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
Sections "main contrib non-free"; Sections "main contrib non-free";
Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source"; Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.woody.$(SECTION)"; BinOverride "override.woody.$(SECTION)";
...@@ -27,8 +27,8 @@ tree "dists/oldstable/updates" ...@@ -27,8 +27,8 @@ tree "dists/oldstable/updates"
tree "dists/stable/updates" tree "dists/stable/updates"
{ {
FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list"; FileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
SourceFileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_source.list"; SourceFileList "/org/security.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
Sections "main contrib non-free"; Sections "main contrib non-free";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source"; Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.sarge.$(SECTION)"; BinOverride "override.sarge.$(SECTION)";
...@@ -39,8 +39,8 @@ tree "dists/stable/updates" ...@@ -39,8 +39,8 @@ tree "dists/stable/updates"
tree "dists/testing/updates" tree "dists/testing/updates"
{ {
FileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list"; FileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
SourceFileList "/org/security.debian.org/katie-database/dists/testing_updates/$(SECTION)_source.list"; SourceFileList "/org/security.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
Sections "main contrib non-free"; Sections "main contrib non-free";
Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source"; Architectures "alpha arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc source";
BinOverride "override.etch.$(SECTION)"; BinOverride "override.etch.$(SECTION)";
......
config/debian-security/apt.conf.buildd
浏览文件 @ 17cec6a9
...@@ -2,7 +2,7 @@ Dir ...@@ -2,7 +2,7 @@ Dir
{ {
ArchiveDir "/org/security.debian.org/buildd/"; ArchiveDir "/org/security.debian.org/buildd/";
OverrideDir "/org/security.debian.org/override/"; OverrideDir "/org/security.debian.org/override/";
CacheDir "/org/security.debian.org/katie-database/"; CacheDir "/org/security.debian.org/dak-database/";
}; };
Default Default
......
config/debian-security/cron.buildd
浏览文件 @ 17cec6a9
#! /bin/bash #! /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_oldstable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
ARCHS_stable="$ARCHS_oldstable" ARCHS_stable="$ARCHS_oldstable"
...@@ -9,7 +9,7 @@ DISTS="oldstable stable testing" ...@@ -9,7 +9,7 @@ DISTS="oldstable stable testing"
SSH_SOCKET=~/.ssh/buildd.debian.org.socket SSH_SOCKET=~/.ssh/buildd.debian.org.socket
set -e set -e
export SCRIPTVARS=/org/security.debian.org/katie/vars-security export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
. $SCRIPTVARS . $SCRIPTVARS
if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
......
config/debian-security/cron.daily
浏览文件 @ 17cec6a9
#! /bin/sh #!/bin/sh
# #
# Executed daily via cron, out of katie's crontab. # Executed daily via cron, out of dak's crontab.
set -e set -e
export SCRIPTVARS=/org/security.debian.org/katie/vars-security export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
. $SCRIPTVARS . $SCRIPTVARS
################################################################################ ################################################################################
...@@ -50,23 +50,23 @@ for suite in $suites; do ...@@ -50,23 +50,23 @@ for suite in $suites; do
continue; continue;
fi fi
if [ "$suite" = "unstable" ]; then 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 fi
else 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 fi
case $suite in case $suite in
oldstable) oldstable)
if [ ! "$override_type" = "udeb" ]; then 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 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) 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) 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;; *) echo "Unknown suite type ($suite)"; exit 1;;
esac esac
...@@ -95,14 +95,14 @@ wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/bui ...@@ -95,14 +95,14 @@ wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/bui
################################################################################ ################################################################################
cd $masterdir cd $masterdir
shania dak clean-queues
rhona dak clean-suites
apt-ftparchive -q clean apt.conf-security apt-ftparchive -q clean apt.conf
apt-ftparchive -q clean apt.conf.buildd-security apt-ftparchive -q clean apt.conf.buildd
symlinks -d -r $ftpdir 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 # Vacuum the database
set +e set +e
......
config/debian-security/cron.unchecked
浏览文件 @ 17cec6a9
#! /bin/sh #! /bin/sh
set -e set -e
export SCRIPTVARS=/org/security.debian.org/katie/vars-security export SCRIPTVARS=/org/security.debian.org/dak/config/debian-security/vars
. $SCRIPTVARS . $SCRIPTVARS
cd $unchecked cd $unchecked
...@@ -16,7 +16,7 @@ if [ -z "$changes" ]; then ...@@ -16,7 +16,7 @@ if [ -z "$changes" ]; then
fi; fi;
echo "$timestamp": "$changes" >> $report echo "$timestamp": "$changes" >> $report
jennifer -a $changes >> $report dak process-unchecked -a $changes >> $report
echo "--" >> $report echo "--" >> $report
sh $masterdir/cron.buildd-security sh $masterdir/cron.buildd-security
config/debian-security/dak.conf
浏览文件 @ 17cec6a9
...@@ -12,7 +12,7 @@ Dinstall ...@@ -12,7 +12,7 @@ Dinstall
MyDistribution "Debian"; // Used in emails MyDistribution "Debian"; // Used in emails
BugServer "bugs.debian.org"; BugServer "bugs.debian.org";
PackagesServer "packages.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"; Bcc "archive@ftp-master.debian.org";
// GroupOverrideFilename "override.group-maint"; // GroupOverrideFilename "override.group-maint";
FutureTimeTravelGrace 28800; // 8 hours FutureTimeTravelGrace 28800; // 8 hours
...@@ -31,19 +31,19 @@ Dinstall ...@@ -31,19 +31,19 @@ Dinstall
SecurityQueueBuild "true"; SecurityQueueBuild "true";
DefaultSuite "Testing"; DefaultSuite "Testing";
SuiteSuffix "updates"; SuiteSuffix "updates";
OverrideMaintainer "katie@security.debian.org"; OverrideMaintainer "dak@security.debian.org";
StableDislocationSupport "false"; StableDislocationSupport "false";
LegacyStableHasNoSections "false"; LegacyStableHasNoSections "false";
}; };
Julia Import-Users-From-Passwd
{ {
ValidGID "800"; ValidGID "800";
// Comma separated list of users who are in Postgres but not the passwd file // 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 Directories
{ {
...@@ -53,16 +53,16 @@ Helena ...@@ -53,16 +53,16 @@ Helena
}; };
}; };
Shania Clean-Queues
{ {
Options Options
{ {
Days 14; Days 14;
}; };
MorgueSubDir "shania"; MorgueSubDir "queue";
}; };
Melanie Rm
{ {
Options Options
{ {
...@@ -70,24 +70,24 @@ Melanie ...@@ -70,24 +70,24 @@ Melanie
}; };
MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>"; 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 // How long (in seconds) dead packages are left before being killed
StayOfExecution 129600; // 1.5 days StayOfExecution 129600; // 1.5 days
QueueBuildStayOfExecution 86400; // 24 hours QueueBuildStayOfExecution 86400; // 24 hours
MorgueSubDir "rhona"; MorgueSubDir "pool";
OverrideFilename "override.source-only"; OverrideFilename "override.source-only";
}; };
Amber Security-Install
{ {
ComponentMappings ComponentMappings
{ {
...@@ -103,7 +103,7 @@ Amber ...@@ -103,7 +103,7 @@ Amber
Suite Suite
{ {
// Priority determines which suite is used for the Maintainers file // 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 Oldstable
{ {
...@@ -129,14 +129,14 @@ Suite ...@@ -129,14 +129,14 @@ Suite
s390; s390;
sparc; sparc;
}; };
Announce "katie@security.debian.org"; Announce "dak@security.debian.org";
Version "3.0"; Version "3.0";
Origin "Debian"; Origin "Debian";
Label "Debian-Security"; Label "Debian-Security";
Description "Debian 3.0 Security Updates"; Description "Debian 3.0 Security Updates";
CodeName "woody"; CodeName "woody";
OverrideCodeName "woody"; OverrideCodeName "woody";
CopyKatie "/org/security.debian.org/queue/done/"; CopyDotDak "/org/security.debian.org/queue/done/";
}; };
Stable Stable
...@@ -164,14 +164,14 @@ Suite ...@@ -164,14 +164,14 @@ Suite
s390; s390;
sparc; sparc;
}; };
Announce "katie@security.debian.org"; Announce "dak@security.debian.org";
Version "3.1"; Version "3.1";
Origin "Debian"; Origin "Debian";
Label "Debian-Security"; Label "Debian-Security";
Description "Debian 3.1 Security Updates"; Description "Debian 3.1 Security Updates";
CodeName "sarge"; CodeName "sarge";
OverrideCodeName "sarge"; OverrideCodeName "sarge";
CopyKatie "/org/security.debian.org/queue/done/"; CopyDotDak "/org/security.debian.org/queue/done/";
}; };
Testing Testing
...@@ -199,14 +199,14 @@ Suite ...@@ -199,14 +199,14 @@ Suite
s390; s390;
sparc; sparc;
}; };
Announce "katie@security.debian.org"; Announce "dak@security.debian.org";
Version "x.y"; Version "x.y";
Origin "Debian"; Origin "Debian";
Label "Debian-Security"; Label "Debian-Security";
Description "Debian x.y Security Updates"; Description "Debian x.y Security Updates";
CodeName "etch"; CodeName "etch";
OverrideCodeName "etch"; OverrideCodeName "etch";
CopyKatie "/org/security.debian.org/queue/done/"; CopyDotDak "/org/security.debian.org/queue/done/";
}; };
}; };
...@@ -224,13 +224,13 @@ Dir ...@@ -224,13 +224,13 @@ Dir
{ {
Root "/org/security.debian.org/ftp/"; Root "/org/security.debian.org/ftp/";
Pool "/org/security.debian.org/ftp/pool/"; Pool "/org/security.debian.org/ftp/pool/";
Katie "/org/security.debian.org/katie/"; Dak "/org/security.debian.org/dak/";
Templates "/org/security.debian.org/katie/templates/"; Templates "/org/security.debian.org/dak/templates/";
PoolRoot "pool/"; PoolRoot "pool/";
Override "/org/security.debian.org/override/"; Override "/org/security.debian.org/override/";
Lock "/org/security.debian.org/lock/"; Lock "/org/security.debian.org/lock/";
Lists "/org/security.debian.org/katie-database/dists/"; Lists "/org/security.debian.org/dak-database/dists/";
Log "/org/security.debian.org/katie-log/"; Log "/org/security.debian.org/dak-log/";
Morgue "/org/security.debian.org/morgue/"; Morgue "/org/security.debian.org/morgue/";
MorgueReject "reject"; MorgueReject "reject";
Override "/org/security.debian.org/scripts/override/"; Override "/org/security.debian.org/scripts/override/";
......
config/debian-security/vars
浏览文件 @ 17cec6a9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
base=/org/security.debian.org base=/org/security.debian.org
ftpdir=$base/ftp/ ftpdir=$base/ftp/
masterdir=$base/katie/ masterdir=$base/dak/config/debian-security/
overridedir=$base/override overridedir=$base/override
queuedir=$base/queue/ queuedir=$base/queue/
unchecked=$queuedir/unchecked/ unchecked=$queuedir/unchecked/
......
config/debian/apt.conf
浏览文件 @ 17cec6a9
...@@ -17,7 +17,7 @@ Default ...@@ -17,7 +17,7 @@ Default
TreeDefault 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" tree "dists/proposed-updates"
......
config/debian/apt.conf.stable
浏览文件 @ 17cec6a9
...@@ -16,7 +16,7 @@ Default ...@@ -16,7 +16,7 @@ Default
TreeDefault TreeDefault
{ {
Contents::Header "/org/ftp.debian.org/katie/Contents.top"; Contents::Header "/org/ftp.debian.org/dak/config/debian/Contents.top";
}; };
tree "dists/stable" tree "dists/stable"
......
config/debian/cron.buildd
浏览文件 @ 17cec6a9
#! /bin/sh #! /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" ARCHS="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
set -e set -e
export SCRIPTVARS=/org/ftp.debian.org/katie/vars export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS . $SCRIPTVARS
LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress" LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
......
config/debian/cron.daily
浏览文件 @ 17cec6a9
#! /bin/sh #! /bin/sh
# #
# Executed daily via cron, out of katie's crontab. # Executed daily via cron, out of dak's crontab.
set -e set -e
export SCRIPTVARS=/org/ftp.debian.org/katie/vars export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS . $SCRIPTVARS
################################################################################ ################################################################################
...@@ -46,27 +46,27 @@ update-mailingliststxt ...@@ -46,27 +46,27 @@ update-mailingliststxt
lockfile $LOCKAC lockfile $LOCKAC
cd $accepted cd $accepted
rm -f REPORT 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 mail -s "Install for $(date +%D)" ftpmaster@ftp-master.debian.org
chgrp debadmin REPORT chgrp debadmin REPORT
chmod 664 REPORT chmod 664 REPORT
cd $masterdir cd $masterdir
cindy dak check-overrides
rm -f $LOCKAC rm -f $LOCKAC
symlinks -d -r $ftpdir symlinks -d -r $ftpdir
cd $masterdir cd $masterdir
jenna dak make-suite-file-list
# Update fingerprints # Update fingerprints
# [JT - disabled, emilie currently can ask questions] # [JT - disabled, dak import-ldap-fingerprints currently can ask questions]
#emilie #dak import-ldap-fingerprints
# Generate override files # Generate override files
cd $overridedir cd $overridedir
denise dak make-overrides
# Update task overrides for testing and unstable # Update task overrides for testing and unstable
# [JT 2004-02-04 disabled; copying in by hand for now] # [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 >> ...@@ -82,13 +82,13 @@ for i in main contrib non-free main.debian-installer; do cat override.sid.$i >>
cd $masterdir cd $masterdir
apt-ftparchive generate apt.conf apt-ftparchive generate apt.conf
# Generate *.diff/ incremental updates # Generate *.diff/ incremental updates
tiffani dak generate-index-diffs
# Generate Release files # Generate Release files
ziyi dak generate-releases
# Clean out old packages # Clean out old packages
rhona dak clean-suites
shania dak clean-queues
# Needs to be rebuilt, as files have moved. Due to unaccepts, we need to # Needs to be rebuilt, as files have moved. Due to unaccepts, we need to
# update this before wanna-build is updated. # update this before wanna-build is updated.
...@@ -123,15 +123,15 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skippin ...@@ -123,15 +123,15 @@ echo "VACUUM; VACUUM ANALYZE;" | psql projectb 2>&1 | grep -v "^NOTICE: Skippin
################################################################################ ################################################################################
# Send a report on NEW/BYHAND packages # 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 # 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 ...@@ -140,8 +140,8 @@ ulimit -m 90000 -d 90000 -s 10000 -v 90000
run-parts --report /org/ftp.debian.org/scripts/distmnt run-parts --report /org/ftp.debian.org/scripts/distmnt
echo Daily cron scripts successful. echo Daily cron scripts successful.
# Stats pr0n
# Stats pr0n
cd $masterdir cd $masterdir
update-ftpstats $base/log/* > $base/misc/ftpstats.data update-ftpstats $base/log/* > $base/misc/ftpstats.data
R --slave --vanilla < $base/misc/ftpstats.R R --slave --vanilla < $base/misc/ftpstats.R
config/debian/cron.hourly
浏览文件 @ 17cec6a9
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
# Executed hourly via cron, out of troup's crontab. # Executed hourly via cron, out of troup's crontab.
set -e set -e
export SCRIPTVARS=/org/ftp.debian.org/katie/vars export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS . $SCRIPTVARS
cd $masterdir cd $masterdir
julia dak import-users-from-passwd
helena -n > $webdir/new.html dak queue-report -n > $webdir/new.html
config/debian/cron.monthly
浏览文件 @ 17cec6a9
#!/bin/sh #!/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 set -e
export SCRIPTVARS=/org/ftp.debian.org/katie/vars export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS . $SCRIPTVARS
################################################################################ ################################################################################
......
config/debian/cron.unchecked
浏览文件 @ 17cec6a9
#! /bin/sh #! /bin/sh
set -e set -e
export SCRIPTVARS=/org/ftp.debian.org/katie/vars export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS . $SCRIPTVARS
LOCKFILE="$lockdir/unchecked.lock" LOCKFILE="$lockdir/unchecked.lock"
...@@ -25,14 +25,14 @@ if lockfile -r3 $LOCKFILE; then ...@@ -25,14 +25,14 @@ if lockfile -r3 $LOCKFILE; then
if [ ! -z "$changes" ]; then if [ ! -z "$changes" ]; then
echo "$timestamp": "$changes" >> $report echo "$timestamp": "$changes" >> $report
jennifer -a $changes >> $report dak process-unchecked -a $changes >> $report
echo "--" >> $report echo "--" >> $report
if lockfile -r3 $NOTICE; then if lockfile -r3 $NOTICE; then
LOCKDAILY="YES" 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 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 cd $overridedir
denise &>/dev/null dak make-overrides &>/dev/null
rm -f override.sid.all3 override.sid.all3.src rm -f override.sid.all3 override.sid.all3.src
for i in main contrib non-free main.debian-installer; do for i in main contrib non-free main.debian-installer; do
cat override.sid.$i >> override.sid.all3 cat override.sid.$i >> override.sid.all3
...@@ -48,4 +48,3 @@ if lockfile -r3 $LOCKFILE; then ...@@ -48,4 +48,3 @@ if lockfile -r3 $LOCKFILE; then
echo "$timestamp": Nothing to do >> $report echo "$timestamp": Nothing to do >> $report
fi fi
fi fi
config/debian/cron.weekly
浏览文件 @ 17cec6a9
#!/bin/sh #!/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 set -e
export SCRIPTVARS=/org/ftp.debian.org/katie/vars export SCRIPTVARS=/org/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS . $SCRIPTVARS
################################################################################ ################################################################################
......
config/debian/dak.conf
浏览文件 @ 17cec6a9
...@@ -34,7 +34,7 @@ Dinstall ...@@ -34,7 +34,7 @@ Dinstall
}; };
}; };
Tiffani Generate-Index-Diffs
{ {
Options Options
{ {
...@@ -43,12 +43,12 @@ Tiffani ...@@ -43,12 +43,12 @@ Tiffani
}; };
}; };
Alicia Override
{ {
MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>"; MyEmailAddress "Debian FTP Masters <ftpmaster@ftp-master.debian.org>";
}; };
Billie Mirror-Split
{ {
FTPPath "/org/ftp.debian.org/ftp"; FTPPath "/org/ftp.debian.org/ftp";
TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots"; TreeRootPath "/org/ftp.debian.org/scratch/dsilvers/treeroots";
...@@ -62,23 +62,23 @@ Billie ...@@ -62,23 +62,23 @@ Billie
}; };
}; };
Julia Import-Users-From-Passwd
{ {
ValidGID "800"; ValidGID "800";
// Comma separated list of users who are in Postgres but not the passwd file // Comma separated list of users who are in Postgres but not the passwd file
KnownPostgres "postgres,katie"; KnownPostgres "postgres,dak";
}; };
Shania Clean-Queues
{ {
Options Options
{ {
Days 14; Days 14;
}; };
MorgueSubDir "shania"; MorgueSubDir "queues";
}; };
Natalie Control-Overrides
{ {
Options Options
{ {
...@@ -90,7 +90,7 @@ Natalie ...@@ -90,7 +90,7 @@ Natalie
ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name ComponentPosition "prefix"; // Whether the component is prepended or appended to the section name
}; };
Melanie Rm
{ {
Options Options
{ {
...@@ -102,18 +102,18 @@ Melanie ...@@ -102,18 +102,18 @@ Melanie
Bcc "removed-packages@qa.debian.org"; 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>"; StableRejector "Martin (Joey) Schulze <joey@debian.org>";
MoreInfoURL "http://people.debian.org/~joey/3.1r2/"; MoreInfoURL "http://people.debian.org/~joey/3.1r2/";
}; };
Emilie Import-LDAP-Fingerprints
{ {
LDAPDn "ou=users,dc=debian,dc=org"; LDAPDn "ou=users,dc=debian,dc=org";
LDAPServer "db.debian.org"; LDAPServer "db.debian.org";
...@@ -126,20 +126,20 @@ Emilie ...@@ -126,20 +126,20 @@ Emilie
KeyServer "wwwkeys.eu.pgp.net"; KeyServer "wwwkeys.eu.pgp.net";
}; };
Rhona Clean-Suites
{ {
// How long (in seconds) dead packages are left before being killed // How long (in seconds) dead packages are left before being killed
StayOfExecution 129600; // 1.5 days StayOfExecution 129600; // 1.5 days
QueueBuildStayOfExecution 86400; // 24 hours QueueBuildStayOfExecution 86400; // 24 hours
MorgueSubDir "rhona"; MorgueSubDir "pool";
}; };
Lisa Process-New
{ {
AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock"; AcceptedLockFile "/org/ftp.debian.org/lock/unchecked.lock";
}; };
Cindy Check-Overrides
{ {
OverrideSuites OverrideSuites
{ {
...@@ -262,7 +262,7 @@ Suite ...@@ -262,7 +262,7 @@ Suite
}; };
Announce "debian-changes@lists.debian.org"; Announce "debian-changes@lists.debian.org";
CopyChanges "dists/proposed-updates/"; CopyChanges "dists/proposed-updates/";
CopyKatie "/org/ftp.debian.org/queue/proposed-updates/"; CopyDotDak "/org/ftp.debian.org/queue/proposed-updates/";
Version "3.1-updates"; Version "3.1-updates";
Origin "Debian"; Origin "Debian";
Description "Debian 3.1 Proposed Updates - Not Released"; Description "Debian 3.1 Proposed Updates - Not Released";
...@@ -501,7 +501,7 @@ Dir ...@@ -501,7 +501,7 @@ Dir
{ {
Root "/org/ftp.debian.org/ftp/"; Root "/org/ftp.debian.org/ftp/";
Pool "/org/ftp.debian.org/ftp/pool/"; Pool "/org/ftp.debian.org/ftp/pool/";
Templates "/org/ftp.debian.org/katie/templates/"; Templates "/org/ftp.debian.org/dak/templates/";
PoolRoot "pool/"; PoolRoot "pool/";
Lists "/org/ftp.debian.org/database/dists/"; Lists "/org/ftp.debian.org/database/dists/";
Log "/org/ftp.debian.org/log/"; Log "/org/ftp.debian.org/log/";
......
config/debian/vars
浏览文件 @ 17cec6a9
...@@ -7,7 +7,7 @@ indices=$ftpdir/indices ...@@ -7,7 +7,7 @@ indices=$ftpdir/indices
archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc" archs="alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc"
scriptdir=$base/scripts scriptdir=$base/scripts
masterdir=$base/katie/ masterdir=$base/dak/
dbdir=$base/database/ dbdir=$base/database/
lockdir=$base/lock/ lockdir=$base/lock/
overridedir=$scriptdir/override overridedir=$scriptdir/override
......
config/examples/dak.conf
浏览文件 @ 17cec6a9
// Example /etc/katie/katie.conf // Example /etc/dak/dak.conf
Config Config
{ {
// FQDN hostname // FQDN hostname
auric.debian.org raff.debian.org
{ {
// Optional hostname as it appears in the database (if it differs // Optional hostname as it appears in the database (if it differs
// from the FQDN hostname). // from the FQDN hostname).
DatbaseHostname "ftp-master"; DatbaseHostname "ftp-master";
// Optional filename of katie's config file; if not present, this // Optional filename of dak's config file; if not present, this
// file is assumed to contain katie config info. // file is assumed to contain dak config info.
KatieConfig "/org/ftp.debian.org/katie/katie.conf"; DakConfig "/org/ftp.debian.org/dak/config/debian/dak.conf";
// Optional filename of apt-ftparchive's config file; if not // Optional filename of apt-ftparchive's config file; if not
// present, the file is assumed to be 'apt.conf' in the same // present, the file is assumed to be 'apt.conf' in the same
// directory as this file. // directory as this file.
AptConfig "/org/ftp.debian.org/katie/apt.conf"; AptConfig "/org/ftp.debian.org/dak/config/debian/apt.conf";
} }
} }
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或