Eliminate all references to apt.conf

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 3105dd69bd5014354e623a92057321f8d7a5a576..ba4aaa6235b44edd048f54bb97e4c6a8198410cf 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -95,7 +95,4 @@ while read dumpname; do
     bzip2 -9fv "$dumpname"
 done
 
     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 15e96c739388e8e85acfc94b0cee8cd21e7d0c13..2ffec6509ec8cbf56b26c568d6e53a5573275bae 100755 (executable)
--- 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
     #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
     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 e8af8d981b3d39c7932931893052d14c5b2a475a..a817013b37176663d9882ea16c0081babee7cffa 100644 (file)
--- 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";
   {
     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 58f397b4654f3f1f719f669b3b7bda32ebbe3bc5..e31ea80ed9aeaa004a25daf99fa4685461ad33be 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -478,14 +478,6 @@ GO=(
 )
 stage $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
 
 # 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 5336a8df0aaca8774b1a30ff754512c444507cd8..f0d96bdcc5865f1a89c92809b66c1a5f1ced54f5 100644 (file)
--- 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";
     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";
   }
   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 135dabdd1b9518609b212d8adae34fbd40ee2cd7..fd546a902fa8b226a1ee267dc9668e94b60c5d9d 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -548,12 +548,6 @@ function stats() {
     dak stats pkg-nums > $webdir/pkg-nums
 }
 
     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/
 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 a47c5c03c917f417c9b080c7ac4a325f9c4205e7..e9d10c68d4b6a182182fd434b2082a2637f7eda7 100644 (file)
--- 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 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 084ac195bad036266d869de61b2933e752562612..8a8c69b8425960a8e8ab0da685645de1fd7decbf 100755 (executable)
--- 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_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
 
 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 8ad674c352f448f161c90b4c803b813f3133b5c4..44872bccf982f438c750ba7ac277df5a4d66524e 100644 (file)
--- 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.
 
   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
   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]
 
 
 [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
 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:
 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
    * 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.
    * 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.