Commit 97f40d4b authored by Holger Levsen's avatar Holger Levsen
Browse files

* update-chromium-homepage: Drop mkdir for target dir of $etcfile as its 


  created via debian/dirs.
* update-firefox-homepage: Drop mkdir for target dir of $etcfile as its
  created via debian/dirs.
* debian/dirs: Add /etc/chromium/policies/managed/.

Signed-off-by: default avatarHolger Levsen <holger@layer-acht.org>
parent a3acce4e

debian/changelog

+7 −2
Original line number Diff line number Diff line
@@ -3,13 +3,11 @@ debian-edu-config (2.10.42) UNRELEASED; urgency=medium 
  [ Mike Gabriel ]

  * update-chromium-homepage:

    - Don't complain about non-existing config file when attempting its removal.

    - Make sure the target dir of $etcfile exists.

    - Don't statically set http://www as homepage, use detected homepage

      instead. (Closes: #911790)

  * update-firefox-homepage:

    - Don't complain about non-existing config file when attempting its

      removal.

    - Make sure the target dir of $etcfile exists.



  [ Wolfgang Schweer ]

  * Improve cfengine configuration file management during upgrades:
@@ -36,6 +34,13 @@ debian-edu-config (2.10.42) UNRELEASED; urgency=medium 
    - Don't fail in case host keytab files are missing.

  * Adjust Makefile and debian/dirs to reflect the changes.



  [ Holger Levsen ]

  * update-chromium-homepage: Drop mkdir for target dir of $etcfile as its

    created via debian/dirs.

  * update-firefox-homepage: Drop mkdir for target dir of $etcfile as its

    created via debian/dirs.

  * debian/dirs: Add /etc/chromium/policies/managed/.



 -- Mike Gabriel <sunweaver@debian.org>  Wed, 24 Oct 2018 21:39:30 +0200



debian-edu-config (2.10.41) unstable; urgency=medium

debian/dirs

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ etc 
etc/apache2

etc/apache2/sites-available

etc/apache2/mods-available

etc/chromium/policies/managed

etc/courier

etc/cron.d

etc/cups

share/debian-edu-config/tools/update-chromium-homepage

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
set -e



etcfile=/etc/chromium/policies/managed/debian-edu-homepage-ldap.json

mkdir -p $(dirname $etcfile)



if [ ldap:homepage = "$1" ] ; then

    # Allow lookup script to be replaced using /etc/debian-edu/config

share/debian-edu-config/tools/update-firefox-homepage

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
set -e



etcfile=/etc/firefox-esr/debian-edu-homepage-ldap.js

mkdir -p $(dirname $etcfile)



if [ ldap:homepage = "$1" ] ; then

    # Allow lookup script to be replaced using /etc/debian-edu/config