Makussu/bunkerweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

started work on moving variables from .lua to nginx

Browse Source
This commit is contained in:
bunkerity
2021-05-18 15:14:45 +02:00
parent 600484b16e
commit 863283d090
14 changed files with 177 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
entrypoint/global-config.sh
View File

@@ -242,6 +242,8 @@ if [ "$USE_API" = "yes" ] ; then
echo "[*] Generated API URI : $API_URI"
fi
replace_in_file "/etc/nginx/api.conf" "%API_URI%" "$API_URI"
list=$(spaces_to_lua "$API_WHITELIST_IP")
replace_in_file "/etc/nginx/api.conf" "%API_WHITELIST_IP%" "$list"
else
replace_in_file "/etc/nginx/nginx.conf" "%USE_API%" ""
fi

6
entrypoint/lua.sh
View File

@@ -45,9 +45,3 @@ if [ "$(has_value USE_CROWDSEC yes)" != "" ] ; then
replace_in_file "/usr/local/lib/lua/crowdsec/crowdsec.conf" "%CROWDSEC_HOST%" "$CROWDSEC_HOST"
replace_in_file "/usr/local/lib/lua/crowdsec/crowdsec.conf" "%CROWDSEC_KEY%" "$CROWDSEC_KEY"
fi
# Whitelist IP for API
if [ "$USE_API" = "yes" ] ; then
list=$(spaces_to_lua "$API_WHITELIST_IP")
replace_in_file "/usr/local/lib/lua/api.lua" "%API_WHITELIST_IP%" "$list"
fi

2
entrypoint/nginx-temp.sh
View File

@@ -13,6 +13,8 @@ if [ "$(has_value AUTO_LETS_ENCRYPT yes)" != "" ] || [ "$SWARM_MODE" = "yes" ] ;
if [ "$SWARM_MODE" = "yes" ] ; then
replace_in_file "/tmp/nginx-temp.conf" "%USE_API%" "include /tmp/api.conf;"
replace_in_file "/tmp/api.conf" "%API_URI%" "$API_URI"
list=$(spaces_to_lua "$API_WHITELIST_IP")
replace_in_file "/tmp/api.conf" "%API_WHITELIST_IP%" "$list"
else
replace_in_file "/tmp/nginx-temp.conf" "%USE_API%" ""
fi