1
0
forked from mirror/misskey

ElasticSearchで認証ができるように (#6158)

This commit is contained in:
MeiMei 2020-03-20 14:00:34 +09:00 committed by GitHub
parent f2f7f532a0
commit 5bbd4ae703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions

View File

@ -88,7 +88,9 @@ redis:
#elasticsearch: #elasticsearch:
# host: localhost # host: localhost
# port: 9200 # port: 9200
# pass: null # ssl: false
# user:
# pass:
# ┌───────────────┐ # ┌───────────────┐
#───┘ ID generation └─────────────────────────────────────────── #───┘ ID generation └───────────────────────────────────────────

View File

@ -27,9 +27,10 @@ export type Source = {
elasticsearch: { elasticsearch: {
host: string; host: string;
port: number; port: number;
pass: string;
index?: string;
ssl?: boolean; ssl?: boolean;
user?: string;
pass?: string;
index?: string;
}; };
proxy?: string; proxy?: string;

View File

@ -33,6 +33,10 @@ const index = {
// Init ElasticSearch connection // Init ElasticSearch connection
const client = config.elasticsearch ? new elasticsearch.Client({ const client = config.elasticsearch ? new elasticsearch.Client({
node: `${config.elasticsearch.ssl ? 'https://' : 'http://'}${config.elasticsearch.host}:${config.elasticsearch.port}`, node: `${config.elasticsearch.ssl ? 'https://' : 'http://'}${config.elasticsearch.host}:${config.elasticsearch.port}`,
auth: (config.elasticsearch.user && config.elasticsearch.pass) ? {
username: config.elasticsearch.user,
password: config.elasticsearch.pass
} : undefined,
pingTimeout: 30000 pingTimeout: 30000
}) : null; }) : null;