Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: move storage setting to ~/.hydro/env

Browse Source
This commit is contained in:
undefined committed 2021-09-17 18:51:36 +08:00
1 parent 12f2a4f2bb
commit e6f933a531
4 files changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.36.2", "version": "2.36.4",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
packages/hydrooj/src/service/storage.ts
+1 -1
View File
@@ -99,7 +99,7 @@ class StorageService {
endPointForUser, endPointForUser,
endPointForJudge, endPointForJudge,
}; };
if (process.env.MINIO_ACCESS_KEY && process.env.MINIO_SECRET_KEY) { if (process.env.MINIO_ACCESS_KEY) {
logger.info('Using MinIO key from environment variables'); logger.info('Using MinIO key from environment variables');
this.opts.accessKey = process.env.MINIO_ACCESS_KEY; this.opts.accessKey = process.env.MINIO_ACCESS_KEY;
this.opts.secretKey = process.env.MINIO_SECRET_KEY; this.opts.secretKey = process.env.MINIO_SECRET_KEY;
packages/ui-default/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "@hydrooj/ui-default", "name": "@hydrooj/ui-default",
"version": "4.21.6", "version": "4.21.7",
"author": "undefined <i@undefined.moe>", "author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "hydro.js", "main": "hydro.js",
packages/ui-default/templates/partials/setting.html
+3 -2
View File
@@ -8,14 +8,15 @@
{% if not setting.flag|bitand(model.setting.FLAG_HIDDEN) %} {% if not setting.flag|bitand(model.setting.FLAG_HIDDEN) %}
{% set secret = setting.flag|bitand(model.setting.FLAG_SECRET) != 0 %} {% set secret = setting.flag|bitand(model.setting.FLAG_SECRET) != 0 %}
{% if setting.type == 'text' or setting.type == 'password' or setting.type == 'number' or setting.type == 'float' %} {% if setting.type == 'text' or setting.type == 'password' or setting.type == 'number' or setting.type == 'float' %}
{% set isFileConfig = (setting.name === 'file.accessKey' or setting.name === 'file.secretKey') and process.env.MINIO_ACCESS_KEY %}
{{ form.form_text({ {{ form.form_text({
type:setting.type, type:setting.type,
label:setting.name, label:setting.name,
help_text:setting.desc, help_text:setting.desc,
name:setting.key, name:setting.key,
value:'' if secret else (current[setting.key]|default(setting.value)), value:'' if (secret or isFileConfig) else (current[setting.key]|default(setting.value)),
disabled:setting.disabled, disabled:setting.disabled,
placeholder:_('(Not changed)') if secret else '' placeholder:'Please edit in ~/.hydro/env instead' if isFileConfig else (_('(Not changed)') if secret else '')
}) }} }) }}
{% elif setting.type == 'select' %} {% elif setting.type == 'select' %}
{{ form.form_select({ {{ form.form_select({