[Debian-l10n-commits] r2799 - in /pootle/trunk/debian: TODO pootle.install pootle.postinst pootle.postrm

[themill-guest at users.alioth.debian.org]

Author: themill-guest
Date: Wed Nov 16 16:09:46 2011
New Revision: 2799

URL: http://svn.debian.org/wsvn/?sc=1&rev=2799
Log:
Handle wsgi/apache config using ucf

Modified:
    pootle/trunk/debian/TODO
    pootle/trunk/debian/pootle.install
    pootle/trunk/debian/pootle.postinst
    pootle/trunk/debian/pootle.postrm

Modified: pootle/trunk/debian/TODO
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/TODO?rev=2799&op=diff
==============================================================================
--- pootle/trunk/debian/TODO (original)
+++ pootle/trunk/debian/TODO Wed Nov 16 16:09:46 2011
@@ -25,8 +25,6 @@
 
 * implement a lighttpd configuration
 
-* Handle /etc/apache2/conf.d/pootle.conf with ucf
-
 lintian
 =======
 

Modified: pootle/trunk/debian/pootle.install
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.install?rev=2799&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.install (original)
+++ pootle/trunk/debian/pootle.install Wed Nov 16 16:09:46 2011
@@ -1,4 +1,4 @@
 debian/dbconfig.template /usr/share/doc/pootle/
-debian/apache2.conf /usr/share/pootle/conf/
+debian/apache2.conf /usr/share/pootle/
 debian/mysql /usr/share/dbconfig-common/data/pootle/install/
 debian/localsettings.py.default.md5sum /usr/share/pootle/

Modified: pootle/trunk/debian/pootle.postinst
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.postinst?rev=2799&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.postinst (original)
+++ pootle/trunk/debian/pootle.postinst Wed Nov 16 16:09:46 2011
@@ -114,7 +114,8 @@
 
 apache2_install() {
     mkdir -p /etc/apache2/conf.d
-    cp /usr/share/pootle/conf/apache2.conf /etc/apache2/conf.d/pootle.conf
+    ucf --debconf-ok /usr/share/pootle/apache2.conf /etc/apache2/conf.d/pootle.conf
+    ucfr pootle /etc/apache2/conf.d/pootle.conf
     reload_www_server apache2
 }
 

Modified: pootle/trunk/debian/pootle.postrm
URL: http://svn.debian.org/wsvn/pootle/trunk/debian/pootle.postrm?rev=2799&op=diff
==============================================================================
--- pootle/trunk/debian/pootle.postrm (original)
+++ pootle/trunk/debian/pootle.postrm Wed Nov 16 16:09:46 2011
@@ -14,7 +14,8 @@
 if [ "$1" = "purge" ]; then
         rm -f /etc/pootle/debian_config.py
         for f in /etc/pootle/dbconfig.py \
-                  /etc/pootle/localsettings.py
+                  /etc/pootle/localsettings.py \
+                  /etc/apache2/conf.d/pootle.conf
         do
             rm -f "$f"
             if which ucf >/dev/null 2>&1; then