diff options
author | varac <varacanero@zeromail.org> | 2013-08-29 19:26:36 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-08-29 19:26:36 +0200 |
commit | 32a0f9df6e80c15b3b49b8ad81b9a49ecc6f39dd (patch) | |
tree | 7d180ca7bf135523969956ed468b6224ff44ece8 /files | |
parent | 61eca267cb52252371a71926a64d7f3b7350489d (diff) | |
parent | 321d463b43dc44a4f313aa6dabef1a8bdce27122 (diff) |
Merge branch 'master' of ssh://code.leap.se/puppet_couchdb
Conflicts:
manifests/create_db.pp
Diffstat (limited to 'files')
-rw-r--r-- | files/couch-doc-diff | 2 | ||||
-rw-r--r-- | files/couch-doc-update | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/files/couch-doc-diff b/files/couch-doc-diff new file mode 100644 index 0000000..5438eab --- /dev/null +++ b/files/couch-doc-diff @@ -0,0 +1,2 @@ +#!/bin/bash +diff -w <(curl -s --netrc-file /etc/couchdb/couchdb.netrc $1 ) <(echo $2) diff --git a/files/couch-doc-update b/files/couch-doc-update index 45d9f87..f448046 100644 --- a/files/couch-doc-update +++ b/files/couch-doc-update @@ -14,7 +14,7 @@ # # USAGE # -# couch-doc-update --port <port> --db <db> --id <doc_id> --data <json> +# couch-doc-update --host <host> --db <db> --id <doc_id> --data <json> # # EXAMPLE # @@ -35,13 +35,13 @@ def main # # parse options # - @port = "5984" + @host = nil @db_name = nil @doc_id = nil @new_data = nil loop do case ARGV[0] - when '--port' then ARGV.shift; @port = ARGV.shift + when '--host' then ARGV.shift; @host = ARGV.shift when '--db' then ARGV.shift; @db_name = ARGV.shift when '--id' then ARGV.shift; @doc_id = ARGV.shift when '--data' then ARGV.shift; @new_data = ARGV.shift @@ -51,12 +51,12 @@ def main end usage("Missing required option") unless @db_name && @doc_id && @new_data @new_data = JSON.parse(@new_data) - + # # update document # begin - @db = CouchRest.database(connection_string(@db_name, @port)) + @db = CouchRest.database(connection_string(@db_name, @host)) @doc = get_document(@db, @doc_id) result = if @doc update_document(@db, @doc, @new_data) @@ -91,10 +91,10 @@ def create_document(db, doc_id, data) db.save_doc(data) end -def connection_string(database, port) +def connection_string(database, host) protocol = "http" - hostname = "127.0.0.1" - #port = "5984" + #hostname = "127.0.0.1" + port = "5984" username = "admin" password = "" @@ -102,18 +102,20 @@ def connection_string(database, port) netrc.scan(/\w+ [\w\.]+/).each do |key_value| key, value = key_value.split ' ' case key - when "machine" then hostname = value + when "machine" then host ||= value + ':' + port when "login" then username = value when "password" then password = value end end - "%s://%s:%s@%s:%s/%s" % [protocol, username, password, hostname, port, database] + host ||= '127.0.0.1:5984' + + "%s://%s:%s@%s/%s" % [protocol, username, password, host, database] end def usage(s) $stderr.puts(s) - $stderr.puts("Usage: #{File.basename($0)} --port <port> --db <db> --id <doc_id> --data <json>") + $stderr.puts("Usage: #{File.basename($0)} --host <host> --db <db> --id <doc_id> --data <json>") exit(2) end |