diff --git a/config b/config index 2f29d5d..d5d8962 100644 --- a/config +++ b/config @@ -3,13 +3,14 @@ _address=172.31.2.139 _port=80 _open_ssl=true +_open_nft=false _port_websocket=8443 _nginx_allow_cidr=172.31.0.0/16 #docker services image version #docker镜像版本配置 -_one_app=unismart0828 -_one_nginx=unismart0828 +_one_app=unismart0914 +_one_nginx=unismart0916 _one_redis=unismart0828 _one_ws=unismart _one_zk=unismart diff --git a/install.sh b/install.sh index 31dd469..00cb7c0 100644 --- a/install.sh +++ b/install.sh @@ -355,9 +355,11 @@ after_start_services() { _info "%s" "正在检查初始数据..." sleep 5 - clt_one_nw=$(docker network ls -q -f NAME=clt_deploy_one-nw) - sed -e 's/br-clt_one_nw/br-'${clt_one_nw}'/g' ${TEMPLATE_DIR}/nftables.conf > /etc/sysconfig/nftables.conf - nft -f /etc/sysconfig/nftables.conf + if [ "$(grep "_open_nft" $OLDPWD/config | awk -F= '{print $2}')" ];then + clt_one_nw=$(docker network ls -q -f NAME=clt_deploy_one-nw) + sed -e 's/br-clt_one_nw/br-'${clt_one_nw}'/g' ${TEMPLATE_DIR}/nftables.conf > /etc/sysconfig/nftables.conf + nft -f /etc/sysconfig/nftables.conf + fi local enc_mysql_password=$(_get_env "${OUTPUT_DIR}/.env" "MYSQL_PASSWORD") \ && enc_mysql_password=${enc_mysql_password#*ENC(} && enc_mysql_password=${enc_mysql_password%*)}