progress

roles/rproxy/files/nginx.conf

@@ -1,4 +1,3 @@
-load_module modules/ngx_http_headers_more_filter_module.so;
 user  nginx;
 worker_processes  auto;
 
@@ -20,14 +19,8 @@ http {
                       '"$http_user_agent" "$http_x_forwarded_for"';
 
     access_log  /var/log/nginx/access.log  main;
-
     sendfile        on;
-    #tcp_nopush     on;
-
     keepalive_timeout  65;
-
-    #gzip  on;
-
     include /etc/nginx/sites/*.conf;
     server_tokens off;
 }

roles/rproxy/tasks/main.yml

@@ -3,44 +3,97 @@
   ansible.builtin.shell:
     cmd: hostname -d
   register: domain
+  tags:
+    - install
+    - add_config
 
-- name: Install dependencies
-  ansible.builtin.apt:
-    name:
-      - docker.io
-      - docker-compose
-    update_cache: yes
+- name: Install rproxy
+  block:
+    - name: Install dependencies
+      ansible.builtin.apt:
+        name:
+          - docker.io
+          - docker-compose
+        update_cache: yes
 
-- name: Remove rproxy dir
-  ansible.builtin.file:
-    path: "{{ rproxy_dir }}"
-    state: absent
+    - name: Remove rproxy dir
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}"
+        state: absent
 
-- name: Create rproxy dir
-  ansible.builtin.file:
-    path: "{{ rproxy_dir }}"
-    state: directory
+    - name: Create rproxy dir
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}"
+        state: directory
 
-- name: Create sites dir
-  ansible.builtin.file:
-    path: "{{ rproxy_dir }}/sites"
-    state: directory
+    - name: Create sites dir
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}/sites"
+        state: directory
 
-- name: Copy docker-compose
-  ansible.builtin.template:
-    src: templates/docker-compose.yml.j2
-    dest: "{{ rproxy_dir }}/docker-compose.yml"
+    - name: Create certs dir
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}/certs"
+        state: directory
 
-- name: Copy nginx.conf
-  ansible.builtin.copy:
-    src: files/nginx.conf
-    dest: "{{ rproxy_dir }}/nginx.conf"
+    - name: Copy docker-compose
+      ansible.builtin.template:
+        src: templates/docker-compose.yml.j2
+        dest: "{{ rproxy_dir }}/docker-compose.yml"
 
-- name: Copy server.conf
-  ansible.builtin.template:
-    src: templates/server.conf.j2
-    dest: "{{ rproxy_dir }}/sites/server.conf"
+    - name: Copy nginx.conf
+      ansible.builtin.copy:
+        src: files/nginx.conf
+        dest: "{{ rproxy_dir }}/nginx.conf"
+
+    - name: Copy RootCA certificate
+      ansible.builtin.copy:
+        src: files/RootCA.crt
+        dest: '{{ rproxy_dir }}/certs/RootCA.crt'
+    
+    - name: Copy RootCA key
+      ansible.builtin.copy:
+        src: files/RootCA.key
+        dest: '{{ rproxy_dir }}/certs/RootCA.key'
+
+    - name: Copy server certificate cnf
+      ansible.builtin.template:
+        src: templates/server.cnf.j2
+        dest: '{{ rproxy_dir }}/certs/server.cnf'
+
+    - name: Generate server key
+      ansible.builtin.shell:
+        cmd: 'openssl genrsa -out {{ rproxy_dir }}/certs/{{ domain.stdout }}.key 2048'
+
+    - name: Generate server csr
+      ansible.builtin.shell:
+        cmd: 'openssl req -key {{ rproxy_dir }}/certs/{{ domain.stdout }}.key -new -out {{ rproxy_dir }}/certs/{{ domain.stdout }}.csr -config {{ rproxy_dir }}/certs/server.cnf'
+
+    - name: Sign server certificate
+      ansible.builtin.shell:
+        cmd: 'openssl x509 -req -CA {{ rproxy_dir }}/certs/RootCA.crt -CAkey {{ rproxy_dir }}/certs/RootCA.key -in {{ rproxy_dir }}/certs/{{ domain.stdout }}.csr -out {{ rproxy_dir }}/certs/{{ domain.stdout }}.crt -CAcreateserial'
+
+    - name: Delete csr
+      ansible.builtin.file:
+        path: "{{ rproxy_dir }}/certs/{{ domain.stdout }}.csr"
+        state: absent
+
+    - name: Start rproxy
+      community.docker.docker_compose:
+        project_src: "{{ rproxy_dir }}"
+  tags: install
+
+- name: Create configs
+  block:
+    - name: Copy server.conf
+      ansible.builtin.template:
+        src: templates/server.conf.j2
+        dest: "{{ rproxy_dir }}/sites/{{  rproxy_service_name  }}.conf"
+
+    - name: Restart rproxy
+      community.docker.docker_compose:
+        project_src: "{{ rproxy_dir }}"
+        build: false
+        restarted: true
+  tags: add_config
 
-- name: Start rproxy
-  community.docker.docker_compose:
-    project_src: "{{ rproxy_dir }}"

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 %}