Setting up proxy vhost pr 2.x

docs/roles/aws/aws_acl.md

@@ -8,34 +8,36 @@ Creates an ACL to be attached to a CloudFront distribution or an Application Loa
 ## Default variables
 ```yaml
 ---
-rate_limit: 0 # set to 0 to skip rate limit rule, set to a value to set how many requests to allow in period before blocking
 aws_acl:
-  name: example_master_acl
-  scope: CLOUDFRONT # Can be REGIONAL for ALBs
-  tags: {}
-
-  botControl: true
-  inspection: "COMMON" # or set to TARGETED inspection level
-
-  ip_allow:
-    name: "Allowed-ips"
-    list: []
-      #- 1.1.1.1/32 # list of ip ranges
-      #- 2.2.2.2/32
-      #- 3.3.3.3/32
-
-  ip_block:
-    name: "Blocked-ips"
-    list: []
-      #- 4.4.4.4/32 # list of ip ranges
-      #- 5.5.5.5/32
-      #- 6.6.6.6/32
-
-  cc_block_list: []
-    #- BY # Belarus
-    #- CN # China
-    #- IR # Iran
-    #- SA # Saudi Arabia
+  - rate_limit: 0 # set to 0 to skip rate limit rule, set to a value to set how many requests to allow in period before blocking
+    acl_rules:
+      name: example_master_acl # Name of the ACL
+      description: "Master ACL for CF"
+      scope: CLOUDFRONT # Can be REGIONAL for ALBs
+      tags: {}
+
+      botControl: false # Set to true to apply bot control
+      inspection: "COMMON" # or set to TARGETED inspection level
+
+      ip_allow:
+        name: "Allowed-ips"
+        list: []
+          #- 1.1.1.1/32 # list of ip ranges
+          #- 2.2.2.2/32
+          #- 3.3.3.3/32
+
+      ip_block:
+        name: "Blocked-ips"
+        list: []
+          #- 4.4.4.4/32 # list of ip ranges
+          #- 5.5.5.5/32
+          #- 6.6.6.6/32
+
+      cc_block_list: []
+        #- BY # Belarus
+        #- CN # China
+        #- IR # Iran
+        #- SA # Saudi Arabia
 
 ```
 

docs/roles/debian/nginx.md

@@ -54,6 +54,8 @@ nginx:
     fastcgi_buffers: "8 256k"
     cache_behavior_private: "add_header Cache-Control \"private, max-age=604800\""
     cache_behavior_public: "add_header Cache-Control \"public, max-age=604800\""
+    proxy_host: localhost
+    proxy_port: 8443
     # You can inject custom directives into the main nginx.conf file here by providing them as a list of strings.
     #custom_directives: []
   # Group prefix. Useful for grouping by environments.

roles/aws/aws_acl/README.md

@@ -5,7 +5,7 @@ Creates an ACL to be attached to a CloudFront distribution or an Application Loa
 <!--ENDTOC-->
 
 <!--ROLEVARS-->
-## Default variables for creation of ACL (pass it as a list)
+## Default variables
 ```yaml
 ---
 aws_acl:
@@ -38,14 +38,7 @@ aws_acl:
         #- CN # China
         #- IR # Iran
         #- SA # Saudi Arabia
-```
 
-## Default variables for assigning ACL to CF or ALB
-```yaml
----
-aws_acl:
-  name: example_master_acl # Name of the ACL to apply
-  scope: CLOUDFRONT # Can be REGIONAL for ALBs
 ```
 
 <!--ENDROLEVARS-->

roles/debian/nginx/README.md

@@ -54,6 +54,8 @@ nginx:
     fastcgi_buffers: "8 256k"
     cache_behavior_private: "add_header Cache-Control \"private, max-age=604800\""
     cache_behavior_public: "add_header Cache-Control \"public, max-age=604800\""
+    proxy_host: localhost
+    proxy_port: 8443
     # You can inject custom directives into the main nginx.conf file here by providing them as a list of strings.
     #custom_directives: []
   # Group prefix. Useful for grouping by environments.

roles/debian/nginx/defaults/main.yml

@@ -42,6 +42,8 @@ nginx:
     fastcgi_buffers: "8 256k"
     cache_behavior_private: "add_header Cache-Control \"private, max-age=604800\""
     cache_behavior_public: "add_header Cache-Control \"public, max-age=604800\""
+    proxy_host: localhost
+    proxy_port: 8443
     # You can inject custom directives into the main nginx.conf file here by providing them as a list of strings.
     #custom_directives: []
   # Group prefix. Useful for grouping by environments.

roles/debian/nginx/templates/proxy.j2

@@ -1,3 +1,6 @@
-#location / {
-#do something here
-#}
+location / {
+  proxy_pass https://{{ nginx.http.proxy_host }}:{{ nginx.host.proxy_port }}/;
+  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+  proxy_set_header X-Forwarded-Proto $scheme;
+  proxy_redirect http:// https://;
+}