progressivwerk
/
ansible-role-collabora-docker
3
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

domain: expect full domain

pull/1/head
thiuda 2023-01-27 13:04:55 +01:00
parent 74549a46d3
commit f1862f7646
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/collabora.conf.j2
View File

@ -4,7 +4,7 @@
server { server {
listen 443 ssl; listen 443 ssl;
listen [::]:443 ssl; listen [::]:443 ssl;
server_name {{ collabora_prefix }}.{{domain}}; server_name {{ collabora_domain }};
## ##
# SSL # SSL
@ -15,8 +15,8 @@ server {
ssl_prefer_server_ciphers on; ssl_prefer_server_ciphers on;
ssl_dhparam {{ ssl_dir }}/dhparams.pem; ssl_dhparam {{ ssl_dir }}/dhparams.pem;
ssl_ecdh_curve secp384r1; ssl_ecdh_curve secp384r1;
ssl_certificate {{ certs_dir }}/{{ domain }}/cert.pem; ssl_certificate {{ certs_dir }}/{{ collabora_domain }}/cert.pem;
ssl_certificate_key {{ certs_dir }}/{{ domain }}/key.pem; ssl_certificate_key {{ certs_dir }}/{{ collabora_domain }}/key.pem;
## ##
# OCSP Stapling # OCSP Stapling
@ -24,7 +24,7 @@ server {
ssl_stapling on; ssl_stapling on;
ssl_stapling_verify on; ssl_stapling_verify on;
resolver {{ dns_resolvers }} valid=300s; resolver {{ dns_resolvers }} valid=300s;
ssl_trusted_certificate {{ certs_dir }}/{{ domain }}/cert.pem; ssl_trusted_certificate {{ certs_dir }}/{{ collabora_domain }}/cert.pem;
## ##
# HSTS # HSTS
@ -102,13 +102,13 @@ server {
} }
server { server {
if ($host = {{ collabora_prefix }}.{{ domain }}) { if ($host = {{ collabora_domain }}) {
return 301 https://$host$request_uri; return 301 https://$host$request_uri;
} }
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name {{ collabora_prefix }}.{{ domain }}; server_name {{ collabora_domain }};
location / { location / {
return 301 https://$host$request_uri; return 301 https://$host$request_uri;

4
templates/docker-compose.yml.j2
View File

@ -6,7 +6,7 @@ version: "3.4"
services: services:
collabora: collabora:
image: "{{ collabora_image }}:{{ collabora_version }}" image: "{{ collabora_image }}:{{ collabora_version }}"
container_name: {{ collabora_container }} container_name: {{ collabora_container_hostname }}
hostname: {{ collabora_container_hostname }} hostname: {{ collabora_container_hostname }}
restart: unless-stopped restart: unless-stopped
ports: "127.0.0.1:{{ collabora_port }}:9980" ports: "127.0.0.1:{{ collabora_port }}:9980"
@ -16,4 +16,4 @@ services:
- "extra_params=--o:ssl.enable=false --o:ssl.termination=true" - "extra_params=--o:ssl.enable=false --o:ssl.termination=true"
- username={{ collabora_admin }} - username={{ collabora_admin }}
- password={{ collabora_secret }} - password={{ collabora_secret }}
- server_name={{ collabora_prefix }}.{{ domain }} - server_name={{ collabora_domain }}