[dak/master] Use more https://
---
config/debian/apache.conf-ftp | 6 +++---
config/debian/contributor.source | 4 ++--
config/debian/cron.daily | 2 +-
dak/cruft_report.py | 2 +-
dak/queue_report.py | 6 +++---
daklib/queue.py | 2 +-
daklib/utils.py | 4 ++--
scripts/debian/update-bugdoctxt | 4 ++--
scripts/debian/update-mailingliststxt | 2 +-
scripts/debian/update-pseudopackages.sh | 2 +-
scripts/nfu/get-w-b-db | 2 +-
tools/dsync-0.0/doc/dsync-flist.1.yo | 2 +-
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/config/debian/apache.conf-ftp b/config/debian/apache.conf-ftp
index bda84ad..3f40a45 100644
--- a/config/debian/apache.conf-ftp
+++ b/config/debian/apache.conf-ftp
@@ -10,9 +10,9 @@ Use common-debian-service-https-redirect * ftp-master.debian.org
Use common-debian-service-ssl ftp-master.debian.org
Use common-ssl-HSTS
- Redirect permanent /proposed-updates.html http://release.debian.org/proposed-updates/stable.html
- Redirect permanent /oldstable-proposed-updates.html http://release.debian.org/proposed-updates/oldstable.html
- Redirect permanent /testing/hints/transitions.yaml http://ftp-master.debian.org/transitions.yaml
+ Redirect permanent /proposed-updates.html https://release.debian.org/proposed-updates/stable.html
+ Redirect permanent /oldstable-proposed-updates.html https://release.debian.org/proposed-updates/oldstable.html
+ Redirect permanent /testing/hints/transitions.yaml https://ftp-master.debian.org/transitions.yaml
Alias /users/ /srv/ftp.debian.org/web-users/
<Directory /srv/ftp.debian.org/web-users>
diff --git a/config/debian/contributor.source b/config/debian/contributor.source
index 2d9ce6d..c801d1f 100644
--- a/config/debian/contributor.source
+++ b/config/debian/contributor.source
@@ -8,7 +8,7 @@ query:
FROM source s
JOIN fingerprint f ON s.sig_fpr = f.id
JOIN uid u ON f.uid = u.id
-url: http://qa.debian.org/developer.php?login={id}&comaint=yes
+url: https://qa.debian.org/developer.php?login={id}&comaint=yes
contribution: maint
method: postgres
@@ -18,5 +18,5 @@ query:
c.name as id
FROM source s
JOIN maintainer c ON s.changedby = c.id
-url: http://qa.debian.org/developer.php?login={id}&comaint=yes
+url: https://qa.debian.org/developer.php?login={id}&comaint=yes
diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 48360d8..1214bab 100755
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -30,7 +30,7 @@ LOGFILE="$logdir/daily_${NOW}.log"
exec >> "$LOGFILE" 2>&1
# get the latest list of wnpp bugs and their source packages
-wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
+wget -q -O${TMPFILE} https://qa.debian.org/data/bts/wnpp_rm
chmod go+r ${TMPFILE}
mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index 7dedcee..a960a68 100755
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -61,7 +61,7 @@ Check for obsolete or duplicated packages.
-m, --mode=MODE chose the MODE to run in (full, daily, bdo).
-s, --suite=SUITE check suite SUITE.
-R, --rdep-check check reverse dependencies
- -w, --wanna-build-dump where to find the copies of http://buildd.debian.org/stats/*.txt""";
+ -w, --wanna-build-dump where to find the copies of https://buildd.debian.org/stats/*.txt""";
sys.exit(exit_code)
################################################################################
diff --git a/dak/queue_report.py b/dak/queue_report.py
index d2c8d79..a4b997a 100755
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -314,12 +314,12 @@ def table_row(source, version, arch, last_mod, maint, distribution, closes, fing
(name, mail) = maint.split(":", 1)
print "<td class=\"upload-data\">"
- print "<span class=\"maintainer\">Maintainer: <a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
+ print "<span class=\"maintainer\">Maintainer: <a href=\"https://qa.debian.org/developer.php?login=%s\";>%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
(name, mail) = changedby.split(":", 1)
- print "<span class=\"changed-by\">Changed-By: <a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
+ print "<span class=\"changed-by\">Changed-By: <a href=\"https://qa.debian.org/developer.php?login=%s\";>%s</a></span><br/>" % (utils.html_escape(mail), utils.html_escape(name))
if sponsor:
- print "<span class=\"sponsor\">Sponsor: <a href=\"http://qa.debian.org/developer.php?login=%s\";>%s</a>@debian.org</span><br/>" % (utils.html_escape(sponsor), utils.html_escape(sponsor))
+ print "<span class=\"sponsor\">Sponsor: <a href=\"https://qa.debian.org/developer.php?login=%s\";>%s</a>@debian.org</span><br/>" % (utils.html_escape(sponsor), utils.html_escape(sponsor))
print "<span class=\"signature\">Fingerprint: %s</span>" % (fingerprint)
print "</td>"
diff --git a/daklib/queue.py b/daklib/queue.py
index 5a5c8f9..b869e04 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -407,7 +407,7 @@ class Upload(object):
return sponsored
def check_dm_upload(self, fpr, session):
- # Quoth the GR (http://www.debian.org/vote/2007/vote_003):
+ # Quoth the GR (https://www.debian.org/vote/2007/vote_003):
## none of the uploaded packages are NEW
## none of the packages are being taken over from other source packages
for b in self.pkg.changes["binary"].keys():
diff --git a/daklib/utils.py b/daklib/utils.py
index 94737d2..a30107b 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -566,7 +566,7 @@ def build_file_list(changes, is_a_dsc=0, field="files", hashname="md5sum"):
################################################################################
-# see http://bugs.debian.org/619131
+# see https://bugs.debian.org/619131
def build_package_list(dsc, session = None):
if not dsc.has_key("package-list"):
return {}
@@ -1557,7 +1557,7 @@ Cnf = config.Config().Cnf
def parse_wnpp_bug_file(file = "/srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm"):
"""
- Parses the wnpp bug list available at http://qa.debian.org/data/bts/wnpp_rm
+ Parses the wnpp bug list available at https://qa.debian.org/data/bts/wnpp_rm
Well, actually it parsed a local copy, but let's document the source
somewhere ;)
diff --git a/scripts/debian/update-bugdoctxt b/scripts/debian/update-bugdoctxt
index 6c4ece0..d5e6416 100755
--- a/scripts/debian/update-bugdoctxt
+++ b/scripts/debian/update-bugdoctxt
@@ -8,14 +8,14 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
export TERM=linux
destdir=$ftpdir/doc
-urlbase=http://www.debian.org/Bugs/
+urlbase=https://www.debian.org/Bugs/
cd $destdir
convert () {
src=$1; dst=$2
rm -f .new-$dst
- echo Generating $dst from http://www.debian.org/Bugs/$src ...
+ echo Generating $dst from https://www.debian.org/Bugs/$src ...
lynx -nolist -dump $urlbase$src | sed -e 's/^ *$//' | perl -00 -ne 'exit if /Back to the Debian Project homepage/; print unless ($.==1 || $.==2 || $.==3 || /^\s*Other BTS pages:$/m)' >.new-$dst
if cmp -s .new-$dst $dst ; then rm -f .new-$dst
else mv -f .new-$dst $dst
diff --git a/scripts/debian/update-mailingliststxt b/scripts/debian/update-mailingliststxt
index 950c817..f873d54 100755
--- a/scripts/debian/update-mailingliststxt
+++ b/scripts/debian/update-mailingliststxt
@@ -11,6 +11,6 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
cd $ftpdir/doc
echo Updating archive version of mailing-lists.txt
-wget -t1 -T20 -q -N http://www.debian.org/misc/mailing-lists.txt || \
+wget -t1 -T20 -q -N https://www.debian.org/misc/mailing-lists.txt || \
echo "Some error occured..."
diff --git a/scripts/debian/update-pseudopackages.sh b/scripts/debian/update-pseudopackages.sh
index 62d234c..11fdccd 100755
--- a/scripts/debian/update-pseudopackages.sh
+++ b/scripts/debian/update-pseudopackages.sh
@@ -12,5 +12,5 @@ cd ${scriptdir}/masterfiles
echo Updating archive version of pseudo-packages
for file in maintainers description; do
- wget -t2 -T20 -q -N http://bugs.debian.org/pseudopackages/pseudo-packages.${file} || echo "Some error occured with $file..."
+ wget -t2 -T20 -q -N https://bugs.debian.org/pseudopackages/pseudo-packages.${file} || echo "Some error occured with $file..."
done
diff --git a/scripts/nfu/get-w-b-db b/scripts/nfu/get-w-b-db
index 42e2c6a..eabbdc5 100755
--- a/scripts/nfu/get-w-b-db
+++ b/scripts/nfu/get-w-b-db
@@ -34,5 +34,5 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
WB_DB_DIR=${WB_DB_DIR:-${scriptdir}/nfu}
for arch in $(dak admin s-a list-arch unstable); do
- wget -q http://buildd.debian.org/stats/$arch-all.txt -O ${WB_DB_DIR}/${arch}-all.txt || echo "No w-b dump for ${arch}"
+ wget -q https://buildd.debian.org/stats/$arch-all.txt -O ${WB_DB_DIR}/${arch}-all.txt || echo "No w-b dump for ${arch}"
done
diff --git a/tools/dsync-0.0/doc/dsync-flist.1.yo b/tools/dsync-0.0/doc/dsync-flist.1.yo
index fbb268a..ca9b787 100644
--- a/tools/dsync-0.0/doc/dsync-flist.1.yo
+++ b/tools/dsync-0.0/doc/dsync-flist.1.yo
@@ -152,7 +152,7 @@ manpagediagnostics()
dsync-flist returns zero on normal operation, decimal 100 on error.
manpagebugs()
-See http://bugs.debian.org/dsync. If you wish to report a
+See https://bugs.debian.org/dsync. If you wish to report a
bug in bf(apt-get), please see bf(/usr/doc/debian/bug-reporting.txt)
or the bf(bug(1)) command.
--
1.7.10.4
Reply to: