Merge branch 'lintian.d.o-tweaks' of https://salsa.debian.org/nthykier/dsa-puppet

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index c3d62e5..96e607c 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -10,6 +10,8 @@ class roles::static_mirror {
        include apache2::ssl
        apache2::module { 'include': }
        apache2::module { 'geoip': require => [Package['libapache2-mod-geoip'], Package['geoip-database']]; }
+       apache2::module { 'deflate': }
+       apache2::module { 'filter': }
 
        file { '/usr/local/bin/static-mirror-run':
                source => 'puppet:///modules/roles/static-mirroring/static-mirror-run',

diff --git a/modules/schroot/files/setup-dchroot b/modules/schroot/files/setup-dchroot
index 99f0919..1040212 100755 (executable)
--- a/modules/schroot/files/setup-dchroot
+++ b/modules/schroot/files/setup-dchroot
@@ -386,10 +386,10 @@ chroot "$rootdir" apt-get install -y --no-install-recommends build-essential
 if [ -n "$buildd" ] ; then
     case "$suite" in
       wheezy|jessie|stretch)
-        chroot "$rootdir" apt-get install -y --no-install-recommends apt-transport-https
+        chroot "$rootdir" apt-get install -y --no-install-recommends apt-transport-https ca-certificates
         ;;
       *)
-        # Nothing to do, https support is part of the apt package
+        chroot "$rootdir" apt-get install -y --no-install-recommends ca-certificates
         ;;
     esac
 fi