@@ -1,3 +1,9 @@

+irony (0.2.8-0~kolab4) unstable; urgency=low

+

+  * renamed apache config from sitename to sitename.conf

+

+ -- Daniel Hoffend <dh@dotlan.net>  Sun, 14 Sep 2014 00:50:12 +0200

+

 irony (0.2.8-0~kolab3) unstable; urgency=low

   * fixed disabling site on package removal

​

@@ -1,4 +1,4 @@

-etc/iRony/apache.conf etc/apache2/sites-available/iRony

+etc/iRony/apache.conf etc/apache2/sites-available/iRony.conf

 etc/iRony/dav.inc.php usr/share/iRony/config/dav.inc.php

 etc/roundcubemail/defaults.inc.php usr/share/iRony/config/defaults.inc.php

 etc/roundcubemail/config.inc.php usr/share/iRony/config/config.inc.php

​

@@ -28,8 +28,8 @@

     configure)

         fixperms

         a2enmod rewrite >/dev/null 2>&1 || true

-        if [ -e "/etc/apache2/sites-available/iRony" -a ! -e "/etc/apache2/sites-enabled/iRony" ]; then

-            a2ensite iRony

+        if [ -e "/etc/apache2/sites-available/iRony.conf" -a ! -e "/etc/apache2/sites-enabled/iRony.conf" ]; then

+            a2ensite iRony.conf

         fi

         reload_apache reload

     ;;

​

@@ -0,0 +1,30 @@

+#!/bin/sh

+

+set -e

+

+reload_apache()

+{

+    if apache2ctl configtest 2>/dev/null; then

+        invoke-rc.d apache2 $1 || true

+    else

+        echo "Your apache2 configuration is broken, so we're not restarting it for you."

+    fi

+}

+

+

+case "$1" in

+    upgrade|install)

+        # rename old apache/http sites rom sitename to sitename.conf

+        if [ -e /etc/apache2/sites-available/iRony -a ! -e /etc/apache2/sites-available/iRony.conf ]; then

+            if [ -h /etc/apache2/sites-enabled/iRony ]; then

+                a2dissite iRony

+            fi

+            mv /etc/apache2/sites-available/iRony /etc/apache2/sites-available/iRony.conf

+            a2ensite iRony.conf

+            reload_apache

+        fi

+    ;;

+esac

+

+exit 0

+

​

@@ -2,7 +2,7 @@

 Source: irony

 Binary: irony

 Architecture: all

-Version: 0.2.8-0~kolab3

+Version: 0.2.8-0~kolab4

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

 Homepage: http://www.kolab.org/

​