From 93930972c870b53ac24e4d6d27649e9979950ecb Mon Sep 17 00:00:00 2001 From: root Date: Wed, 30 Oct 2013 22:30:37 +0000 Subject: renamed: couchdb-scripts-defaults.conf -> couchdb_scripts_defaults.conf --- README.md | 2 +- couchdb-scripts-defaults.conf | 19 ------------------- couchdb_delete_all_dbs.sh | 2 +- couchdb_dumpall.sh | 2 +- couchdb_listall.sh | 2 +- couchdb_recreate_dbs.sh | 2 +- couchdb_restoreall.sh | 2 +- couchdb_scripts_defaults.conf | 19 +++++++++++++++++++ 8 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 couchdb-scripts-defaults.conf create mode 100644 couchdb_scripts_defaults.conf diff --git a/README.md b/README.md index 5c39a9b..8552973 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Examples Use couchdb functions on command line ------------------------------------- - . couchdb-scripts-defaults.conf + . couchdb_scripts_defaults.conf . couchdb_functions # get all db names diff --git a/couchdb-scripts-defaults.conf b/couchdb-scripts-defaults.conf deleted file mode 100644 index e7ad685..0000000 --- a/couchdb-scripts-defaults.conf +++ /dev/null @@ -1,19 +0,0 @@ -NETRC_FILE='/etc/couchdb/couchdb.netrc' - -OPTS="--netrc-file $NETRC_FILE -HContent-Type:application/json -s" -CURL="curl $OPTS " - -# wget needs --auth-no-challenge, see bugs.debian.org/600169 -WGET_OPTS='--auth-no-challenge -q -O -' - - -URL='http://127.0.0.1:5984' -BACKEND_URL='http://127.0.0.1:5986' -DUMPDIR='/var/backups/couchdb' -TMPPREFIX='tmp' - -# replication uses -user=`cat /etc/couchdb/couchdb.netrc | cut -d ' ' -f 4` -pw=`cat /etc/couchdb/couchdb.netrc | cut -d ' ' -f 6` -auth_url="http://${user}:${pw}@127.0.0.1:5984" - diff --git a/couchdb_delete_all_dbs.sh b/couchdb_delete_all_dbs.sh index 07b7413..6a9a7b5 100755 --- a/couchdb_delete_all_dbs.sh +++ b/couchdb_delete_all_dbs.sh @@ -1,6 +1,6 @@ #!/bin/bash -. couchdb-scripts-defaults.conf +. couchdb_scripts_defaults.conf . couchdb_functions diff --git a/couchdb_dumpall.sh b/couchdb_dumpall.sh index 80f15ed..e5217e6 100755 --- a/couchdb_dumpall.sh +++ b/couchdb_dumpall.sh @@ -1,6 +1,6 @@ #!/bin/bash -. couchdb-scripts-defaults.conf +. couchdb_scripts_defaults.conf . couchdb_functions # create backupdir diff --git a/couchdb_listall.sh b/couchdb_listall.sh index 5bd7115..699e345 100755 --- a/couchdb_listall.sh +++ b/couchdb_listall.sh @@ -1,6 +1,6 @@ #!/bin/bash -. couchdb-scripts-defaults.conf +. couchdb_scripts_defaults.conf . couchdb_functions diff --git a/couchdb_recreate_dbs.sh b/couchdb_recreate_dbs.sh index c40fd1e..5e572d1 100755 --- a/couchdb_recreate_dbs.sh +++ b/couchdb_recreate_dbs.sh @@ -14,7 +14,7 @@ # concurrent replication might cause stalled tasks, see #https://leap.se/code/issues/3506, # so we use slower, sequential replication here -. couchdb-scripts-defaults.conf +. couchdb_scripts_defaults.conf . couchdb_functions diff --git a/couchdb_restoreall.sh b/couchdb_restoreall.sh index 20cd6b0..4bc6719 100755 --- a/couchdb_restoreall.sh +++ b/couchdb_restoreall.sh @@ -4,7 +4,7 @@ # python-couchdb =< 0.8-1 needs to be patched, see # http://code.google.com/p/couchdb-python/issues/detail?id=194 -. couchdb-scripts-defaults.conf +. couchdb_scripts_defaults.conf . couchdb_functions dbs="`get_dbs $URL`" diff --git a/couchdb_scripts_defaults.conf b/couchdb_scripts_defaults.conf new file mode 100644 index 0000000..e7ad685 --- /dev/null +++ b/couchdb_scripts_defaults.conf @@ -0,0 +1,19 @@ +NETRC_FILE='/etc/couchdb/couchdb.netrc' + +OPTS="--netrc-file $NETRC_FILE -HContent-Type:application/json -s" +CURL="curl $OPTS " + +# wget needs --auth-no-challenge, see bugs.debian.org/600169 +WGET_OPTS='--auth-no-challenge -q -O -' + + +URL='http://127.0.0.1:5984' +BACKEND_URL='http://127.0.0.1:5986' +DUMPDIR='/var/backups/couchdb' +TMPPREFIX='tmp' + +# replication uses +user=`cat /etc/couchdb/couchdb.netrc | cut -d ' ' -f 4` +pw=`cat /etc/couchdb/couchdb.netrc | cut -d ' ' -f 6` +auth_url="http://${user}:${pw}@127.0.0.1:5984" + -- cgit v1.2.3