[Pkg-erlang-commits] r1274 - couchdb/trunk/debian

[sbisbee-guest at alioth.debian.org]

Author: sbisbee-guest
Date: 2010-08-02 05:06:01 +0000 (Mon, 02 Aug 2010)
New Revision: 1274

Modified:
   couchdb/trunk/debian/changelog
   couchdb/trunk/debian/couchdb-bin.postinst
   couchdb/trunk/debian/couchdb.postinst
   couchdb/trunk/debian/couchdb.postrm
Log:
Moving /var/log/couchdb creation to couchdb-bin, else running couchdb with just couchdb-bin crashed

Modified: couchdb/trunk/debian/changelog
===================================================================
--- couchdb/trunk/debian/changelog	2010-08-01 12:27:23 UTC (rev 1273)
+++ couchdb/trunk/debian/changelog	2010-08-02 05:06:01 UTC (rev 1274)
@@ -8,6 +8,8 @@
     file (displays a note and fails).
   * Updated debian/patches/init.patch, added force-reload functionality to the
     init file (alias for restart). 
+  * Updated debian/couchdb.postinst and debian/couchdb-bin.postinst, moving log 
+    directory work to couchdb-bin to prevent crashing on start
 
   [ Elliot Murphy ]
   * split into couchdb and couchdb-bin (closes: #573061)
@@ -16,7 +18,7 @@
     users and auth caches after final user is removed.
   * Drop debian/patches/couch_app.erl (included upstream now).
 
- -- Elliot Murphy <elliot at ubuntu.com>  Fri, 16 Jul 2010 00:34:01 -0400
+ -- Sam Bisbee <sbisbee at computervip.com>  Mon, 02 Aug 2010 01:03:09 -0400
 
 couchdb (0.11.0-2) unstable; urgency=low
 

Modified: couchdb/trunk/debian/couchdb-bin.postinst
===================================================================
--- couchdb/trunk/debian/couchdb-bin.postinst	2010-08-01 12:27:23 UTC (rev 1273)
+++ couchdb/trunk/debian/couchdb-bin.postinst	2010-08-02 05:06:01 UTC (rev 1274)
@@ -21,10 +21,15 @@
             echo "The couchdb administrative group must not be root." >&2
             false
         fi
+
         chown -R couchdb:couchdb /etc/couchdb
         chmod -R 0770 /etc/couchdb
         chmod 0664 /etc/couchdb/default.ini
         chmod 0664 /etc/couchdb/local.ini
+
+        mkdir -p /var/log/couchdb
+        chown -R couchdb:couchdb /var/log/couchdb
+        chmod 0770 /var/log/couchdb
         ;;
 esac
 

Modified: couchdb/trunk/debian/couchdb.postinst
===================================================================
--- couchdb/trunk/debian/couchdb.postinst	2010-08-01 12:27:23 UTC (rev 1273)
+++ couchdb/trunk/debian/couchdb.postinst	2010-08-02 05:06:01 UTC (rev 1274)
@@ -11,11 +11,8 @@
 case $1 in
     configure)
         mkdir -p /var/lib/couchdb/"${VERSION}"
-        mkdir -p /var/log/couchdb
         chown -R couchdb:couchdb /var/lib/couchdb
-        chown -R couchdb:couchdb /var/log/couchdb
         chmod 0770 /var/lib/couchdb /var/lib/couchdb/"${VERSION}"
-        chmod 0770 /var/log/couchdb
 		;;
 esac
 

Modified: couchdb/trunk/debian/couchdb.postrm
===================================================================
--- couchdb/trunk/debian/couchdb.postrm	2010-08-01 12:27:23 UTC (rev 1273)
+++ couchdb/trunk/debian/couchdb.postrm	2010-08-02 05:06:01 UTC (rev 1274)
@@ -16,9 +16,6 @@
         if test -d "/var/lib/couchdb"; then
             rmdir --ignore-fail-on-non-empty "/var/lib/couchdb" || true
         fi
-        if test -d "/var/log/couchdb"; then
-            rm -r -f "/var/log/couchdb"
-        fi
         if test -d "/var/run/couchdb"; then
             rmdir --ignore-fail-on-non-empty "/var/run/couchdb" || true
         fi