update
This commit is contained in:
parent
ec46090afb
commit
558eae2108
6 changed files with 48 additions and 19 deletions
|
@ -70,7 +70,3 @@ http {
|
||||||
# }
|
# }
|
||||||
#}
|
#}
|
||||||
}
|
}
|
||||||
|
|
||||||
stream {
|
|
||||||
include tcpconf.d/*.conf
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,2 +1,6 @@
|
||||||
---
|
---
|
||||||
# handlers file for nginx-ssl
|
# handlers file for nginx-ssl
|
||||||
|
- name: restart nginx
|
||||||
|
service:
|
||||||
|
name: nginx
|
||||||
|
state: restarted
|
||||||
|
|
|
@ -1,10 +1,5 @@
|
||||||
# create_cert.yml
|
# create_cert.yml
|
||||||
---
|
---
|
||||||
- name: Create certs directory if it doesn't exist
|
|
||||||
file:
|
|
||||||
path: /etc/nginx/certs/
|
|
||||||
state: directory
|
|
||||||
|
|
||||||
- name: Create certificate directory for domain if it doesn't exist
|
- name: Create certificate directory for domain if it doesn't exist
|
||||||
file:
|
file:
|
||||||
path: /etc/nginx/certs/{{ item.domain }}
|
path: /etc/nginx/certs/{{ item.domain }}
|
||||||
|
@ -31,3 +26,5 @@
|
||||||
privatekey_path: /etc/nginx/certs/{{ item.domain }}/privkey.pem
|
privatekey_path: /etc/nginx/certs/{{ item.domain }}/privkey.pem
|
||||||
provider: selfsigned
|
provider: selfsigned
|
||||||
when: result is failure
|
when: result is failure
|
||||||
|
notify: restart nginx
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
ansible.builtin.copy:
|
ansible.builtin.copy:
|
||||||
src: files/nginx.conf
|
src: files/nginx.conf
|
||||||
dest: /etc/nginx/nginx.conf
|
dest: /etc/nginx/nginx.conf
|
||||||
|
notify: restart nginx
|
||||||
|
|
||||||
- name: ensure conf.d exists
|
- name: ensure conf.d exists
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
|
@ -18,15 +19,46 @@
|
||||||
- name: deploy service config(s)
|
- name: deploy service config(s)
|
||||||
ansible.builtin.template:
|
ansible.builtin.template:
|
||||||
src: templates/server.conf
|
src: templates/server.conf
|
||||||
dest: /etc/nginx/conf.d/{{ item.domain }}
|
dest: /etc/nginx/conf.d/{{ item.domain }}.conf
|
||||||
loop: "{{ domains }}"
|
loop: "{{ domains }}"
|
||||||
|
notify: restart nginx
|
||||||
|
|
||||||
- name: check if /etc/nginx/certs exists and is a symlink
|
- name: check if letsencrypt is set up
|
||||||
ansible.builtin.command: '[ -L "/etc/nginx/certs" ]'
|
ansible.builtin.command: '[ -d "/etc/letsencrypt/" ]'
|
||||||
register: result
|
register: result
|
||||||
ignore_errors: true
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: check if letsencrypt is set up
|
||||||
|
ansible.builtin.command: '[ -d "/etc/nginx/certs/" ]'
|
||||||
|
register: result2
|
||||||
|
ignore_errors: true
|
||||||
|
|
||||||
|
- name: delete folder if exists
|
||||||
|
ansible.builtin.file:
|
||||||
|
state: absent
|
||||||
|
path: /etc/nginx/certs
|
||||||
|
when: (result is succeeded and result2 is succeeded) or (result is failed and result2 is failed)
|
||||||
|
|
||||||
|
- name: create symlink
|
||||||
|
ansible.builtin.file:
|
||||||
|
src: /etc/letsencrypt/live
|
||||||
|
dest: /etc/nginx/certs
|
||||||
|
state: link
|
||||||
|
when: result is succeeded
|
||||||
|
notify: restart nginx
|
||||||
|
|
||||||
|
- name: Create certs directory if it doesn't exist
|
||||||
|
file:
|
||||||
|
path: /etc/nginx/certs/
|
||||||
|
state: directory
|
||||||
|
when: result is failed
|
||||||
|
|
||||||
- include_tasks: create_cert.yml
|
- include_tasks: create_cert.yml
|
||||||
when: result is failed
|
when: result is failed
|
||||||
loop: "{{ domains }}"
|
loop: "{{ domains }}"
|
||||||
|
|
||||||
|
- name: ensure nginx is running
|
||||||
|
service:
|
||||||
|
name: nginx
|
||||||
|
state: started
|
||||||
|
enabled: yes
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
server {
|
server {
|
||||||
listen 443 ssl proxy_protocol;
|
listen 443 ssl;
|
||||||
server_name {{ item.domain }} ;
|
server_name {{ item.domain }} ;
|
||||||
|
|
||||||
resolver 172.16.40.20;
|
resolver 172.16.40.20;
|
||||||
set $backend "http://localhost:{{ item.port }}";
|
set $backend "http://localhost:{{ item.port }}";
|
||||||
set $certbot "http://localhost";
|
set $certbot "http://localhost";
|
||||||
|
|
||||||
ssl_certificate /etc/nginx/certs/{{ item.domain }}.actcur.com/fullchain.pem;
|
ssl_certificate /etc/nginx/certs/{{ item.domain }}/fullchain.pem;
|
||||||
ssl_certificate_key /etc/nginx/certs/{{ item.domain }}.actcur.com/privkey.pem;
|
ssl_certificate_key /etc/nginx/certs/{{ item.domain }}/privkey.pem;
|
||||||
|
|
||||||
location /.well-known/acme-challenge/ {
|
location /.well-known/acme-challenge/ {
|
||||||
proxy_pass $certbot;
|
proxy_pass $certbot;
|
||||||
|
@ -17,7 +17,9 @@ server {
|
||||||
ssl_session_cache shared:SSL:10m;
|
ssl_session_cache shared:SSL:10m;
|
||||||
client_max_body_size 1024m;
|
client_max_body_size 1024m;
|
||||||
location / {
|
location / {
|
||||||
allow 192.168.0.0/16;
|
|
||||||
|
deny 172.16.41.60
|
||||||
|
allow 172.16.0.0/16;
|
||||||
deny all;
|
deny all;
|
||||||
|
|
||||||
proxy_pass $backend;
|
proxy_pass $backend;
|
||||||
|
|
|
@ -4,7 +4,5 @@
|
||||||
domains:
|
domains:
|
||||||
- domain: privtorrents.actcur.com
|
- domain: privtorrents.actcur.com
|
||||||
port: 8112
|
port: 8112
|
||||||
- domain: test.actcur.com
|
|
||||||
port: 8113
|
|
||||||
|
|
||||||
# end of file
|
# end of file
|
||||||
|
|
Loading…
Add table
Reference in a new issue