diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2019-10-21 00:41:12 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-10-21 00:41:12 +0900 |
| commit | 97b6af62fe45634906ec7063edc4fcafde1b0bea (patch) | |
| tree | 55b0f689b7cd50c44ccaee224df90148089d22fb /src | |
| parent | Fix bug on iOS (diff) | |
| download | sharkey-97b6af62fe45634906ec7063edc4fcafde1b0bea.tar.gz sharkey-97b6af62fe45634906ec7063edc4fcafde1b0bea.tar.bz2 sharkey-97b6af62fe45634906ec7063edc4fcafde1b0bea.zip | |
Add ssl to elasticsearch config settings (#5527)
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/types.ts | 1 | ||||
| -rw-r--r-- | src/db/elasticsearch.ts | 2 | ||||
| -rw-r--r-- | src/remote/activitypub/kernel/move/index.ts | 0 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/config/types.ts b/src/config/types.ts index 6a3fc3092a..b96e727506 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -29,6 +29,7 @@ export type Source = { port: number; pass: string; index?: string; + ssl?: boolean; }; autoAdmin?: boolean; diff --git a/src/db/elasticsearch.ts b/src/db/elasticsearch.ts index b34ebe605c..b62e17461a 100644 --- a/src/db/elasticsearch.ts +++ b/src/db/elasticsearch.ts @@ -32,7 +32,7 @@ const index = { // Init ElasticSearch connection const client = config.elasticsearch ? new elasticsearch.Client({ - node: `http://${config.elasticsearch.host}:${config.elasticsearch.port}`, + node: `${config.elasticsearch.ssl ? 'https://' : 'http://'}${config.elasticsearch.host}:${config.elasticsearch.port}`, pingTimeout: 30000 }) : null; diff --git a/src/remote/activitypub/kernel/move/index.ts b/src/remote/activitypub/kernel/move/index.ts new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/src/remote/activitypub/kernel/move/index.ts |