Skip to content

Commit

Permalink
Showing 4 changed files with 10 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 6.1.5 2022-07-07 <dave at tiredofit dot ca>

### Changed
- Fix sed statement breaking NGINX_MODE=REDIRECT


## 6.1.4 2022-07-06 <dave at tiredofit dot ca>

### Changed
4 changes: 2 additions & 2 deletions install/assets/functions/10-nginx
Original file line number Diff line number Diff line change
@@ -200,7 +200,7 @@ nginx_configure_blockbots() {
for blacklist_ua in $NGINX_BLOCK_BOTS_BLACKLIST_USER_AGENTS; do
blacklist_ua_orig="$(echo "$blacklist_ua" | sed "s|\\\||g")"
if ! grep -q "${blacklist_ua_orig}" /etc/nginx/snippets/blockbots-custom/blacklist-user-agents.conf ; then
print_debug "Adding UA: '${blacklist_ua_orig}' to bot blocker blacklist"
print_debug "[botblock] Adding UA: '${blacklist_ua_orig}' to bot blocker blacklist"
echo '"~*(?:\b)'$(echo "$blacklist_ua")'(?:\b)" 3; # '${blacklist_ua_orig}' Automatically added on '$(date +"%Y-%m-%d-%H:%M:%S") >> /etc/nginx/snippets/blockbots-custom/blacklist-user-agents.conf
else
print_debug "Skipping UA: '${blacklist_ua_orig}' from being added to bot blocker blacklist"
@@ -296,7 +296,7 @@ nginx_configure_mode() {
sanity_var NGINX_REDIRECT_URL "No Redirect URL"
NGINX_ENABLE_CREATE_SAMPLE_HTML=FALSE
print_notice "Redirect Mode Activated - Redirecting all traffic to ${NGINX_REDIRECT_URL}"
sed -i "s|rewrite \^/(\.\*) .*#rewrite ^/(\.\*) ${NGINX_REDIRECT_URL};|g" /etc/nginx/templates/redirect.template
sed -i "s|rewrite \^/(\.\*) .*|rewrite ^/(\.\*) ${NGINX_REDIRECT_URL};|g" /etc/nginx/templates/redirect.template
sed -i "/include \/etc\/nginx\/sites.enabled\/\*.conf;/d" /etc/nginx/nginx.conf
sed -i "s|include /etc/nginx/templates/maintenance.template;|#include /etc/nginx/templates/maintenance.template;|g" /etc/nginx/nginx.conf
sed -i "/include \/etc\/nginx\/templates\/proxy.template;/d" /etc/nginx/nginx.conf
1 change: 1 addition & 0 deletions install/etc/cont-init.d/10-nginx
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ if var_false "${ENABLE_NGINX}" ; then
service_stop 11-nginx-config-reload
rm -rf /assets/logrotate/nginx*
rm -rf /etc/logrotate.d/nginx*
rm -rf /assets/logrotate/nginx*
rm -rf /etc/zabbix/*/nginx*
rm -rf /etc/fluent-bit/conf.d/nginx*
liftoff
2 changes: 1 addition & 1 deletion install/etc/nginx/templates/redirect.template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
server {
listen <LISTEN_PORT>;
server_name localhost;
root <WEBROOT>;
root /usr/share/nginx/html;
index index.html index.htm;

rewrite ^/(.*) <REDIRECT_URL>;

0 comments on commit 8abd2b8

Please sign in to comment.