NASP/argus
50
0
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

dev_1.0.0_yuyr 完成 log和bind模块开发部署测试 #8

Merged
yuyr merged 26 commits from dev_1.0.0_yuyr into dev_1.0.0 2025-09-22 16:39:39 +08:00
Conversation 2 Commits 26 Files Changed 48 +4 -10
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8391108327 - Show all commits

4
src/log/elasticsearch/build/Dockerfile
View File

@ -31,10 +31,6 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY start-es-supervised.sh /usr/local/bin/start-es-supervised.sh COPY start-es-supervised.sh /usr/local/bin/start-es-supervised.sh
RUN chmod +x /usr/local/bin/start-es-supervised.sh RUN chmod +x /usr/local/bin/start-es-supervised.sh
# 创建数据目录并设置权限
RUN mkdir -p /private/argus/log/elasticsearch && \
chown -R elasticsearch:elasticsearch /private/argus/log/elasticsearch
# 保持 root 用户，由 supervisor 管理用户切换 # 保持 root 用户，由 supervisor 管理用户切换
USER root USER root

3
src/log/elasticsearch/build/start-es-supervised.sh
View File

@ -3,8 +3,9 @@ set -euo pipefail
echo "[INFO] Starting Elasticsearch under supervisor..." echo "[INFO] Starting Elasticsearch under supervisor..."
# 创建数据目录（如果不存在） # 创建数据目录并设置权限（如果不存在）
mkdir -p /private/argus/log/elasticsearch mkdir -p /private/argus/log/elasticsearch
chown -R elasticsearch:elasticsearch /private/argus/log/elasticsearch
# 创建软链接到Elasticsearch预期的数据目录 # 创建软链接到Elasticsearch预期的数据目录
if [ -L /usr/share/elasticsearch/data ]; then if [ -L /usr/share/elasticsearch/data ]; then

4
src/log/kibana/build/Dockerfile
View File

@ -32,10 +32,6 @@ COPY start-kibana-supervised.sh /usr/local/bin/start-kibana-supervised.sh
COPY kibana-post-start.sh /usr/local/bin/kibana-post-start.sh COPY kibana-post-start.sh /usr/local/bin/kibana-post-start.sh
RUN chmod +x /usr/local/bin/start-kibana-supervised.sh /usr/local/bin/kibana-post-start.sh RUN chmod +x /usr/local/bin/start-kibana-supervised.sh /usr/local/bin/kibana-post-start.sh
# 创建数据目录并设置权限
RUN mkdir -p /private/argus/log/kibana && \
chown -R kibana:kibana /private/argus/log/kibana
# 保持 root 用户，由 supervisor 管理用户切换 # 保持 root 用户，由 supervisor 管理用户切换
USER root USER root

3
src/log/kibana/build/start-kibana-supervised.sh
View File

@ -3,8 +3,9 @@ set -euo pipefail
echo "[INFO] Starting Kibana under supervisor..." echo "[INFO] Starting Kibana under supervisor..."
# 创建数据目录（如果不存在） # 创建数据目录并设置权限（如果不存在）
mkdir -p /private/argus/log/kibana mkdir -p /private/argus/log/kibana
chown -R kibana:kibana /private/argus/log/kibana
# 创建软链接到Kibana预期的数据目录 # 创建软链接到Kibana预期的数据目录
if [ -L /usr/share/kibana/data ]; then if [ -L /usr/share/kibana/data ]; then