[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] * update-chromium-homepage: Drop mkdir for target dir of $etcfile as its

[Holger Levsen]

Holger Levsen pushed to branch master at Debian Edu / debian-edu-config


Commits:
97f40d4b by Holger Levsen at 2018-10-26T14:49:51Z
* 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: Holger Levsen <holger at layer-acht.org>

- - - - -


4 changed files:

- debian/changelog
- debian/dirs
- share/debian-edu-config/tools/update-chromium-homepage
- share/debian-edu-config/tools/update-firefox-homepage


Changes:

=====================================
debian/changelog
=====================================
@@ -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 at debian.org>  Wed, 24 Oct 2018 21:39:30 +0200
 
 debian-edu-config (2.10.41) unstable; urgency=medium


=====================================
debian/dirs
=====================================
@@ -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
=====================================
@@ -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
=====================================
@@ -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



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/97f40d4bbfc4ef5e9a411c83688a43f993bb8cd5

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/97f40d4bbfc4ef5e9a411c83688a43f993bb8cd5
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181026/bdeedcda/attachment-0001.html>