From 63afd69162cb231858e5d2badfa6bd660df3b9a4 Mon Sep 17 00:00:00 2001 From: anlicheng <244108715@qq.com> Date: Sat, 30 May 2026 18:12:01 +0800 Subject: [PATCH] fix config --- config/{sys.config => sys.config.src} | 18 +++++++++--------- config/{vm.args => vm.args.src} | 2 +- env.file | 23 +++++++++++++++++++++++ rebar.config | 15 +++------------ 4 files changed, 36 insertions(+), 22 deletions(-) rename config/{sys.config => sys.config.src} (73%) rename config/{vm.args => vm.args.src} (78%) create mode 100644 env.file diff --git a/config/sys.config b/config/sys.config.src similarity index 73% rename from config/sys.config rename to config/sys.config.src index 33b3bb7..831d49b 100644 --- a/config/sys.config +++ b/config/sys.config.src @@ -1,6 +1,6 @@ [ {efka, [ - {dets_dir, "/var/lib/efka/dets/"}, + {dets_dir, "${EFKA_DETS_DIR}"}, {websocket_server, [ {port, 18080}, @@ -10,7 +10,7 @@ ]}, {iot_server, [ - {host, "localhost"}, + {host, "${EFKA_IOT_HOST}"}, {tls_port, 1443}, {udp_port, 18080} ]}, @@ -20,14 +20,14 @@ ]}, {auth, [ - {uuid, "qbxmjyzrkpntfgswaevodhluicqzxplkm"}, - {token, "zpxlkvmqwnbghytrujsdieofazxcvbnm"} + {uuid, "${EFKA_AUTH_UUID}"}, + {token, "${EFKA_AUTH_TOKEN}"} ]} ]}, {docker, [ - {root_dir, "/var/lib/efka/docker/"} + {root_dir, "${EFKA_DOCKER_ROOT_DIR}"} ]}, %% 系统日志配置,使用 OTP logger @@ -46,10 +46,10 @@ #{ level => debug, config => #{ - file => "log/debug.log", - max_no_files => 10, - max_no_bytes => 524288000 - }, + file => "log/debug.log", + max_no_files => 10, + max_no_bytes => 524288000 + }, formatter => {logger_formatter, #{template => [time, " [", level, "] ", msg, "\n"]}} } } diff --git a/config/vm.args b/config/vm.args.src similarity index 78% rename from config/vm.args rename to config/vm.args.src index 06d9f87..33f6e07 100644 --- a/config/vm.args +++ b/config/vm.args.src @@ -3,7 +3,7 @@ -setcookie efka_cookie -kernel start_group false --mnesia dir '"/var/lib/efka/mnesia"' +-mnesia dir '"${EFKA_MNESIA_DIR}"' -mnesia dump_log_write_threshold 5000 -mnesia dc_dump_limit 40 diff --git a/env.file b/env.file new file mode 100644 index 0000000..7adc547 --- /dev/null +++ b/env.file @@ -0,0 +1,23 @@ +[dev] +EFKA_DETS_DIR="/usr/local/var/lib/efka/dets/" +EFKA_IOT_HOST="localhost" +EFKA_AUTH_UUID="qbxmjyzrkpntfgswaevodhluicqzxplkm" +EFKA_AUTH_TOKEN="zpxlkvmqwnbghytrujsdieofazxcvbnm" +EFKA_DOCKER_ROOT_DIR="/usr/local/var/lib/efka/docker/" +EFKA_MNESIA_DIR="/usr/local/var/lib/efka/mnesia" + +[test] +EFKA_DETS_DIR="/usr/local/var/lib/efka/dets/" +EFKA_IOT_HOST="localhost" +EFKA_AUTH_UUID="qbxmjyzrkpntfgswaevodhluicqzxplkm" +EFKA_AUTH_TOKEN="zpxlkvmqwnbghytrujsdieofazxcvbnm" +EFKA_DOCKER_ROOT_DIR="/usr/local/var/lib/efka/docker/" +EFKA_MNESIA_DIR="/usr/local/var/lib/efka/mnesia" + +[prod] +EFKA_DETS_DIR="/var/lib/efka/dets/" +EFKA_IOT_HOST="localhost" +EFKA_AUTH_UUID="qbxmjyzrkpntfgswaevodhluicqzxplkm" +EFKA_AUTH_TOKEN="zpxlkvmqwnbghytrujsdieofazxcvbnm" +EFKA_DOCKER_ROOT_DIR="/var/lib/efka/docker/" +EFKA_MNESIA_DIR="/var/lib/efka/mnesia" diff --git a/rebar.config b/rebar.config index 3400147..41d438f 100644 --- a/rebar.config +++ b/rebar.config @@ -16,19 +16,10 @@ [efka, sasl]}, - {mode, dev}, + {mode, prod}, - %% automatically picked up if the files - %% exist but can be set manually, which - %% is required if the names aren't exactly - %% sys.config and vm.args - {sys_config, "./config/sys.config"}, - {vm_args, "./config/vm.args"} - - %% the .src form of the configuration files do - %% not require setting RELX_REPLACE_OS_VARS - %% {sys_config_src, "./config/sys.config.src"}, - %% {vm_args_src, "./config/vm.args.src"} + {sys_config_src, "./config/sys.config.src"}, + {vm_args_src, "./config/vm.args.src"} ]}. {profiles, [{prod, [{relx,