misc/ansible-base
0
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

[mod] roles:dokuwiki-and-nginx:tls mode

Browse source
This commit is contained in:
roydfalk 2024-07-03 22:10:07 +02:00
parent fc03370b19
commit 6d42a70bd4
3 changed files with 49 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/dokuwiki-and-nginx/defaults/main.json
View file

@ -1,5 +1,5 @@
{
"var_dokuwiki_and_nginx_directory": "/opt/dokuwiki",
"var_dokuwiki_and_nginx_domain": "dokuwiki.example.org",
"var_dokuwiki_and_nginx_tls_enable": true
"var_dokuwiki_and_nginx_tls_mode": "enable"
}

48
roles/dokuwiki-and-nginx/templates/conf.j2
View file

@ -1,22 +1,4 @@
server {
listen 80;
listen [::]:80;
server_name {{var_dokuwiki_and_nginx_domain}};
return 301 https://$server_name$request_uri;
}
server {
listen [::]:443 ssl;
listen 443 ssl;
server_name {{var_dokuwiki_and_nginx_domain}};
{% if var_dokuwiki_and_nginx_tls_enable %}
ssl_certificate /etc/ssl/fullchains/{{var_dokuwiki_and_nginx_domain}}.pem;
ssl_certificate_key /etc/ssl/private/{{var_dokuwiki_and_nginx_domain}}.pem;
include /etc/nginx/ssl-hardening.conf;
{% endif %}
{% macro dokuwiki_common() %}
# Maximum file upload size is 4MB - change accordingly if needed
client_max_body_size 4M;
client_body_buffer_size 128k;
@ -58,4 +40,32 @@ server {
fastcgi_pass unix:/var/run/php/php8.2-fpm.sock;
# fastcgi_pass unix:/var/run/php5-fpm.sock; #old php version
}
{% endif %}
server {
server_name {{var_dokuwki_and_nginx_domain}};
listen 80;
listen [::]:80;
{% if (var_dokuwki_and_nginx_tls_mode == "force") %}
return 301 https://$http_host$request_uri;
{% else %}
{{ dokuwki_common() }}
{% endif %}
}
{% if (var_element_and_nginx_tls_mode != "disable") %}
server {
server_name {{var_dokuwki_and_nginx_domain}};
listen [::]:443 ssl http2;
listen 443 ssl http2;
ssl_certificate_key /etc/ssl/private/{{var_dokuwki_and_nginx_domain}}.pem;
ssl_certificate /etc/ssl/fullchains/{{var_dokuwki_and_nginx_domain}}.pem;
include /etc/nginx/ssl-hardening.conf;
{{ dokuwki_common() }}
}
{% endif %}

19
roles/dokuwiki-and-nginx/vardef.json Normal file
View file

@ -0,0 +1,19 @@
{
"directory": {
"type": "string",
"mandatory": false
},
"domain": {
"type": "string",
"mandatory": false
},
"tls_mode": {
"type": "string",
"options": [
"disable",
"enable",
"force"
],
"mandatory": false
}
}