domain: expect full domain
parent
74549a46d3
commit
f1862f7646
|
@ -4,7 +4,7 @@
|
|||
server {
|
||||
listen 443 ssl;
|
||||
listen [::]:443 ssl;
|
||||
server_name {{ collabora_prefix }}.{{domain}};
|
||||
server_name {{ collabora_domain }};
|
||||
|
||||
##
|
||||
# SSL
|
||||
|
@ -15,8 +15,8 @@ server {
|
|||
ssl_prefer_server_ciphers on;
|
||||
ssl_dhparam {{ ssl_dir }}/dhparams.pem;
|
||||
ssl_ecdh_curve secp384r1;
|
||||
ssl_certificate {{ certs_dir }}/{{ domain }}/cert.pem;
|
||||
ssl_certificate_key {{ certs_dir }}/{{ domain }}/key.pem;
|
||||
ssl_certificate {{ certs_dir }}/{{ collabora_domain }}/cert.pem;
|
||||
ssl_certificate_key {{ certs_dir }}/{{ collabora_domain }}/key.pem;
|
||||
|
||||
##
|
||||
# OCSP Stapling
|
||||
|
@ -24,7 +24,7 @@ server {
|
|||
ssl_stapling on;
|
||||
ssl_stapling_verify on;
|
||||
resolver {{ dns_resolvers }} valid=300s;
|
||||
ssl_trusted_certificate {{ certs_dir }}/{{ domain }}/cert.pem;
|
||||
ssl_trusted_certificate {{ certs_dir }}/{{ collabora_domain }}/cert.pem;
|
||||
|
||||
##
|
||||
# HSTS
|
||||
|
@ -102,13 +102,13 @@ server {
|
|||
}
|
||||
|
||||
server {
|
||||
if ($host = {{ collabora_prefix }}.{{ domain }}) {
|
||||
if ($host = {{ collabora_domain }}) {
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
|
||||
listen 80;
|
||||
listen [::]:80;
|
||||
server_name {{ collabora_prefix }}.{{ domain }};
|
||||
server_name {{ collabora_domain }};
|
||||
|
||||
location / {
|
||||
return 301 https://$host$request_uri;
|
||||
|
|
|
@ -6,7 +6,7 @@ version: "3.4"
|
|||
services:
|
||||
collabora:
|
||||
image: "{{ collabora_image }}:{{ collabora_version }}"
|
||||
container_name: {{ collabora_container }}
|
||||
container_name: {{ collabora_container_hostname }}
|
||||
hostname: {{ collabora_container_hostname }}
|
||||
restart: unless-stopped
|
||||
ports: "127.0.0.1:{{ collabora_port }}:9980"
|
||||
|
@ -16,4 +16,4 @@ services:
|
|||
- "extra_params=--o:ssl.enable=false --o:ssl.termination=true"
|
||||
- username={{ collabora_admin }}
|
||||
- password={{ collabora_secret }}
|
||||
- server_name={{ collabora_prefix }}.{{ domain }}
|
||||
- server_name={{ collabora_domain }}
|
||||
|
|
Loading…
Reference in New Issue