[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] Cope with issues found during a Buster main server upgrade

[Wolfgang Schweer]

Wolfgang Schweer pushed to branch master at Debian Edu / debian-edu-config


Commits:
dbc39927 by Wolfgang Schweer at 2021-01-18T18:25:08+01:00
Cope with issues found during a Buster main server upgrade

cf3/cf.squid: Copy additional configuration file instead of symlinking it.

debian/debian.postinst: Add code to remove symlinks that point to already
removed files (previously used for workarounds).

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


3 changed files:

- cf3/cf.squid
- debian/changelog
- debian/debian-edu-config.postinst


Changes:

=====================================
cf3/cf.squid
=====================================
@@ -8,11 +8,11 @@ files:
 
   debian.squidcache.installation::
 
-     # Add link to additional Debian Edu configuration file.
+     # Copy additional Debian Edu configuration file.
 
     "/etc/squid/conf.d/debian-edu.conf"
-      link_from => ln_s("/usr/share/debian-edu-config/squid.conf"),
-      move_obstructions => "true";
+      copy_from => local_cp("/usr/share/debian-edu-config/squid.conf"),
+      perms => mog("644","root","root");
 
   # Enforce proxy on networked installs
 


=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+debian-edu-config (2.11.45) UNRELEASED; urgency=medium
+
+  * Cope with issues found during a Buster main server upgrade.
+    - cf3/cf.squid: Copy additional configuration file instead of symlinking it.
+    - debian/debian.postinst: Add code to remove symlinks that point to already
+      removed files (previously used for workarounds).
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 18 Jan 2021 16:40:22 +0100
+
 debian-edu-config (2.11.44) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
debian/debian-edu-config.postinst
=====================================
@@ -225,6 +225,20 @@ configure)
         rm -rf /usr/share/debian-edu-config/freeradius-authorize
         rm -rf /usr/share/debian-edu-config/freeradius-clients.conf
     fi
+    # Remove symlink for additional squid file to avoid a permission pitfall.
+    # Instead, cf3/cf.squid is used to copy the file.
+    # Remove some other leftover symlinks now pointing nowhere.
+    if dpkg --compare-versions "$2" le "2.11.45" ; then
+        if [ -h /etc/squid/conf.d/debian-edu.conf ] ; then
+            rm -rf /etc/squid/conf.d/debian-edu.conf
+        fi
+        if [ -h /etc/X11/Xsession.d/55xfce4-session-debian-edu ] ; then
+            rm -rf /etc/X11/Xsession.d/55xfce4-session-debian-edu
+        fi
+        if [ -h /etc/X11/Xsession.d/99edu-firefox-nfs ] ; then
+            rm -rf /etc/X11/Xsession.d/99edu-firefox-nfs
+        fi
+    fi
     ;;
 esac
 



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

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/-/commit/dbc39927f0bb92d03abbc4df3b68ae658c90d067
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/20210118/f58debc1/attachment-0001.html>