* example apache config may be compressed littlebird_2011092200-2
authorHeiko Schlittermann (JUMPER) <hs@schlittermann.de>
Mon, 26 Sep 2011 14:31:49 +0200
changeset 110 7a0959f212e6
parent 109 1900286a9e74
child 111 8aa7b44777e1
* example apache config may be compressed * unconditionally run the install_update_db
debian/changelog
debian/littlebird-tc-core.postinst
debian/littlebird-tc-sql.postinst
--- a/debian/changelog	Fri Sep 23 12:48:12 2011 +0200
+++ b/debian/changelog	Mon Sep 26 14:31:49 2011 +0200
@@ -1,3 +1,10 @@
+littlebird (2011092200-2) stable; urgency=low
+
+  * example apache config may be compressed
+  * unconditionally run the install_update_db
+
+ -- Heiko Schlittermann <hs@schlittermann.de>  Mon, 26 Sep 2011 14:26:04 +0200
+
 littlebird (2011092200-1) stable; urgency=low
 
   * new upstream
--- a/debian/littlebird-tc-core.postinst	Fri Sep 23 12:48:12 2011 +0200
+++ b/debian/littlebird-tc-core.postinst	Mon Sep 26 14:31:49 2011 +0200
@@ -103,7 +103,10 @@
 
     # tweak the config file, but just the lines following a magical
     # debconf line
-    cp /usr/share/doc/littlebird-tc/examples/apache/littlebird-tc.conf $tmp
+    file=/usr/share/doc/littlebird-tc/examples/apache/littlebird-tc.conf
+    if test -f "$file.gz"; then zcat "$file.gz" >$tmp
+    else cp "$file" $tmp; fi
+
     perl - "$tmp" serveradmin="$serveradmin" servername="$servername" serverport="$serverport" \
 	   crt="$crt" key="$key" <<'_'
 	use strict;
--- a/debian/littlebird-tc-sql.postinst	Fri Sep 23 12:48:12 2011 +0200
+++ b/debian/littlebird-tc-sql.postinst	Mon Sep 26 14:31:49 2011 +0200
@@ -61,11 +61,10 @@
 		    GRANT ALL ON $name.* TO '$user'@'$client' IDENTIFIED BY '$pass';
 		    FLUSH PRIVILEGES;
 EOF
-		 env PATH=/usr/local/zend/bin:$PATH \
-		    /usr/share/littlebird-tc/TrustCenter/scripts/install_update_db \
-		    "$adminuser" "$adminpass"
+	fi
+	env PATH=/usr/local/zend/bin:$PATH \
+	    /usr/share/littlebird-tc/TrustCenter/scripts/install_update_db 
 
-	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)