From: Ivan Rako <irako@nekkar.carnet.hr>
Date: Sun, 21 Feb 2016 12:11:16 +0000 (+0100)
Subject: izmjene za apache 2.4
X-Git-Tag: debian/2%2.1.18_cn0~4
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=2ccd97494fc1251cba2dbcfac3720071b9e2a1f9;p=mailman-cn.git

izmjene za apache 2.4
---

diff --git a/debian/changelog b/debian/changelog
index 43d79df..cfc662a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 mailman-cn (2:2.1.18~cn0) stable; urgency=low
 
   * Prva verzija za jessie
+  * Prilagodbe za Apache 2.4
 
  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sun, 21 Feb 2016 12:40:56 +0100
 
diff --git a/debian/postinst b/debian/postinst
index 3cec18d..bce2f37 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -18,8 +18,14 @@ if [ ! -L /usr/lib/mailman/Mailman/mm_cfg.py -a -f /usr/lib/mailman/Mailman/mm_c
   ln -sf /etc/mailman/mm_cfg.py /usr/lib/mailman/Mailman/mm_cfg.py
 fi
 
-if [ ! -L /etc/apache2/conf.d/mailman-cn.conf -a ! -f /etc/apache2/conf.d/mailman-cn.conf ]; then
-  ln -sf /etc/mailman/apache.conf /etc/apache2/conf.d/mailman-cn.conf
+if [ ! -L /etc/apache2/conf-available/mailman-cn.conf -a ! -f /etc/apache2/conf-available/mailman-cn.conf ]; then
+  ln -sf /etc/mailman/apache.conf /etc/apache2/conf-available/mailman-cn.conf
+fi
+
+a2enconf mailman-cn
+
+if [ -L /etc/apache2/conf.d/mailman-cn.conf ]; then
+  rm -f /etc/apache2/conf.d/mailman-cn.conf
 fi
 
 hostname="`hostname --fqdn`"