[dak/master] Eliminate all references to apt.conf
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/debian-security/cron.daily | 3 ---
config/debian-security/cron.unchecked | 1 -
config/debian-security/dak.conf-etc | 3 +--
config/debian/cron.dinstall | 8 --------
config/debian/dak.conf-etc | 2 --
config/debian/dinstall.functions | 6 ------
config/examples/dak.conf | 5 -----
daklib/utils.py | 1 -
docs/README.first | 15 +++++++--------
9 files changed, 8 insertions(+), 36 deletions(-)
diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 3105dd6..ba4aaa6 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -95,7 +95,4 @@ while read dumpname; do
bzip2 -9fv "$dumpname"
done
-#apt-ftparchive -q clean apt.conf
-#apt-ftparchive -q clean apt.conf.buildd
-
################################################################################
diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 15e96c7..2ffec65 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -115,7 +115,6 @@ if [ "x${dopolicy}x" = "xtruex" ]; then
#dak generate-filelist
cd $configdir
$configdir/map.sh
- #apt-ftparchive generate apt.conf
dak generate-packages-sources2 -a security
dak generate-releases -a security
/srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh
diff --git a/config/debian-security/dak.conf-etc b/config/debian-security/dak.conf-etc
index e8af8d9..a817013 100644
--- a/config/debian-security/dak.conf-etc
+++ b/config/debian-security/dak.conf-etc
@@ -4,6 +4,5 @@ Config
{
DatabaseHostname "security";
DakConfig "/org/security-master.debian.org/dak/config/debian-security/dak.conf";
- AptConfig "/org/security-master.debian.org/dak/config/debian-security/apt.conf";
}
-}
\ No newline at end of file
+}
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 58f397b..e31ea80 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -478,14 +478,6 @@ GO=(
)
stage $GO
-GO=(
- FUNC="aptftpcleanup"
- TIME="apt-ftparchive cleanup"
- ARGS=""
- ERR="false"
-)
-#stage $GO
-
# we need to wait for the background processes before the end of dinstall
wait
diff --git a/config/debian/dak.conf-etc b/config/debian/dak.conf-etc
index 5336a8d..f0d96bd 100644
--- a/config/debian/dak.conf-etc
+++ b/config/debian/dak.conf-etc
@@ -5,14 +5,12 @@ Config
AllowLocalConfig "false";
DatabaseHostname "ftp-master";
DakConfig "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
- AptConfig "/srv/ftp-master.debian.org/dak/config/debian/apt.conf";
}
ries.debian.org
{
AllowLocalConfig "false";
DatabaseHostname "ftp-master";
DakConfig "/srv/ftp-master.debian.org/dak/config/debian/dak.conf";
- AptConfig "/srv/ftp-master.debian.org/dak/config/debian/apt.conf";
}
}
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 135dabd..fd546a9 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -548,12 +548,6 @@ function stats() {
dak stats pkg-nums > $webdir/pkg-nums
}
-function aptftpcleanup() {
- log "Clean up apt-ftparchive's databases"
- cd $configdir
- apt-ftparchive -q clean apt.conf
-}
-
function cleantransactions() {
log "Cleanup transaction ids older than 3 months"
cd $base/backup/
diff --git a/config/examples/dak.conf b/config/examples/dak.conf
index a47c5c0..e9d10c6 100644
--- a/config/examples/dak.conf
+++ b/config/examples/dak.conf
@@ -13,11 +13,6 @@ Config
// 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/dak/config/debian/apt.conf";
}
}
diff --git a/daklib/utils.py b/daklib/utils.py
index 084ac19..8a8c69b 100755
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -65,7 +65,6 @@ from collections import defaultdict
################################################################################
default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties
-default_apt_config = "/etc/dak/apt.conf" #: default apt config, not normally used
alias_cache = None #: Cache for email alias checks
key_uid_email_cache = {} #: Cache for email addresses from gpg key uids
diff --git a/docs/README.first b/docs/README.first
index 8ad674c..44872bc 100644
--- a/docs/README.first
+++ b/docs/README.first
@@ -5,7 +5,7 @@ o Please be careful: dak sends out lots of emails and if not
configured properly will happily send them to lots of people who
probably didn't want those emails.
-o Don't use the debian dak.conf, apt.conf, cron.* etc. as starting
+o Don't use the debian dak.conf, cron.* etc. as starting
points for your own configuration files, they're highly Debian
specific. Start from scratch and refer to the security.debian.org
config files (-security) as they're a better example for a private
@@ -93,15 +93,14 @@ o dak examine-package - invoked by 'dak process-new' to "check" NEW packages
[Very incomplete - FIXME]
-o Write your own dak.conf and apt.conf files. dak looks for those
- config files in /etc/dak/. /etc/dak/dak.conf can define
- alternative configuration files with Config::host::DakConfig and
- Config::host::AptConfig (where "host" is the fully qualified domain
- name of your machine).
+o Write your own dak.conf file. dak looks for this
+ config file in /etc/dak/. /etc/dak/dak.conf can define an
+ alternative configuration file with Config::host::DakConfig
+ (where "host" is the fully qualified domain name of your machine).
o Create a PostgreSQL database on the host given in dak.conf's DB::Host
with the name specified in DB::Name.
o Run 'dak init-dirs': this will create all directories which are specified in
- dak.conf and apt.conf.
+ dak.conf:
o If you have an existing archive:
* Run 'dak init-archive'
otherwise:
@@ -112,7 +111,7 @@ o If you have an existing archive:
* Create the following groups in postgres: ftpmaster ftpteam ftptrainee
* Run 'dak update-db' to upgrade the database schema.
* Run 'dak init-db': it will populate your database with the values from
- dak.conf and apt.conf.
+ dak.conf
* Run 'psql <DB::Name> < add_constraints.sql'.
o Copy all templates from the "templates" directory to to the directory
specified in Dir::Templates, and adapt them to your distribution.
--
1.7.2.5
Reply to: