Skip to content

Unilumin #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Emet-Sel wants to merge 6 commits into
base: unilumin
Choose a base branch
from
Open

Unilumin #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48658f5
feat:1、docker使用nftables，添加nft规则配置文件；
Emet-Sel Aug 28, 2021
97d436c
feat:1、docker使用nftables，添加nft规则配置文件；
Emet-Sel Aug 28, 2021
58076a4
fix:更新nftables规则文件
Emet-Sel Aug 31, 2021
1827dbb
feat:添加cookie.secure属性
Emet-Sel Sep 6, 2021
a50e743
fix:添加nft可配置
Emet-Sel Sep 30, 2021
009bb1f
Merge branch 'unilumin' of https://github.com/wzg0131/deploy_one into…
Emet-Sel Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%*)}
Expand Down