From 31712772524dc25dc3ba8113a2ac3db981e2de32 Mon Sep 17 00:00:00 2001 From: masnn Date: Sat, 10 Apr 2021 05:00:03 +0000 Subject: [PATCH] sonic: use ::1 as default target --- packages/hydrooj/src/entry/common.ts | 4 ++-- packages/sonic/service.ts | 4 ++-- packages/sonic/setting.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/hydrooj/src/entry/common.ts b/packages/hydrooj/src/entry/common.ts index 9d2c3a56d..2b12037d8 100644 --- a/packages/hydrooj/src/entry/common.ts +++ b/packages/hydrooj/src/entry/common.ts @@ -98,9 +98,9 @@ export async function setting(pending: string[], fail: string[], modelSetting: t if (!fs.existsSync(p)) p = path.resolve(i, 'settings.yaml'); if (fs.existsSync(p) && !fail.includes(i)) { try { - const cfg: any = yaml.load(fs.readFileSync(p).toString()); + const cfg: any = yaml.load(fs.readFileSync(p, 'utf-8')); for (const key in cfg) { - let val = cfg[key].default; + let val = cfg[key].default || cfg[key].value; if (typeof val === 'string') { val = val .replace(/\$TEMP/g, os.tmpdir()) diff --git a/packages/sonic/service.ts b/packages/sonic/service.ts index bce3d6a10..122a045e6 100644 --- a/packages/sonic/service.ts +++ b/packages/sonic/service.ts @@ -47,9 +47,9 @@ class SonicService implements BaseService { async start() { const [host, port, auth] = system.getMany(['sonic.host', 'sonic.port', 'sonic.auth']); const cfg = { - host: host || '127.0.0.1', + host: host || '::1', port: port || 1491, - auth: auth || 'sonic-passwd', + auth: auth || '', }; this.search = new Search(cfg); this.ingest = new Ingest(cfg); diff --git a/packages/sonic/setting.yaml b/packages/sonic/setting.yaml index 956b4ed9c..f74a1ff8a 100644 --- a/packages/sonic/setting.yaml +++ b/packages/sonic/setting.yaml @@ -1,5 +1,5 @@ host: - value: localhost + value: ::1 port: type: number value: 1491