Permalink
Browse files

Consolidate .ini files

  • Loading branch information...
1 parent 6c66f61 commit 694dadd51433f21b7ddedf4b19198f46d5616864 @rnewson rnewson committed Jun 27, 2014
Showing with 345 additions and 467 deletions.
  1. +2 −2 Makefile
  2. +5 −2 configure
  3. +2 −1 dev/run
  4. +0 −353 etc/couchdb/default.ini.tpl.in
  5. +0 −83 etc/couchdb/local.ini
  6. +253 −25 rel/overlay/etc/default.ini
  7. +83 −1 rel/overlay/etc/local.ini
View
@@ -42,8 +42,8 @@ install: dist
@cp -R rel/couchdb/* $(prefix)
@mkdir -p $(data_dir)
@chown $(user) $(data_dir)
- @mkdir -p $(view_dir)
- @chown $(user) $(view_dir)
+ @mkdir -p $(view_index_dir)
+ @chown $(user) $(view_index_dir)
@touch $(prefix)/var/log/couchdb.log
@chown $(user) $(prefix)/var/log/couchdb.log
View
@@ -12,6 +12,7 @@
# the License.
PREFIX="/opt/couchdb"
+PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
COUCHDB_USER=`whoami`
WITH_CURL="false"
@@ -97,9 +98,10 @@ cat > rel/couchdb.config << EOF
%
% The contents of this file are auto-generated by configure
%
+{package_author_name, "$PACKAGE_AUTHOR_NAME"}.
{prefix, "$PREFIX"}.
{data_dir, "$DATA"}.
-{view_dir, "$VIEW"}.
+{view_index_dir, "$VIEW"}.
{user, "$COUCHDB_USER"}.
{node_name, "-name couchdb"}.
{cluster_port, 5984}.
@@ -121,9 +123,10 @@ cat > install.mk << EOF
#
# The contents of this file are auto-generated by configure
#
+package_author_name = $PACKAGE_AUTHOR_NAME
prefix = $PREFIX
data_dir = $DATA
-view_dir = $VIEW
+view_index_dir = $VIEW
user = $COUCHDB_USER
EOF
View
@@ -110,8 +110,9 @@ def write_configs(opts):
node = "node%d" % i
args = {
"prefix": COUCHDB,
+ "package_author_name": "The Apache Software Foundation",
"data_dir": os.path.join(DEV_PATH, "lib", node, "data"),
- "view_dir": os.path.join(DEV_PATH, "lib", node, "data"),
+ "view_index_dir": os.path.join(DEV_PATH, "lib", node, "data"),
"node_name": "-name %s@127.0.0.1" % node,
"cluster_port": str((10000 * i) + 5984),
"backend_port" : str((10000 * i) + 5986)
Oops, something went wrong.

0 comments on commit 694dadd

Please sign in to comment.