diff options
| author | varac <varacanero@zeromail.org> | 2014-01-31 17:19:46 +0100 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2014-01-31 17:19:46 +0100 |
| commit | 37e3c260f026a66b37f54cd6092ee2c28d262247 (patch) | |
| tree | f1bca78de1e368b97332356928710257fe3c6a42 /puppet/modules/site_couchdb/files/designs/identities/Identity.json | |
| parent | e94ae94dd01cd256f89fb079cfca75a487dceed5 (diff) | |
| parent | ca1c07ad510ec24037b9fd4baad1a57b26eabedc (diff) | |
Merge branch 'develop' into 0.6
Diffstat (limited to 'puppet/modules/site_couchdb/files/designs/identities/Identity.json')
| -rw-r--r-- | puppet/modules/site_couchdb/files/designs/identities/Identity.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_couchdb/files/designs/identities/Identity.json b/puppet/modules/site_couchdb/files/designs/identities/Identity.json index 8cf8c39b..2ac092ab 100644 --- a/puppet/modules/site_couchdb/files/designs/identities/Identity.json +++ b/puppet/modules/site_couchdb/files/designs/identities/Identity.json @@ -15,7 +15,7 @@ "reduce": "_sum" }, "pgp_key_by_email": { - "map": " function(doc) {\n if (doc.type != 'Identity') {\n return;\n }\n emit(doc.address, doc.keys[\"pgp\"]);\n }\n" + "map": " function(doc) {\n if (doc.type != 'Identity') {\n return;\n }\n if (typeof doc.keys === \"object\") {\n emit(doc.address, doc.keys[\"pgp\"]);\n }\n }\n" }, "disabled": { "map": " function(doc) {\n if (doc.type != 'Identity') {\n return;\n }\n if (typeof doc.user_id === \"undefined\") {\n emit(doc._id, 1);\n }\n }\n" @@ -24,5 +24,5 @@ "map": " function(doc) {\n if (doc['type'] == 'Identity') {\n emit(doc._id, null);\n }\n }\n" } }, - "couchrest-hash": "5b0ece9d28b3025d18ea71fddf3a532f" + "couchrest-hash": "e9004d70e26770c621a9667536429a68" }
\ No newline at end of file |