updated nginx state

states/nginx/install.sls

@@ -4,18 +4,25 @@ nginx-pkg:
   pkg.installed:
     - pkgs: {{ nginx.packages }}
 
-nginx-logs-user-acl:
+nginx-logs-perms:
-  acl.present:
+  file.directory:
     - name: /var/log/nginx
-    - acl_type: user
+    - user: www-data
-    - acl_name: www-data
+    - group: root
-    - perms: rwx
+    - mode: 0775
-    - recurse: true
 
-nginx-logs-group-acl:
+#nginx-logs-user-acl:
-  acl.present:
+#  acl.present:
-    - name: /var/log/nginx
+#    - name: /var/log/nginx
-    - acl_type: group
+#    - acl_type: user
-    - acl_name: www-data
+#    - acl_name: www-data
-    - perms: rwx
+#    - perms: rwx
-    - recurse: true
+#    - recurse: true
+#
+#nginx-logs-group-acl:
+#  acl.present:
+#    - name: /var/log/nginx
+#    - acl_type: group
+#    - acl_name: www-data
+#    - perms: rwx
+#    - recurse: true

states/nginx/templates/nginx.conf.j2

@@ -24,6 +24,10 @@ http {
   include ssl_params;
   charset utf-8;
 
+  real_ip_header proxy_protocol;
+  set_real_ip_from 127.0.0.1;
+  set_real_ip_from ::1;
+
   {%- if nginx.config.geoip %}
   geoip2 /usr/share/GeoIP/GeoLite2-ASN.mmdb {
     $geoip2_asn default=0 autonomous_system_number;
@@ -71,10 +75,6 @@ http {
     root /var/www/html;
     index index.html;
 
-    real_ip_header X-Forwarded-For;
-    set_real_ip_from 127.0.0.1;
-    set_real_ip_from ::1;
-
     location = / {
       return 404;
     }