Fix tempate errors and remove remaining app protect directives

pulibrary · Feb 5, 2025 · 27272a1 · 27272a1
1 parent f259068
commit 27272a1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/roles/nginxplus/files/conf/http/dev/catalog_staging.conf b/roles/nginxplus/files/conf/http/dev/catalog_staging.conf
@@ -45,7 +45,7 @@ server {
     ssl_prefer_server_ciphers  on;
 
     location / {
-        app_protect_enable off;
+        # app_protect_enable off;
         limit_req zone=catalog-staging-ratelimit burst=80 nodelay;
 #        # app_protect_security_log_enable on;
         proxy_pass http://catalog-staging;

diff --git a/roles/nginxplus/files/conf/http/dev/grafana_nomad.conf b/roles/nginxplus/files/conf/http/dev/grafana_nomad.conf
@@ -33,7 +33,7 @@ server {
     ssl_prefer_server_ciphers  on;
 
     location / {
-        app_protect_enable off;
+        # app_protect_enable off;
         proxy_pass http://grafana-nomad;
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

diff --git a/roles/nginxplus/files/conf/http/dev/static_staging.conf b/roles/nginxplus/files/conf/http/dev/static_staging.conf
@@ -118,8 +118,8 @@ server {
     ssl_prefer_server_ciphers  on;
 
     location / {
-        app_protect_enable off;
-        app_protect_security_log_enable off;
+        # app_protect_enable off;
+        # app_protect_security_log_enable off;
         proxy_pass http://static-staging;
         proxy_cache  static-stagingcache;
 #        health_check interval=10 fails=3 passes=2;
@@ -146,8 +146,8 @@ server {
     ssl_prefer_server_ciphers  on;
 
     location / {
-        app_protect_enable off;
-        app_protect_security_log_enable off;
+        # app_protect_enable off;
+        # app_protect_security_log_enable off;
         proxy_pass http://static-staging;
         proxy_cache  static-stagingcache;
         proxy_intercept_errors on;

diff --git a/roles/nginxplus/templates/etc_nginx.conf.j2 b/roles/nginxplus/templates/etc_nginx.conf.j2
@@ -28,7 +28,7 @@ load_module modules/ngx_rtmp_module.so;
 {% if nginx_modules.xslt %}
 load_module modules/ngx_http_xslt_filter_module.so;
 {% endif %}
-{% if nginx_modules.waf and nginx_type == "plus" and !nginx_modules.dos %}
+{% if nginx_modules.waf and nginx_type == "plus" and not nginx_modules.dos %}
 load_module modules/ngx_http_app_protect_module.so;
 {% endif %}
 {% if nginx_modules.dos and nginx_type == "plus" %}
@@ -73,11 +73,11 @@ http {
     #tcp_nopush     on;
 
     keepalive_timeout  65;
-    {% if nginx_modules.waf and nginx_type == "plus" and !nginx_modules.dos %}
+    {% if nginx_modules.waf and nginx_type == "plus" and not nginx_modules.dos %}
     app_protect_enable on;
     app_protect_security_log_enable on;
     app_protect_security_log "/etc/app_protect/conf/log_default.json" /var/log/app_protect/security.log;
-    {% elseif  %}
+    {% elif nginx_modules.dos and nginx_type == "plus" %}
     app_protect_dos_enable on;
     {% endif %}