From 5ebbdaff470a44026442a0c5f1af10fd5c7ed326 Mon Sep 17 00:00:00 2001 From: undefined Date: Tue, 15 Jun 2021 14:20:36 +0800 Subject: [PATCH] =?UTF-8?q?install:=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E6=AC=A1?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=84=9A=E6=9C=AC=E5=AF=BC=E8=87=B4MINIO=5FA?= =?UTF-8?q?CCESS=5FKEY=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install/install.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/install/install.js b/install/install.js index 0bc90507e..ccc1aaa73 100644 --- a/install/install.js +++ b/install/install.js @@ -3,8 +3,8 @@ /// log.info('开始运行 HydroOJ 安装工具 / Starting HydroOJ installation tool'); -let MINIO_ACCESS_KEY = randomstring(32); -let MINIO_SECRET_KEY = randomstring(32); +const MINIO_ACCESS_KEY = randomstring(32); +const MINIO_SECRET_KEY = randomstring(32); let DATABASE_PASSWORD = randomstring(32); let retry = 0; @@ -154,7 +154,6 @@ apt-get -qq update && apt-get -q install -y mongodb-org`, { retry: true }], operations: [ [`curl -fSL ${_MINIO_[retry % _MINIO_.length]} -o /usr/bin/minio`, { retry: true }], 'chmod +x /usr/bin/minio', - `echo "MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}\nMINIO_SECRET_KEY=${MINIO_SECRET_KEY}" >/root/.hydro/env`, ], }, { @@ -188,10 +187,7 @@ apt-get -qq update && apt-get -q install -y mongodb-org`, { retry: true }], { init: '正在启动 / Starting', operations: [ - () => { - [MINIO_ACCESS_KEY, MINIO_SECRET_KEY] = fs.readfile('/root/.hydro/env') - .split('\n').filter((i) => i.trim()).map((i) => i.split('=')[1].trim()); - }, + `echo "MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY}\nMINIO_SECRET_KEY=${MINIO_SECRET_KEY}" >/root/.hydro/env`, `pm2 start "MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY} MINIO_SECRET_KEY=${MINIO_SECRET_KEY} minio server /data/file" --name minio`, 'pm2 start "mongod --auth --bind_ip 0.0.0.0" --name mongodb', () => sleep(1000), @@ -205,8 +201,6 @@ apt-get -qq update && apt-get -q install -y mongodb-org`, { retry: true }], init: '安装完成 / Install done', operations: [ () => { - [MINIO_ACCESS_KEY, MINIO_SECRET_KEY] = fs.readfile('/root/.hydro/env') - .split('\n').filter((i) => i.trim()).map((i) => i.split('=')[1].trim()); DATABASE_PASSWORD = loadconfig('/root/.hydro/config.json').password; }, () => log.info('请重启终端并切换到 root 用户执行其他操作'),