diff --git a/bash/test.sh b/bash/test.sh deleted file mode 100644 index 9f2ee78..0000000 --- a/bash/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -echo $device_name -cp -r ../conf/var/$device_name/*.conf /etc/supervisor/conf.d/ \ No newline at end of file diff --git a/conf/var/test/push_stream.conf b/conf/common/push_stream.conf similarity index 100% rename from conf/var/test/push_stream.conf rename to conf/common/push_stream.conf diff --git a/conf/example/supervisord.conf b/conf/example/supervisord.conf index 85f766b..71e1528 100644 --- a/conf/example/supervisord.conf +++ b/conf/example/supervisord.conf @@ -37,4 +37,4 @@ stopsignal=TERM stopasgroup=True priority=1 [include] -files = /etc/supervisor/conf.d/*.conf +files = /home/pi/lot_manager/conf/common/*.conf diff --git a/git_update.sh b/git_update.sh index 2102445..e37b0b8 100644 --- a/git_update.sh +++ b/git_update.sh @@ -4,7 +4,6 @@ set -e git pull origin master --force # 配置文件复制到supervisor管理 cp -r conf/common/*.conf /etc/supervisor/conf.d/ -cp -r conf/var/$device_name/*.conf /etc/supervisor/conf.d/ # 更新配置文件 supervisorctl reread supervisorctl update