[debian-edu-commits] debian-edu/ 01/01: Drop ftp source from our cfengine rules to update apt sources.list. It is more robust to only use http.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 89ad999e744b3e90a9e8152682c66740b854209a
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Oct 3 14:40:04 2014 +0200

    Drop ftp source from our cfengine rules to update apt sources.list. It is more robust to only use http.
---
 cf/cf.apt        | 4 ----
 debian/changelog | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cf/cf.apt b/cf/cf.apt
index c335107..ec0b8f3 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -9,8 +9,6 @@ editfiles:
       AppendIfNoSuchLine "### Use (by uncommenting) either http or ftp, NOT both"
       AppendIfNoSuchLine "### http based apt source: ----------------"
       AppendIfNoSuchLine "deb http://http.debian.net/debian jessie main contrib non-free"
-      AppendIfNoSuchLine "### ftp based apt source: -----------------"
-      AppendIfNoSuchLine "# deb ftp://ftp.debian.org/debian/ jessie main contrib non-free"
     }
 
   debian.ltspserver::
@@ -22,8 +20,6 @@ editfiles:
       AppendIfNoSuchLine "### Use (by uncommenting) either http or ftp, NOT both"
       AppendIfNoSuchLine "### http based apt source: ----------------"
       AppendIfNoSuchLine "deb http://http.debian.net/debian jessie main contrib non-free"
-      AppendIfNoSuchLine "### ftp based apt source: -----------------"
-      AppendIfNoSuchLine "#deb ftp://ftp.debian.org/debian/ jessie main contrib non-free"
     }
 
 shellcommands:
diff --git a/debian/changelog b/debian/changelog
index 75ff48e..7812bce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debian-edu-config (1.807) UNRELEASED; urgency=high
     the squid package, to make upgrades easier and avoid a conffile
     question if the defaults change.
   * Adjust squid-update-cachedir to work with squid3.
+  * Drop ftp source from our cfengine rules to update apt sources.list.
+    It is more robust to only use http.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 02 Oct 2014 21:40:29 +0200
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git