[med-svn] r6461 - trunk/packages/gbrowse/trunk/debian

[Charles Plessy]

Author: plessy
Date: 2011-04-05 13:24:14 +0000 (Tue, 05 Apr 2011)
New Revision: 6461

Added:
   trunk/packages/gbrowse/trunk/debian/gbrowse.links
Modified:
   trunk/packages/gbrowse/trunk/debian/postinst
Log:
Distribute the symbolic link /etc/apache2/conf.d/gbrowse directly in the package.

 - The presence of this symlink is not a problem in the absence of apache2.
 - Since it is a configuration file, user modifications are preserved anyway.


Added: trunk/packages/gbrowse/trunk/debian/gbrowse.links
===================================================================
--- trunk/packages/gbrowse/trunk/debian/gbrowse.links	                        (rev 0)
+++ trunk/packages/gbrowse/trunk/debian/gbrowse.links	2011-04-05 13:24:14 UTC (rev 6461)
@@ -0,0 +1 @@
+etc/gbrowse/apache2.conf		etc/apache2/conf.d/gbrowse

Modified: trunk/packages/gbrowse/trunk/debian/postinst
===================================================================
--- trunk/packages/gbrowse/trunk/debian/postinst	2011-04-05 00:10:14 UTC (rev 6460)
+++ trunk/packages/gbrowse/trunk/debian/postinst	2011-04-05 13:24:14 UTC (rev 6461)
@@ -23,18 +23,6 @@
 chown -R www-data:www-data /var/cache/gbrowse/sessions
 chown www-data:www-data /usr/share/gbrowse/databases/users.sqlite
 
-
-if [ -e /etc/apache2/conf.d ]
-then
- if [ -e /etc/apache2/conf.d/gbrowse ]
- then
-   echo "Apache config already set, keeping original"
- else
-   ln -s /etc/gbrowse/apache2.conf /etc/apache2/conf.d/gbrowse
-   echo "Warning, apache2 must be restarted to take into account the configuration"
- fi
-fi
-
 update-rc.d gbrowse-slave defaults
     ;;