[med-svn] r20068 - trunk/packages/dcmtk/trunk/debian

[Andreas Tille]

Author: tille
Date: 2015-09-13 18:39:24 +0000 (Sun, 13 Sep 2015)
New Revision: 20068

Modified:
   trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst
   trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm
Log:
Fix dcmtk-www


Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst	2015-09-13 18:38:47 UTC (rev 20067)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postinst	2015-09-13 18:39:24 UTC (rev 20068)
@@ -5,8 +5,8 @@
 
 apache_install() {
         webserver=apache2
-        if [ -d /etc/$webserver/conf-available ] && [ ! -e /etc/$webserver/conf-available/${pkg} ]; then
-                ln -s ../../${pkg}/apache.conf /etc/$webserver/conf-available/${pkg}
+        if [ -d /etc/$webserver/conf-available ] && [ ! -e /etc/$webserver/conf-available/${pkg}.conf ]; then
+                ln -s ../../${pkg}/apache.conf /etc/$webserver/conf-available/${pkg}.conf
 	        # Restart webserver to register configuration for dcmtk if config is considered to be OK
         	if ${webserver}ctl configtest 2>/dev/null; then
 	            if which invoke-rc.d ; then

Modified: trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm
===================================================================
--- trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm	2015-09-13 18:38:47 UTC (rev 20067)
+++ trunk/packages/dcmtk/trunk/debian/dcmtk-www.postrm	2015-09-13 18:39:24 UTC (rev 20068)
@@ -3,9 +3,16 @@
 
 set -e
 
+pkg=dcmtk
+
 case "$1" in
     purge|remove|upgrade)
         # Restart Apache to register configuration for dcmtk
+        if [ "$1" = "purge" ] ; then
+            if [ -L /etc/apache2/conf-available/${pkg}.conf ] ; then
+                rm -f /etc/apache2/conf-available/${pkg}.conf
+            fi
+        fi
         if apache2ctl configtest 2>/dev/null; then
             if which invoke-rc.d ; then
                 invoke-rc.d apache2 reload 3>/dev/null || true