progress

roles/rproxy/templates/docker-compose.yml.j2

@@ -8,9 +8,7 @@ services:
     volumes:
       - {{ rproxy_dir }}/nginx.conf:/etc/nginx/nginx.conf
       - {{ rproxy_dir }}/sites:/etc/nginx/sites
-      - {{ rproxy_dir }}/sites/default.conf:/etc/nginx/conf.d/default.conf
-      - {{ rproxy_dir }}/{{ domain.stdout }}.crt:/etc/nginx/{{ domain.stdout }}.crt
-      - {{ rproxy_dir }}/{{ domain.stdout }}.key:/etc/nginx/{{ domain.stdout }}.key
+      - {{ rproxy_dir }}/certs:/etc/nginx/certs
     ports:
       - 443:443
       - 80:80

roles/rproxy/templates/server.cnf.j2

@@ -0,0 +1,23 @@
+[ req ]
+prompt                 = no
+days                   = 365
+distinguished_name     = {{ domain.stdout }}
+req_extensions         = v3_req
+
+
+[ olsson.ul ]
+countryName            = RU
+stateOrProvinceName    = RU
+localityName           = MSK
+organizationName       = {{ domain.stdout }}
+organizationalUnitName = IT
+commonName             = {{ domain.stdout }}
+emailAddress           = admin@{{ domain.stdout }}
+
+[ v3_req ]
+basicConstraints       = CA:false
+extendedKeyUsage       = serverAuth
+subjectAltName         = @sans
+
+[ sans ]
+DNS.0 = *.{{ domain.stdout }}

roles/rproxy/templates/server.conf.j2

@@ -1,32 +1,35 @@
-{% for rproxy_service in rproxy_service_list %}
+upstream {{ rproxy_service_name }}.{{ domain.stdout }} {
+    server {{ rproxy_service_address }}:{{ rproxy_service_port }};
+}
+
 server {
     listen 80;
-    server_name {{ rproxy_service }}.{{ domain.stdout }};
-    access_log /var/log/nginx/{{ rproxy_service }}.access.log;
-    error_log /var/log/nginx/{{ rproxy_service }}.error.log;
+    server_name {{ rproxy_service_name }}.{{ domain.stdout }};
+    access_log /var/log/nginx/{{ rproxy_service_name }}.access.log;
+    error_log /var/log/nginx/{{ rproxy_service_name }}.error.log;
     return 301 https://$server_name$request_uri;
 }
 
 server {
     listen 443 ssl;
-    server_name {{ rproxy_service }}.{{ domain.stdout }};
-    access_log /var/log/nginx/{{ rproxy_service }}.access.log;
-    error_log /var/log/nginx/{{ rproxy_service }}.error.log;
-    ssl_certificate /etc/nginx/{{ domain.stdout }}.crt;
-    ssl_certificate_key /etc/nginx/{{ domain.stdout }}.key;
+    server_name {{ rproxy_service_name }}.{{ domain.stdout }};
+    access_log /var/log/nginx/{{ rproxy_service_name }}.access.log;
+    error_log /var/log/nginx/{{ rproxy_service_name }}.error.log;
+    ssl_certificate /etc/nginx/certs/{{ domain.stdout }}.crt;
+    ssl_certificate_key /etc/nginx/certs/{{ domain.stdout }}.key;
     ssl_protocols TLSv1.2;
     ssl_ciphers EECDH:+AES256:-3DES:!RSA+AES:!RSA+3DES:!NULL:!RC4;
     ssl_prefer_server_ciphers on;
     proxy_connect_timeout 600s;
     fastcgi_request_buffering off;
     fastcgi_buffers 64 4K;
+
     location / {
         proxy_pass_header Server;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
-        proxy_pass https://{{ rproxy_service }}.{{ domain.stdout }}/;
+        proxy_pass https://{{ rproxy_service_name }}.{{ domain.stdout }}/;
      }
 }
-{% endfor %}