Skip to content

Commit cc17768

Browse files
committed
use fielddb_debug certs
1 parent 8298ce4 commit cc17768

File tree

6 files changed

+8
-65
lines changed

6 files changed

+8
-65
lines changed

Dockerfile-couchdb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@ FROM couchdb:3.5.1
33
WORKDIR /
44

55
COPY etc/* /opt/couchdb/etc/
6-
COPY config/ssl_debug.* /opt/couchdb/etc/
6+
COPY config/fielddb_debug.* /opt/couchdb/etc/
77

88
RUN set +x; \
9-
curl -X PUT http://admin:none@127.0.0.1:5984/_users; \
10-
curl -X PUT http://admin:none@127.0.0.1:5984/_replicator; \
9+
curl -Xk PUT https://admin:none@127.0.0.1:6984/_users; \
10+
curl -Xk PUT https://admin:none@127.0.0.1:6984/_replicator; \
1111
ls -alt /opt/couchdb/etc; \
1212
cat /opt/couchdb/etc/local.ini; \
1313
ls /opt/couchdb/etc/local.d;
14-
15-
# COPY fielddb_debug.* /usr/local/etc/couchdb

config/ssl_debug.crt

Lines changed: 0 additions & 26 deletions
This file was deleted.

config/ssl_debug.key

Lines changed: 0 additions & 27 deletions
This file was deleted.

etc/local.ini

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ httpsd = {couch_httpd, start_link, [https]}
2222

2323
[ssl]
2424
enable = true
25-
; ciphers = undefined
26-
;tls_versions = undefined
2725
; secure_renegotiate = undefined
28-
cert_file = /opt/couchdb/etc/ssl_debug.crt
29-
key_file = /opt/couchdb/etc/ssl_debug.key
26+
cert_file = /opt/couchdb/etc/fielddb_debug.crt
27+
key_file = /opt/couchdb/etc/fielddb_debug.key
3028
; set to true to validate peer certificates
3129
verify_ssl_certificates = false
3230
; maximum peer certificate depth

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@
6767
"coverage": "NODE_ENV=test BUNYAN_LOG_LEVEL=FATAL nyc npm test",
6868
"lint": "eslint ",
6969
"lint:ci": "eslint .",
70-
"setup": "REPLAY=bloody SOURCE_URL=${SOURCE_URL:-https://public:none@corpusdev.example.org} mocha --timeout 20000 test/integration/install.js",
70+
"setup": "REPLAY=bloody NODE_TLS_REJECT_UNAUTHORIZED=0 SOURCE_URL=${SOURCE_URL:-https://public:none@corpusdev.example.org} mocha --timeout 20000 test/integration/install.js",
7171
"start": "node ./bin/www.js",
7272
"test": "SOURCE_URL=${SOURCE_URL:-https://public:none@corpusdev.example.org} NODE_ENV=test NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --timeout 100000 --recursive test",
7373
"test:debug": "node-debug _mocha test/integration/oauth.js",
74-
"test:deprecated": "DEBUG=${DEBUG:-lib:user} REPLAY=bloody nyc mocha --timeout 25000 test/routes/deprecated-spec.js",
74+
"test:deprecated": "DEBUG=${DEBUG:-lib:user} REPLAY=bloody NODE_TLS_REJECT_UNAUTHORIZED=0 nyc mocha --timeout 25000 test/routes/deprecated-spec.js",
7575
"test:fielddb": "NODE_ENV=localhost jasmine-node node_modules/fielddb/tests",
7676
"test:production": "ls config/production.js",
7777
"watch": "nodemon ./bin/www.js"

test/integration/install.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const originalLocalhosts = replay._localhosts;
1010
// eslint-disable-next-line no-underscore-dangle
1111
debug('replay localhosts', replay._localhosts);
1212

13-
let destination = 'http://admin:none@localhost:5984';
13+
let destination = 'https://admin:none@localhost:6984';
1414
if (!destination) {
1515
destination = url.parse(config.usersDbConnection.url);
1616
destination.auth = `${config.couchKeys.username}:${config.couchKeys.password}`;

0 commit comments

Comments
 (0)