Skip to content

Commit

Permalink
Merge pull request #162 from line-o/fix/upload-http-env
Browse files Browse the repository at this point in the history
  • Loading branch information
windauer authored Oct 21, 2023
2 parents 2d73287 + cf75c70 commit fb0daf2
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"maintainers": [],
"license": "MIT",
"dependencies": {
"@existdb/node-exist": "^5.4.1",
"@existdb/node-exist": "^5.5.0",
"bottleneck": "^2.19.5",
"chalk": "^5.2.0",
"dotenv": "^16.0.3",
Expand Down
9 changes: 6 additions & 3 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,12 @@ xst ls /db/apps --config spec/fixtures/.xstrc

#### .xstrc

A JSON formatted file where you can set not only connection options but also other settings like
`color`.
Have a look at the [example .xstrc](spec/fixtures/.xstrc).
A JSON formatted file where you can set connection options as well as other preferred settings like
`color` or `timesort`. Have a look at the [example .xstrc](spec/fixtures/.xstrc).

**NOTE:** The boolean option "secure" is deprecated. To switch between encrypted and unencrypted
connections use "protocol" instead. "secure" will continue to work for both XMLRPC and REST until
version 2.

#### .existdb.json

Expand Down
2 changes: 1 addition & 1 deletion spec/fixtures/.xstrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"rejectUnauthorized": false,
"host": "localhost",
"port": 8443,
"secure": true
"protocol": "https:"
},
"extensionsort": true,
"color": true
Expand Down
1 change: 0 additions & 1 deletion utility/configure.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ function compileConnectionOptions (server, user, pass) {
throw new Error('Unknown protocol: "' + protocol + '"!')
}

connectionOptions.secure = protocol === 'https:'
connectionOptions.host = hostname
connectionOptions.port = port
connectionOptions.protocol = protocol
Expand Down

0 comments on commit fb0daf2

Please sign in to comment.