tagging 0.9.1

git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/0.9.1@791289 13f79535-47bb-0310-9956-ffa450edef68

CHANGES

@@ -6,10 +6,10 @@ Version 0.9.1
 
 Build and System Integration:
 
- * Updated top-level documentation.
  * PID file directory is now created by the SysV/BSD daemon scripts.
  * Fixed the environment variables shown by the configure script.
  * Fixed the build instructions shown by the configure script.
+ * Updated ownership and permission advice in `README` for better security.
 
 Configuration and stats system:
 

README

@@ -150,12 +150,14 @@ Change the ownership of the Apache CouchDB directories by running:
     chown -R couchdb:couchdb /usr/local/etc/couchdb
     chown -R couchdb:couchdb /usr/local/var/lib/couchdb
     chown -R couchdb:couchdb /usr/local/var/log/couchdb
+    chown -R couchdb:couchdb /usr/local/var/run/couchdb
 
 Change the permission of the Apache CouchDB directories by running:
 
     chmod -R 0770 /usr/local/etc/couchdb
     chmod -R 0770 /usr/local/var/lib/couchdb
     chmod -R 0770 /usr/local/var/log/couchdb
+    chmod -R 0770 /usr/local/var/run/couchdb
 
 Running Manually
 ^^^^^^^^^^^^^^^^

configure.ac

@@ -242,7 +242,6 @@ AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
 AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
 AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
 AC_SUBST([locallibbindir], [${locallibdir}/bin])
-AC_SUBST([localerlangbindir], [${locallibdir}/erlang/bin])
 AC_SUBST([localerlanglibdir], [${locallibdir}/erlang/lib])
 
 # fix for older autotools that don't define "abs_top_YYY" by default

etc/Makefile.am

@@ -43,7 +43,6 @@ init/couchdb: init/couchdb.tpl
 	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
 	    -e "s|%bindir%|$(bindir)|" \
 	    -e "s|%sysconfdir%|$(sysconfdir)|" \
-	    -e "s|%localerlangbindir%|$(localerlangbindir)|" \
 	    -e "s|%localstaterundir%|$(localstaterundir)|" \
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@

share/www/script/test/stats.js

@@ -63,7 +63,7 @@ couchTests.stats = function(debug) {
             db.createDb();
           }
 
-          var open_databases = requestStatsTest("couchdb", "open_databases").max;
+          var open_databases = requestStatsTest("couchdb", "open_databases").current;
           T(open_databases > 0 && max >= open_databases, name);
 
           for(var i=0; i<max+1; i++) {

src/couchdb/couch_server_sup.erl

@@ -32,8 +32,12 @@ start_link(IniFiles) ->
     end.
 
 restart_core_server() ->
+    supervisor:terminate_child(couch_secondary_services, stats_aggregator),
+    supervisor:terminate_child(couch_secondary_services, stats_collector),
     supervisor:terminate_child(couch_primary_services, couch_server),
-    supervisor:restart_child(couch_primary_services, couch_server).
+    supervisor:restart_child(couch_primary_services, couch_server),
+    supervisor:restart_child(couch_secondary_services, stats_collector),
+    supervisor:restart_child(couch_secondary_services, stats_aggregator).
 
 couch_config_start_link_wrapper(IniFiles, FirstConfigPid) ->
     case is_process_alive(FirstConfigPid) of

var/Makefile.am

@@ -14,8 +14,10 @@ install-data-hook:
 	if test ! "$(mkdir_p)" = ""; then \
 	    $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \
 	    $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \
+	    $(mkdir_p) "$(DESTDIR)$(localstaterundir)"; \
 	else \
 	    echo "WARNING: You may have to create these directories by hand."; \
 	    mkdir -p "$(DESTDIR)$(localstatelibdir)"; \
 	    mkdir -p "$(DESTDIR)$(localstatelogdir)"; \
+	    mkdir -p "$(DESTDIR)$(localstaterundir)"; \
 	fi