Compare commits

..

No commits in common. "71aea3040ac3cb9446a29e3535428c10e8df3ff3" and "4a439cf3753d7f15282c108f4ba1fd4fde985ee8" have entirely different histories.

6 changed files with 15 additions and 50 deletions

View file

@ -369,13 +369,7 @@
"userinfo"
]
},
"default": [
"authorization",
"token",
"revocation",
"introspection",
"userinfo"
]
"default": null
}
},
"additionalProperties": false,

View file

@ -46,13 +46,7 @@
"custom": {
}
},
"cors_endpoints": [
"authorization",
"token",
"revocation",
"introspection",
"userinfo"
]
"cors_endpoints": null
}
}
}

View file

@ -1,20 +0,0 @@
{
"nullable": false,
"type": "object",
"properties": {
"auto_reload_interval": {
"nullable": true,
"type": "integer",
"description": "in hours",
"default": null
},
"improved_security": {
"nullable": false,
"type": "boolean",
"default": false
}
},
"additionalProperties": false,
"required": [
]
}

View file

@ -1,6 +1,3 @@
{
"cfg_nginx_defaults": {
"auto_reload_interval": null,
"improved_security": false
}
"var_nginx_auto_reload_interval": null
}

View file

@ -1,10 +1,4 @@
[
{
"name": "show vars",
"ansible.builtin.debug": {
"var": "vars"
}
},
{
"name": "install packages",
"become": true,
@ -18,7 +12,6 @@
},
{
"name": "generate dhparams file",
"when": "cfg_nginx.improved_security",
"become": true,
"ansible.builtin.command": {
"cmd": "openssl dhparam -out /etc/nginx/dhparam 4096"
@ -29,7 +22,6 @@
},
{
"name": "place hardening config",
"when": "cfg_nginx.improved_security",
"become": true,
"ansible.builtin.copy": {
"src": "ssl-hardening.conf",
@ -67,13 +59,13 @@
},
{
"name": "auto reload",
"when": "cfg_nginx.auto_reload_interval == None",
"when": "var_nginx_auto_reload_interval == None",
"become": true,
"ansible.builtin.cron": {
"name": "nginx_auto_reload",
"disabled": true,
"minute": "0",
"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
"hour": "*/{{var_nginx_auto_reload_interval | string}}",
"day": "*",
"month": "*",
"weekday": "*",
@ -82,13 +74,13 @@
},
{
"name": "auto reload",
"when": "cfg_nginx.auto_reload_interval != None",
"when": "var_nginx_auto_reload_interval != None",
"become": true,
"ansible.builtin.cron": {
"name": "nginx_auto_reload",
"disabled": false,
"minute": "0",
"hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
"hour": "*/{{var_nginx_auto_reload_interval | string}}",
"day": "*",
"month": "*",
"weekday": "*",

8
roles/nginx/vardef.json Normal file
View file

@ -0,0 +1,8 @@
{
"auto_reload_interval": {
"description": "in hours",
"nullable": true,
"type": "integer",
"mandatory": false
}
}