Compare commits

...

10 commits

Author SHA1 Message Date
fenris 4bb1c0d1be [del] role:sqlite-for-hedgedoc 2025-10-09 01:49:33 +02:00
fenris c2e100b1aa [task-406] owncloud 2025-10-09 01:49:09 +02:00
fenris 6294edaa59 [task-406] nginx 2025-10-09 01:47:49 +02:00
fenris 88a65ad919 [task-406] hedgedoc 2025-10-09 01:47:20 +02:00
fenris 5b283c7804 [task-406] nginx 2025-10-09 01:45:37 +02:00
fenris df9f32ad02 [task-406] hedgedoc 2025-10-09 01:45:22 +02:00
fenris 59510fb415 [task-406] nginx 2025-10-09 01:44:12 +02:00
fenris e0f485e556 [task-406] authelia 2025-10-09 01:43:49 +02:00
fenris fb931da668 [task-406] nginx 2025-10-09 01:42:26 +02:00
fenris 5d1b1908a5 [task-406] tlscert_selfsigned 2025-10-09 01:41:40 +02:00
57 changed files with 1850 additions and 916 deletions

View file

@ -0,0 +1,24 @@
{
"nullable": false,
"type": "object",
"properties": {
"domain": {
"nullable": false,
"type": "string"
},
"tls_mode": {
"nullable": false,
"type": "string",
"options": [
"disable",
"enable",
"force"
],
"enum": "force"
}
},
"additionalProperties": false,
"required": [
"domain"
]
}

View file

@ -1,4 +1,5 @@
{ {
"var_authelia_and_nginx_domain": "authelia.example.org", "cfg_authelia_and_nginx_defaults": {
"var_authelia_and_nginx_tls_mode": "force" "tls_mode": "force"
}
} }

View file

@ -1,4 +1,11 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_authelia_and_nginx"
}
},
{ {
"name": "deactivate default site", "name": "deactivate default site",
"become": true, "become": true,
@ -12,7 +19,7 @@
"become": true, "become": true,
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "conf.j2", "src": "conf.j2",
"dest": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}" "dest": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}"
} }
}, },
{ {
@ -20,8 +27,8 @@
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "link", "state": "link",
"src": "/etc/nginx/sites-available/{{var_authelia_and_nginx_domain}}", "src": "/etc/nginx/sites-available/{{cfg_authelia_and_nginx.domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_authelia_and_nginx_domain}}" "dest": "/etc/nginx/sites-enabled/{{cfg_authelia_and_nginx.domain}}"
} }
}, },
{ {

View file

@ -45,27 +45,27 @@
{% endmacro %} {% endmacro %}
server { server {
server_name {{var_authelia_and_nginx_domain}}; server_name {{cfg_authelia_and_nginx.domain}};
listen 80; listen 80;
listen [::]:80; listen [::]:80;
{% if (var_authelia_and_nginx_tls_mode == 'force') %} {% if (cfg_authelia_and_nginx.tls_mode == 'force') %}
return 301 https://$http_host$request_uri; return 301 https://$http_host$request_uri;
{% else %} {% else %}
{{ authelia_common() }} {{ authelia_common() }}
{% endif %} {% endif %}
} }
{% if (var_authelia_and_nginx_tls_mode != 'disable') %} {% if (cfg_authelia_and_nginx.tls_mode != 'disable') %}
server { server {
server_name {{var_authelia_and_nginx_domain}}; server_name {{cfg_authelia_and_nginx.domain}};
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
listen 443 ssl http2; listen 443 ssl http2;
ssl_certificate_key /etc/ssl/private/{{var_authelia_and_nginx_domain}}.pem; ssl_certificate_key /etc/ssl/private/{{cfg_authelia_and_nginx.domain}}.pem;
ssl_certificate /etc/ssl/fullchains/{{var_authelia_and_nginx_domain}}.pem; ssl_certificate /etc/ssl/fullchains/{{cfg_authelia_and_nginx.domain}}.pem;
include /etc/nginx/ssl-hardening.conf; include /etc/nginx/ssl-hardening.conf;
{{ authelia_common() }} {{ authelia_common() }}

View file

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

View file

@ -0,0 +1,25 @@
{
"nullable": false,
"type": "object",
"properties": {
"hedgedoc_url_base": {
"nullable": false,
"type": "string"
},
"client_id": {
"nullable": false,
"type": "string",
"default": "hedgedoc"
},
"client_secret": {
"nullable": false,
"type": "string"
}
},
"additionalProperties": false,
"required": [
"hedgedoc_url_base",
"client_id",
"client_secret"
]
}

View file

@ -1,5 +1,5 @@
{ {
"var_authelia_for_hedgedoc_hedgedoc_url_base": "https://hedgedoc.example.org", "cfg_authelia_for_hedgedoc_defaults": {
"var_authelia_for_hedgedoc_client_id": "hedgedoc", "client_id": "hedgedoc"
"var_authelia_for_hedgedoc_client_secret": "REPLACE_ME" }
} }

View file

@ -1,9 +1,16 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_authelia_for_hedgedoc"
}
},
{ {
"name": "configuration | compute client secret hash", "name": "configuration | compute client secret hash",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.shell": {
"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_hedgedoc_client_secret}} | cut --delimiter=' ' --fields='2-'" "cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_hedgedoc.client_secret}} | cut --delimiter=' ' --fields='2-'"
}, },
"register": "temp_authelia_for_hedgedoc_client_secret_hashed" "register": "temp_authelia_for_hedgedoc_client_secret_hashed"
}, },

View file

@ -1,5 +1,5 @@
{ {
"client_id": "{{var_authelia_for_hedgedoc_client_id}}", "client_id": "{{cfg_authelia_for_hedgedoc.client_id}}",
"client_secret": "{{temp_authelia_for_hedgedoc_client_secret_hashed.stdout}}", "client_secret": "{{temp_authelia_for_hedgedoc_client_secret_hashed.stdout}}",
"client_name": "Hedgedoc", "client_name": "Hedgedoc",
"public": false, "public": false,
@ -10,7 +10,7 @@
"profile" "profile"
], ],
"redirect_uris": [ "redirect_uris": [
"{{var_authelia_for_hedgedoc_hedgedoc_url_base}}/auth/oauth2/callback" "{{cfg_authelia_for_hedgedoc.hedgedoc_url_base}}/auth/oauth2/callback"
], ],
"response_types": [ "response_types": [
"code" "code"

View file

@ -0,0 +1,97 @@
{
"nullable": false,
"type": "object",
"properties": {
"owncloud_url_base": {
"nullable": false,
"type": "string"
},
"web": {
"nullable": true,
"type": "object",
"properties": {
"client_id": {
"nullable": false,
"type": "string",
"default": "owncloud_web"
}
},
"additionalProperties": false,
"required": [
],
"default": {
}
},
"desktop": {
"nullable": true,
"type": "object",
"properties": {
"client_id": {
"nullable": false,
"type": "string",
"default": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69"
},
"client_secret": {
"nullable": false,
"type": "string",
"default": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
}
},
"additionalProperties": false,
"required": [
],
"default": {
}
},
"android": {
"nullable": true,
"type": "object",
"properties": {
"client_id": {
"nullable": false,
"type": "string",
"default": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD"
},
"client_secret": {
"nullable": false,
"type": "string",
"default": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
}
},
"additionalProperties": false,
"required": [
],
"default": {
}
},
"ios": {
"nullable": true,
"type": "object",
"properties": {
"client_id": {
"nullable": false,
"type": "string",
"default": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1"
},
"client_secret": {
"nullable": false,
"type": "string",
"default": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
}
},
"additionalProperties": false,
"required": [
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"owncloud_url_base",
"web",
"desktop",
"android",
"ios"
]
}

View file

@ -1,10 +1,19 @@
{ {
"var_authelia_for_owncloud_owncloud_url_base": "https://owncloud.example.org", "cfg_authelia_for_owncloud_defaults": {
"var_authelia_for_owncloud_web_client_id": "owncloud_web", "web": {
"var_authelia_for_owncloud_android_client_id": "owncloud_android", "client_id": "owncloud_web"
"var_authelia_for_owncloud_android_client_secret": "REPLACE_ME", },
"var_authelia_for_owncloud_ios_client_id": "owncloud_ios", "desktop": {
"var_authelia_for_owncloud_ios_client_secret": "REPLACE_ME", "client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69",
"var_authelia_for_owncloud_desktop_client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69", "client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh"
"var_authelia_for_owncloud_desktop_client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh" },
"android": {
"client_id": "e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD",
"client_secret": "dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD"
},
"ios": {
"client_id": "mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1",
"client_secret": "KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx"
}
}
} }

View file

@ -1,49 +1,95 @@
[ [
{ {
"name": "configuration | compute client secret hash | web", "name": "show vars",
"become": true, "when": "switch_show_vars",
"ansible.builtin.shell": { "ansible.builtin.debug": {
"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_web_client_secret}} | cut --delimiter=' ' --fields='2-'" "var": "vars.cfg_authelia_for_owncloud"
}, }
"register": "temp_authelia_for_owncloud_web_client_secret_hashed"
}, },
{ {
"name": "configuration | compute client secret hash | android", "name": "configuration | client",
"block": [
{
"name": "configuration | client | web",
"when": "cfg_authelia_for_owncloud.web != None",
"block": [
{
"name": "emplace",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.template": {
"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_android_client_secret}} | cut --delimiter=' ' --fields='2-'" "src": "authelia-client-conf-web.json.j2",
}, "dest": "/etc/authelia/conf.d/clients/owncloud-web.json"
"register": "temp_authelia_for_owncloud_android_client_secret_hashed" }
}
]
}, },
{ {
"name": "configuration | compute client secret hash | ios", "name": "configuration | client | desktop",
"become": true, "when": "cfg_authelia_for_owncloud.desktop != None",
"ansible.builtin.shell": { "block": [
"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_ios_client_secret}} | cut --delimiter=' ' --fields='2-'"
},
"register": "temp_authelia_for_owncloud_ios_client_secret_hashed"
},
{ {
"name": "configuration | compute client secret hash | desktop", "name": "compute client secret hash",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.shell": {
"cmd": "authelia crypto hash generate bcrypt --password {{var_authelia_for_owncloud_desktop_client_secret}} | cut --delimiter=' ' --fields='2-'" "cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.desktop.client_secret}} | cut --delimiter=' ' --fields='2-'"
}, },
"register": "temp_authelia_for_owncloud_desktop_client_secret_hashed" "register": "temp_authelia_for_owncloud_desktop_client_secret_hashed"
}, },
{ {
"name": "configuration | emplace", "name": "emplace",
"become": true, "become": true,
"loop": [
{"src": "authelia-client-conf-web.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-web.json"},
{"src": "authelia-client-conf-desktop.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-desktop.json"},
{"src": "authelia-client-conf-android.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-android.json"},
{"src": "authelia-client-conf-ios.json.j2", "dest": "/etc/authelia/conf.d/clients/owncloud-ios.json"}
],
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "{{item.src}}", "src": "authelia-client-conf-desktop.json.j2",
"dest": "{{item.dest}}" "dest": "/etc/authelia/conf.d/clients/owncloud-desktop.json"
} }
}
]
},
{
"name": "configuration | client | android",
"when": "cfg_authelia_for_owncloud.android != None",
"block": [
{
"name": "compute client secret hash",
"become": true,
"ansible.builtin.shell": {
"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.android.client_secret}} | cut --delimiter=' ' --fields='2-'"
},
"register": "temp_authelia_for_owncloud_android_client_secret_hashed"
},
{
"name": "emplace",
"become": true,
"ansible.builtin.template": {
"src": "authelia-client-conf-android.json.j2",
"dest": "/etc/authelia/conf.d/clients/owncloud-android.json"
}
}
]
},
{
"name": "configuration | client | ios",
"when": "cfg_authelia_for_owncloud.ios != None",
"block": [
{
"name": "compute client secret hash",
"become": true,
"ansible.builtin.shell": {
"cmd": "authelia crypto hash generate bcrypt --password {{cfg_authelia_for_owncloud.ios.client_secret}} | cut --delimiter=' ' --fields='2-'"
},
"register": "temp_authelia_for_owncloud_ios_client_secret_hashed"
},
{
"name": "emplace",
"become": true,
"ansible.builtin.template": {
"src": "authelia-client-conf-ios.json.j2",
"dest": "/etc/authelia/conf.d/clients/owncloud-ios.json"
}
}
]
}
]
}, },
{ {
"name": "configuration | apply", "name": "configuration | apply",

View file

@ -1,19 +1,33 @@
{ {
"client_id": "{{var_authelia_for_owncloud_android_client_id}}", "client_id": "{{cfg_authelia_for_owncloud.android.client_id}}",
"client_secret": "{{temp_authelia_for_owncloud_android_client_secret_hashed.stdout}}", "client_secret": "{{temp_authelia_for_owncloud_android_client_secret_hashed.stdout}}",
"client_name": "ownCloud | Android Client", "client_name": "ownCloud | Android Client",
"public": false,
"authorization_policy": "one_factor", "authorization_policy": "one_factor",
"require_pkce": true,
"pkce_challenge_method": "S256",
"scopes": [ "scopes": [
"openid", "openid",
"offline_access",
"groups", "groups",
"profile", "profile",
"email", "email"
"offline_access" ],
"redirect_uris": [
"oc://android.owncloud.com"
], ],
"response_types": [ "response_types": [
"code" "code"
], ],
"redirect_uris": [ "grant_types": [
"oc://android.owncloud.com" "authorization_code",
] "refresh_token"
],
"access_token_signed_response_alg": "none",
"userinfo_signed_response_alg": "none",
"token_endpoint_auth_method": "client_secret_basic"
} }

View file

@ -1,20 +1,33 @@
{ {
"client_id": "{{var_authelia_for_owncloud_desktop_client_id}}", "client_id": "{{cfg_authelia_for_owncloud.desktop.client_id}}",
"client_secret": "{{temp_authelia_for_owncloud_desktop_client_secret_hashed.stdout}}", "client_secret": "{{temp_authelia_for_owncloud_desktop_client_secret_hashed.stdout}}",
"client_name": "ownCloud | Desktop Client", "client_name": "ownCloud | Desktop Client",
"public": false,
"authorization_policy": "one_factor", "authorization_policy": "one_factor",
"require_pkce": true,
"pkce_challenge_method": "S256",
"scopes": [ "scopes": [
"openid", "openid",
"offline_access",
"groups", "groups",
"profile", "profile",
"email", "email"
"offline_access"
],
"response_types": [
"code"
], ],
"redirect_uris": [ "redirect_uris": [
"http://127.0.0.1", "http://127.0.0.1",
"http://localhost" "http://localhost"
]
],
"response_types": [
"code"
],
"grant_types": [
"authorization_code",
"refresh_token"
],
"access_token_signed_response_alg": "none",
"userinfo_signed_response_alg": "none",
"token_endpoint_auth_method": "client_secret_basic"
} }

View file

@ -1,20 +1,33 @@
{ {
"client_id": "{{var_authelia_for_owncloud_ios_client_id}}", "client_id": "{{cfg_authelia_for_owncloud.ios.client_id}}",
"client_secret": "{{temp_authelia_for_owncloud_ios_client_secret_hashed.stdout}}", "client_secret": "{{temp_authelia_for_owncloud_ios_client_secret_hashed.stdout}}",
"client_name": "ownCloud | iOS Client", "client_name": "ownCloud | iOS Client",
"public": false,
"authorization_policy": "one_factor", "authorization_policy": "one_factor",
"require_pkce": true,
"pkce_challenge_method": "S256",
"scopes": [ "scopes": [
"openid", "openid",
"offline_access",
"groups", "groups",
"profile", "profile",
"email", "email"
"offline_access"
],
"response_types": [
"code"
], ],
"redirect_uris": [ "redirect_uris": [
"oc://ios.owncloud.com", "oc://ios.owncloud.com",
"oc.ios://ios.owncloud.com" "oc.ios://ios.owncloud.com"
]
],
"response_types": [
"code"
],
"grant_types": [
"authorization_code",
"refresh_token"
],
"access_token_signed_response_alg": "none",
"userinfo_signed_response_alg": "none",
"token_endpoint_auth_method": "client_secret_basic"
} }

View file

@ -1,20 +1,33 @@
{ {
"client_id": "{{var_authelia_for_owncloud_web_client_id}}", "client_id": "{{cfg_authelia_for_owncloud.web.client_id}}",
"client_name": "ownCloud | Web Client", "client_name": "ownCloud | Web Client",
"lifespan": "long",
"public": true, "public": true,
"authorization_policy": "one_factor", "authorization_policy": "one_factor",
"require_pkce": true,
"pkce_challenge_method": "S256",
"scopes": [ "scopes": [
"openid", "openid",
"email", "offline_access",
"groups",
"profile", "profile",
"groups" "email"
],
"redirect_uris": [
"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}",
"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/oidc-callback.html",
"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/oidc-silent-redirect.html",
"https://{{cfg_authelia_for_owncloud.owncloud_url_base}}/apps/openidconnect/redirect"
], ],
"response_types": [ "response_types": [
"code" "code"
], ],
"redirect_uris": [ "grant_types": [
"{{var_authelia_for_owncloud_owncloud_url_base}}", "authorization_code",
"{{var_authelia_for_owncloud_owncloud_url_base}}/oidc-callback.html", "refresh_token"
"{{var_authelia_for_owncloud_owncloud_url_base}}/oidc-silent-redirect.html" ],
] "access_token_signed_response_alg": "none",
"userinfo_signed_response_alg": "none",
"token_endpoint_auth_method": "none"
} }

View file

@ -1,34 +0,0 @@
{
"owncloud_url_base": {
"type": "string",
"mandatory": false
},
"web_client_id": {
"type": "string",
"mandatory": false
},
"android_client_id": {
"type": "string",
"mandatory": false
},
"android_client_secret": {
"type": "string",
"mandatory": true
},
"ios_client_id": {
"type": "string",
"mandatory": false
},
"ios_client_secret": {
"type": "string",
"mandatory": true
},
"dektop_client_id": {
"type": "string",
"mandatory": false
},
"desktop_client_secret": {
"type": "string",
"mandatory": false
}
}

View file

@ -0,0 +1,449 @@
{
"nullable": false,
"type": "object",
"properties": {
"listen_address": {
"nullable": false,
"type": "string",
"default": "0.0.0.0"
},
"domain": {
"nullable": false,
"type": "string"
},
"session_domain": {
"nullable": false,
"type": "string"
},
"redirect_url": {
"nullable": false,
"type": "string"
},
"jwt_secret": {
"nullable": false,
"type": "string"
},
"session_secret": {
"nullable": false,
"type": "string"
},
"storage_encryption_key": {
"nullable": false,
"type": "string"
},
"users_file_path": {
"nullable": false,
"type": "string",
"default": "/var/authelia/users.yml"
},
"log_file_path": {
"nullable": false,
"type": "string",
"default": "/var/authelia/log.jsonl"
},
"storage": {
"anyOf": [
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["sqlite"],
"default": "sqlite"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"path": {
"nullable": false,
"type": "string",
"default": "/var/authelia/state.db"
}
},
"additionalProperties": false,
"required": [
"path"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
],
"default": {
}
},
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["postgresql"]
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"host": {
"nullable": false,
"type": "string",
"ddefault": "localhost"
},
"port": {
"nullable": false,
"type": "integer",
"default": 5432
},
"username": {
"nullable": false,
"type": "string",
"default": "authelia_user"
},
"password": {
"nullable": false,
"type": "string"
},
"schema": {
"nullable": false,
"type": "string",
"default": "authelia"
}
},
"additionalProperties": false,
"required": [
"host",
"port",
"username",
"password",
"schema"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
],
"default": {
}
},
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["mariadb"]
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"host": {
"nullable": false,
"type": "string",
"ddefault": "localhost"
},
"port": {
"nullable": false,
"type": "integer",
"default": 3306
},
"username": {
"nullable": false,
"type": "string",
"default": "authelia_user"
},
"password": {
"nullable": false,
"type": "string"
},
"schema": {
"nullable": false,
"type": "string",
"default": "authelia"
}
},
"additionalProperties": false,
"required": [
"host",
"port",
"username",
"password",
"schema"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
],
"default": {
}
}
]
},
"ntp_server": {
"nullable": false,
"type": "string",
"default": "time.cloudflare.com:123"
},
"password_reset": {
"nullable": false,
"type": "object",
"properties": {
"enabled": {
"nullable": false,
"type": "boolean",
"default": false
},
"custom_url": {
"nullable": true,
"type": "string",
"default": null
}
},
"additionalProperties": false,
"required": [
"enabled",
"custom_url"
],
"default": {
}
},
"notification": {
"anyOf": [
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["file"],
"default": "file"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"path": {
"nullable": false,
"type": "string",
"default": "/var/authelia/notifications"
}
},
"additionalProperties": false,
"required": [
"path"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
],
"default": {
}
},
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["smtp"],
"default": "smtp"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"host": {
"nullable": false,
"type": "string"
},
"port": {
"nullable": false,
"type": "integer",
"default": 465
},
"username": {
"nullable": false,
"type": "string",
"default": "authelia"
},
"password": {
"nullable": false,
"type": "string"
},
"sender": {
"nullable": false,
"type": "string",
"default": "authelia@example.org"
}
},
"additionalProperties": false,
"required": [
"host",
"port",
"username",
"password",
"sender"
]
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
],
"default": {
}
}
]
},
"oidc": {
"nullable": false,
"type": "object",
"properties": {
"hmac_secret": {
"nullable": false,
"type": "string"
},
"lifespan": {
"nullable": false,
"type": "object",
"properties": {
"default": {
"nullable": false,
"type": "object",
"properties": {
"access_token": {
"nullable": false,
"type": "string",
"default": "1h"
},
"refresh_token": {
"nullable": false,
"type": "string",
"default": "1m"
}
},
"additionalProperties": false,
"required": [
],
"default": {
}
},
"custom": {
"nullable": false,
"type": "object",
"properties": {
},
"additionalProperties": {
"nullable": false,
"type": "object",
"properties": {
"access_token": {
"nullable": false,
"type": "string"
},
"refresh_token": {
"nullable": false,
"type": "string"
}
},
"additionalProperties": false,
"required": [
"access_token",
"refresh_token"
]
},
"required": [
],
"default": {
"long": {
"access_token": "2d",
"refresh_token": "3d"
}
}
}
},
"additionalProperties": false,
"required": [
],
"default": {
}
},
"cors_endpoints": {
"nullable": true,
"type": "array",
"items": {
"nullable": false,
"type": "string",
"enum": [
"authorization",
"pushed-authorization-request",
"token",
"revocation",
"introspection",
"userinfo"
]
},
"default": [
"authorization",
"token",
"revocation",
"introspection",
"userinfo"
]
}
},
"additionalProperties": false,
"required": [
"hmac_secret",
"lifespan",
"cors_endpoints"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"listen_address",
"domain",
"session_domain",
"redirect_url",
"jwt_secret",
"session_secret",
"storage_encryption_key",
"users_file_path",
"log_file_path",
"storage",
"ntp_server",
"notification",
"oidc"
],
"default": {
}
}

View file

@ -1,39 +1,45 @@
{ {
"var_authelia_version": "4.37.5", "cfg_authelia_defaults": {
"var_authelia_architecture": "amd64", "listen_address": "0.0.0.0",
"var_authelia_listen_address": "0.0.0.0", "users_file_path": "/var/authelia/users.yml",
"var_authelia_jwt_secret": "REPLACE_ME", "log_file_path": "/var/authelia/log.jsonl",
"var_authelia_users_file_path": "/var/authelia/users.yml", "storage": {
"var_authelia_log_file_path": "/var/authelia/log.jsonl", "kind": "sqlite",
"var_authelia_domain": "authelia.example.org", "data": {
"var_authelia_redirect_url": "https://example.org", "path": "/var/authelia/state.db"
"var_authelia_session_domain": "example.org", }
"var_authelia_session_secret": "REPLACE_ME", },
"var_authelia_storage_encryption_key": "REPLACE_ME", "ntp_server": "time.cloudflare.com:123",
"var_authelia_storage_kind": "sqlite", "password_reset": {
"var_authelia_storage_data_sqlite_path": "/var/authelia/state.db", "enabled": false,
"var_authelia_storage_data_postgresql_host": "localhost", "custom_url": null
"var_authelia_storage_data_postgresql_port": 5432, },
"var_authelia_storage_data_postgresql_username": "authelia_user", "notification": {
"var_authelia_storage_data_postgresql_password": "REPLACE_ME", "kind": "file",
"var_authelia_storage_data_postgresql_schema": "authelia", "data": {
"var_authelia_storage_data_mariadb_host": "localhost", "path": "/var/authelia/notifications"
"var_authelia_storage_data_mariadb_port": 3306, }
"var_authelia_storage_data_mariadb_username": "authelia_user", },
"var_authelia_storage_data_mariadb_password": "REPLACE_ME", "oidc": {
"var_authelia_storage_data_mariadb_schema": "authelia", "lifespan": {
"var_authelia_ntp_server": "time.cloudflare.com:123", "default": {
"var_authelia_password_reset_enabled": false, "access_token": "1d",
"var_authelia_password_reset_custom_url": null, "refresh_token": "1h"
"var_authelia_notification_mode": "smtp", },
"var_authelia_notification_file_path": "/var/authelia/notifications", "custom": {
"var_authelia_notification_smtp_host": "smtp.example.org", "long": {
"var_authelia_notification_smtp_port": 465, "access_token": "2d",
"var_authelia_notification_smtp_username": "authelia", "refresh_token": "3d"
"var_authelia_notification_smtp_password": "REPLACE_ME", }
"var_authelia_notification_smtp_sender": "authelia@example.org", }
"var_authelia_oidc_hmac_secret": "REPLACE_ME", },
"var_authelia_oidc_lifespan_access_token": "1h", "cors_endpoints": [
"var_authelia_oidc_lifespan_refresh_token": "1m", "authorization",
"var_authelia_oidc_cors_endpoints": null "token",
"revocation",
"introspection",
"userinfo"
]
}
}
} }

View file

@ -1,6 +1,16 @@
[ [
{ {
"name": "packages | prerequisites", "name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_authelia"
}
},
{
"name": "packages",
"block": [
{
"name": "prerequisites",
"become": true, "become": true,
"ansible.builtin.apt": { "ansible.builtin.apt": {
"update_cache": true, "update_cache": true,
@ -12,7 +22,7 @@
} }
}, },
{ {
"name": "packages | keys", "name": "keys",
"become": true, "become": true,
"ansible.builtin.get_url": { "ansible.builtin.get_url": {
"url": "https://www.authelia.com/keys/authelia-security.gpg", "url": "https://www.authelia.com/keys/authelia-security.gpg",
@ -20,7 +30,7 @@
} }
}, },
{ {
"name": "packages | repository", "name": "repository",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.shell": {
"cmd": "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/authelia-security.gpg] https://apt.authelia.com stable main\" > /etc/apt/sources.list.d/authelia.list", "cmd": "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/authelia-security.gpg] https://apt.authelia.com stable main\" > /etc/apt/sources.list.d/authelia.list",
@ -29,7 +39,7 @@
}, },
{ {
"name": "packages | installation", "name": "installation",
"become": true, "become": true,
"ansible.builtin.apt": { "ansible.builtin.apt": {
"update_cache": true, "update_cache": true,
@ -40,6 +50,8 @@
"authelia" "authelia"
] ]
} }
}
]
}, },
{ {
"name": "generate private key for signing OIDC JWTs", "name": "generate private key for signing OIDC JWTs",
@ -52,6 +64,9 @@
}, },
"register": "temp_tls_result" "register": "temp_tls_result"
}, },
{
"name": "configuration",
"block": [
{ {
"name": "configuration | compose script", "name": "configuration | compose script",
"become": true, "become": true,
@ -87,40 +102,51 @@
"ansible.builtin.command": { "ansible.builtin.command": {
"cmd": "/usr/bin/authelia-conf-compose --main-file-path=/etc/authelia/conf.d/main.json --clients-directory-path=/etc/authelia/conf.d/clients --output-format=yaml --output-path=/etc/authelia/configuration.yml" "cmd": "/usr/bin/authelia-conf-compose --main-file-path=/etc/authelia/conf.d/main.json --clients-directory-path=/etc/authelia/conf.d/clients --output-format=yaml --output-path=/etc/authelia/configuration.yml"
} }
}
]
}, },
{ {
"name": "setup log directory", "name": "setup log directory",
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
"path": "{{var_authelia_log_file_path | dirname}}" "owner": "authelia",
"group": "authelia",
"path": "{{cfg_authelia.log_file_path | dirname}}"
} }
}, },
{ {
"name": "users | directory", "name": "users",
"block": [
{
"name": "directory",
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "directory", "state": "directory",
"path": "{{var_authelia_users_file_path | dirname}}" "owner": "authelia",
"group": "authelia",
"path": "{{cfg_authelia.users_file_path | dirname}}"
} }
}, },
{ {
"name": "users | initial file", "name": "initial file",
"become": true, "become": true,
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "users.yml.j2", "src": "users.yml.j2",
"dest": "{{var_authelia_users_file_path}}", "dest": "{{cfg_authelia.users_file_path}}",
"force": false "force": false
} }
}, },
{ {
"name": "users | management script", "name": "management script",
"become": true, "become": true,
"ansible.builtin.copy": { "ansible.builtin.copy": {
"src": "user-manage.py", "src": "user-manage.py",
"dest": "/usr/bin/authelia-user-manage", "dest": "/usr/bin/authelia-user-manage",
"mode": "0700" "mode": "0700"
} }
}
]
}, },
{ {
"name": "apply", "name": "apply",

View file

@ -2,12 +2,12 @@
"theme": "auto", "theme": "auto",
"identity_validation": { "identity_validation": {
"reset_password": { "reset_password": {
"jwt_secret": "{{var_authelia_jwt_secret}}" "jwt_secret": "{{cfg_authelia.jwt_secret}}"
} }
}, },
"default_2fa_method": "totp", "default_2fa_method": "totp",
"server": { "server": {
"address": "{{var_authelia_listen_address}}:9091", "address": "{{cfg_authelia.listen_address}}:9091",
"endpoints": { "endpoints": {
"enable_pprof": false, "enable_pprof": false,
"enable_expvars": false "enable_expvars": false
@ -17,7 +17,7 @@
"log": { "log": {
"level": "info", "level": "info",
"format": "json", "format": "json",
"file_path": "{{var_authelia_log_file_path}}", "file_path": "{{cfg_authelia.log_file_path}}",
"keep_stdout": false "keep_stdout": false
}, },
"telemetry": { "telemetry": {
@ -43,7 +43,7 @@
"user_verification": "preferred" "user_verification": "preferred"
}, },
"ntp": { "ntp": {
"address": "{{var_authelia_ntp_server}}", "address": "{{cfg_authelia.ntp_server}}",
"version": 4, "version": 4,
"max_desync": "3s", "max_desync": "3s",
"disable_startup_check": false, "disable_startup_check": false,
@ -51,16 +51,16 @@
}, },
"authentication_backend": { "authentication_backend": {
"password_reset": { "password_reset": {
{% if var_authelia_password_reset_enabled %} {% if cfg_authelia.password_reset.enabled %}
"disable": false, "disable": false,
{% else %} {% else %}
"disable": true, "disable": true,
{% endif %} {% endif %}
"custom_url": "{{var_authelia_password_reset_custom_url}}" "custom_url": {{cfg_authelia.password_reset.custom_url | to_json}}
}, },
"refresh_interval": "5m", "refresh_interval": "5m",
"file": { "file": {
"path": "{{var_authelia_users_file_path}}", "path": "{{cfg_authelia.users_file_path}}",
"watch": true, "watch": true,
"search": { "search": {
"email": false, "email": false,
@ -121,15 +121,15 @@
"session": { "session": {
"name": "authelia_session", "name": "authelia_session",
"same_site": "lax", "same_site": "lax",
"secret": "{{var_authelia_session_secret}}", "secret": "{{cfg_authelia.session_secret}}",
"expiration": "1h", "expiration": "1h",
"inactivity": "5m", "inactivity": "5m",
"remember_me": "1M", "remember_me": "1M",
"cookies": [ "cookies": [
{ {
"domain": "{{var_authelia_session_domain}}", "domain": "{{cfg_authelia.session_domain}}",
"authelia_url": "https://{{var_authelia_domain}}/", "authelia_url": "https://{{cfg_authelia.domain}}/",
"default_redirection_url": "{{var_authelia_redirect_url}}" "default_redirection_url": "{{cfg_authelia.redirect_url}}"
} }
] ]
}, },
@ -139,44 +139,44 @@
"ban_time": "5m" "ban_time": "5m"
}, },
"storage": { "storage": {
"encryption_key": "{{var_authelia_storage_encryption_key}}", "encryption_key": "{{cfg_authelia.storage_encryption_key}}",
{% if var_authelia_storage_kind == "sqlite" %} {% if cfg_authelia.storage.kind == "sqlite" %}
"local": { "local": {
"path": "{{var_authelia_storage_data_sqlite_path}}" "path": "{{cfg_authelia.storage.data.path}}"
} }
{% endif %} {% endif %}
{% if var_authelia_storage_kind == "postgresql" %} {% if cfg_authelia.storage.kind == "postgresql" %}
"postgres": { "postgres": {
"address": "{{var_authelia_storage_data_postgresql_host}}:{{var_authelia_storage_data_postgresql_port | string}}", "address": "{{cfg_authelia.storage.data.host}}:{{cfg_authelia.storage.data.port | string}}",
"schema": "public", "schema": "public",
"username": "{{var_authelia_storage_data_postgresql_username}}", "username": "{{cfg_authelia.storage.data.username}}",
"password": "{{var_authelia_storage_data_postgresql_password}}", "password": "{{cfg_authelia.storage.data.password}}",
"database": "{{var_authelia_storage_data_postgresql_schema}}" "database": "{{cfg_authelia.storage.data.schema}}"
} }
{% endif %} {% endif %}
{% if var_authelia_storage_kind == "mariadb" %} {% if cfg_authelia.storage.kind == "mariadb" %}
"mysql": { "mysql": {
"host": "{{var_authelia_storage_data_mariadb_host}}", "host": "{{cfg_authelia.storage.data.host}}",
"port": {{var_authelia_storage_data_mariadb_port | string}}, "port": {{cfg_authelia.storage.data.port | string}},
"username": "{{var_authelia_storage_data_mariadb_username}}", "username": "{{cfg_authelia.storage.data.username}}",
"password": "{{var_authelia_storage_data_mariadb_password}}", "password": "{{cfg_authelia.storage.data.password}}",
"database": "{{var_authelia_storage_data_mariadb_schema}}" "database": "{{cfg_authelia.storage.data.schema}}"
} }
{% endif %} {% endif %}
}, },
"notifier": { "notifier": {
"disable_startup_check": true, "disable_startup_check": true,
{% if var_authelia_notification_mode == "file" %} {% if cfg_authelia.notification.kind == "file" %}
"filesystem": { "filesystem": {
"filename": "{{var_authelia_notification_file_path}}" "filename": "{{cfg_authelia.notification.data.path}}"
} }
{% endif %} {% endif %}
{% if var_authelia_notification_mode == "smtp" %} {% if cfg_authelia.notification.kind == "smtp" %}
"smtp": { "smtp": {
"address": "{{var_authelia_notification_smtp_host}}:{{var_authelia_notification_smtp_port | string}}", "address": "{{cfg_authelia.notification.data.host}}:{{cfg_authelia.notification.data.port | string}}",
"username": "{{var_authelia_notification_smtp_username}}", "username": "{{cfg_authelia.notification.data.username}}",
"password": "{{var_authelia_notification_smtp_password}}", "password": "{{cfg_authelia.notification.data.password}}",
"sender": "{{var_authelia_notification_smtp_sender}}", "sender": "{{cfg_authelia.notification.data.sender}}",
"disable_require_tls": false, "disable_require_tls": false,
"disable_html_emails": false, "disable_html_emails": false,
"tls": { "tls": {
@ -187,7 +187,7 @@
}, },
"identity_providers": { "identity_providers": {
"oidc": { "oidc": {
"hmac_secret": "{{var_authelia_oidc_hmac_secret}}", "hmac_secret": "{{cfg_authelia.oidc.hmac_secret}}",
"jwks": [ "jwks": [
{ {
"algorithm": "RS256", "algorithm": "RS256",
@ -195,14 +195,15 @@
} }
], ],
"lifespans": { "lifespans": {
"access_token": "{{var_authelia_oidc_lifespan_access_token}}", "access_token": "{{cfg_authelia.oidc.lifespan.default.access_token}}",
"refresh_token": "{{var_authelia_oidc_lifespan_refresh_token}}" "refresh_token": "{{cfg_authelia.oidc.lifespan.default.refresh_token}}",
"custom": {{cfg_authelia.oidc.lifespan.custom | to_json}}
}, },
"cors": { "cors": {
"allowed_origins_from_client_redirect_uris": true "allowed_origins_from_client_redirect_uris": true
{% if var_authelia_oidc_cors_endpoints == None %} {% if cfg_authelia.oidc.cors_endpoints == None %}
{% else %} {% else %}
,"endpoints": {{var_authelia_oidc_cors_endpoints | to_json}} ,"endpoints": {{cfg_authelia.oidc.cors_endpoints | to_json}}
{% endif %} {% endif %}
}, },
"clients": [ "clients": [

View file

@ -1,169 +0,0 @@
{
"version": {
"type": "string",
"mandatory": false
},
"architecture": {
"type": "string",
"mandatory": false
},
"listen_address": {
"type": "string",
"mandatory": false
},
"jwt_secret": {
"type": "string",
"mandatory": true
},
"users_file_path": {
"type": "string",
"mandatory": false
},
"log_file_path": {
"type": "string",
"mandatory": false
},
"domain": {
"type": "string",
"mandatory": false
},
"redirect_url": {
"type": "string",
"mandatory": false
},
"session_domain": {
"type": "string",
"mandatory": false
},
"session_secret": {
"type": "string",
"mandatory": true
},
"storage_encryption_key": {
"type": "string",
"mandatory": true
},
"storage_kind": {
"type": "string",
"mandatory": false
},
"storage_data_sqlite_path": {
"type": "string",
"mandatory": false
},
"storage_data_postgresql_host": {
"type": "string",
"mandatory": false
},
"storage_data_postgresql_port": {
"type": "integer",
"mandatory": false
},
"storage_data_postgresql_username": {
"type": "string",
"mandatory": false
},
"storage_data_postgresql_password": {
"type": "string",
"mandatory": false
},
"storage_data_postgresql_schema": {
"type": "string",
"mandatory": false
},
"storage_data_mariadb_host": {
"type": "string",
"mandatory": false
},
"storage_data_mariadb_port": {
"type": "integer",
"mandatory": false
},
"storage_data_mariadb_username": {
"type": "string",
"mandatory": false
},
"storage_data_mariadb_password": {
"type": "string",
"mandatory": false
},
"storage_data_mariadb_schema": {
"type": "string",
"mandatory": false
},
"ntp_server": {
"type": "string",
"mandatory": false
},
"password_reset_enabled": {
"type": "boolean",
"mandatory": false
},
"password_reset_custom_url": {
"nullable": true,
"type": "string",
"mandatory": false
},
"notification_mode": {
"type": "string",
"mandatory": false,
"options": [
"file",
"smtp"
]
},
"notification_file_path": {
"type": "string",
"mandatory": false
},
"notification_smtp_host": {
"type": "string",
"mandatory": false
},
"notification_smtp_port": {
"type": "integer",
"mandatory": false
},
"notification_smtp_username": {
"type": "string",
"mandatory": false
},
"notification_smtp_password": {
"type": "string",
"mandatory": false
},
"notification_smtp_sender": {
"type": "string",
"mandatory": false
},
"oidc_hmac_secret": {
"type": "string",
"mandatory": true
},
"oidc_lifespan_access_token": {
"nullable": true,
"type": "string",
"mandatory": false
},
"oidc_lifespan_refresh_token": {
"nullable": true,
"type": "string",
"mandatory": false
},
"oidc_cors_endpoints": {
"nullable": true,
"type": "array",
"items": {
"type": "string",
"enum": [
"authorization",
"pushed-authorization-request",
"token",
"revocation",
"introspection",
"userinfo"
]
},
"mandatory": false
}
}

View file

@ -0,0 +1,24 @@
{
"nullable": false,
"type": "object",
"properties": {
"domain": {
"nullable": false,
"type": "string"
},
"tls_mode": {
"nullable": false,
"type": "string",
"options": [
"disable",
"enable",
"force"
],
"default": "force"
}
},
"additionalProperties": false,
"required": [
"domain"
]
}

View file

@ -1,4 +1,5 @@
{ {
"var_hedgedoc_and_nginx_domain": "hedgedoc.example.org", "cfg_hedgedoc_and_nginx_defaults": {
"var_hedgedoc_and_nginx_tls_mode": "force" "tls_mode": "force"
}
} }

View file

@ -1,4 +1,11 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_hedgedoc_and_nginx"
}
},
{ {
"name": "deactivate default site", "name": "deactivate default site",
"become": true, "become": true,
@ -12,7 +19,7 @@
"become": true, "become": true,
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "conf.j2", "src": "conf.j2",
"dest": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}" "dest": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}"
} }
}, },
{ {
@ -20,8 +27,8 @@
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "link", "state": "link",
"src": "/etc/nginx/sites-available/{{var_hedgedoc_and_nginx_domain}}", "src": "/etc/nginx/sites-available/{{cfg_hedgedoc_and_nginx.domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_hedgedoc_and_nginx_domain}}" "dest": "/etc/nginx/sites-enabled/{{cfg_hedgedoc_and_nginx.domain}}"
} }
}, },
{ {

View file

@ -24,27 +24,27 @@ map $http_upgrade $connection_upgrade {
{% endmacro %} {% endmacro %}
server { server {
server_name {{var_hedgedoc_and_nginx_domain}}; server_name {{cfg_hedgedoc_and_nginx.domain}};
listen 80; listen 80;
listen [::]:80; listen [::]:80;
{% if (var_element_and_nginx_tls_mode == 'force') %} {% if (cfg_hedgedoc_and_nginx.tls_mode == 'force') %}
return 301 https://$http_host$request_uri; return 301 https://$http_host$request_uri;
{% else %} {% else %}
{{ hedgedoc_common() }} {{ hedgedoc_common() }}
{% endif %} {% endif %}
} }
{% if (var_hedgedoc_and_nginx_tls_mode != 'disable') %} {% if (cfg_hedgedoc_and_nginx.tls_mode != 'disable') %}
server { server {
server_name {{var_hedgedoc_and_nginx_domain}}; server_name {{cfg_hedgedoc_and_nginx.domain}};
listen [::]:443 ssl http2; listen [::]:443 ssl http2;
listen 443 ssl http2; listen 443 ssl http2;
ssl_certificate_key /etc/ssl/private/{{var_hedgedoc_and_nginx_domain}}.pem; ssl_certificate_key /etc/ssl/private/{{cfg_hedgedoc_and_nginx.domain}}.pem;
ssl_certificate /etc/ssl/fullchains/{{var_hedgedoc_and_nginx_domain}}.pem; ssl_certificate /etc/ssl/fullchains/{{cfg_hedgedoc_and_nginx.domain}}.pem;
include /etc/nginx/ssl-hardening.conf; include /etc/nginx/ssl-hardening.conf;
{{ hedgedoc_common() }} {{ hedgedoc_common() }}

View file

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

View file

@ -0,0 +1,248 @@
{
"nullable": false,
"type": "object",
"properties": {
"user_name": {
"nullable": false,
"type": "string",
"default": "hedgedoc"
},
"directory": {
"nullable": false,
"type": "string",
"default": "/opt/hedgedoc"
},
"version": {
"nullable": false,
"type": "string",
"default": "1.10.3"
},
"domain": {
"nullable": false,
"type": "string"
},
"session_secret": {
"nullable": false,
"type": "string"
},
"database": {
"anyOf": [
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["sqlite"],
"default": "sqlite"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"path": {
"nullable": false,
"type": "string",
"default": "/var/hedgedoc/data.sqlite"
}
},
"additionalProperties": false,
"required": [
"path"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
]
},
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["postgresql"],
"default": "postgresql"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"host": {
"nullable": false,
"type": "string",
"default": "localhost"
},
"port": {
"nullable": false,
"type": "integer",
"default": 5432
},
"username": {
"nullable": false,
"type": "string",
"default": "hedgedoc_user"
},
"password": {
"nullable": false,
"type": "string"
},
"schema": {
"nullable": false,
"type": "string",
"default": "hedgedoc"
}
},
"additionalProperties": false,
"required": [
"host",
"port",
"username",
"password",
"schema"
]
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
]
}
]
},
"authentication": {
"anyOf": [
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["internal"],
"default": "internal"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
},
"additionalProperties": false,
"required": [
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
]
},
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"nullable": false,
"type": "string",
"enum": ["authelia"],
"default": "authelia"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"url_base": {
"nullable": false,
"type": "string"
},
"client_id": {
"nullable": false,
"type": "string",
"default": "hedgedoc"
},
"client_secret": {
"nullable": false,
"type": "string"
},
"provider_name": {
"nullable": false,
"type": "string",
"default": "Authelia"
}
},
"additionalProperties": false,
"required": [
"url_base",
"client_id",
"client_secret",
"provider_name"
]
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
]
}
]
},
"guest_allow_create": {
"nullable": false,
"type": "boolean",
"default": false
},
"guest_allow_change": {
"nullable": false,
"type": "boolean",
"default": false
},
"free_names_mode": {
"nullable": false,
"type": "string",
"enum": [
"never",
"authed",
"always"
],
"default": "authed"
},
"log_level": {
"nullable": false,
"type": "string",
"enum": [
"debug",
"verbose",
"info",
"warn",
"error"
],
"default": "error"
}
},
"additionalProperties": false,
"required": [
"user_name",
"directory",
"version",
"domain",
"session_secret",
"database",
"authentication",
"guest_allow_create",
"guest_allow_change",
"free_names_mode",
"log_level"
]
}

View file

@ -1,21 +1,22 @@
{ {
"var_hedgedoc_user_name": "hedgedoc", "cfg_hedgedoc_defaults": {
"var_hedgedoc_directory": "/opt/hedgedoc", "user_name": "hedgedoc",
"var_hedgedoc_version": "1.9.9", "directory": "/opt/hedgedoc",
"var_hedgedoc_session_secret": "REPLACE_ME", "version": "1.10.3",
"var_hedgedoc_database_kind": "sqlite", "database": {
"var_hedgedoc_database_data_sqlite_path": "/var/hedgedoc/data.sqlite", "kind": "sqlite",
"var_hedgedoc_database_data_postgresql_host": "localhost", "data": {
"var_hedgedoc_database_data_postgresql_port": 5432, "path": "/var/hedgedoc/data.sqlite"
"var_hedgedoc_database_data_postgresql_username": "hedgedoc_user", }
"var_hedgedoc_database_data_postgresql_password": "REPLACE_ME", },
"var_hedgedoc_database_data_postgresql_schema": "hedgedoc", "authentication": {
"var_hedgedoc_domain": "hedgedoc.example.org", "kind": "internal",
"var_hedgedoc_authentication_kind": "internal", "data": {
"var_hedgedoc_authentication_data_authelia_client_id": "hedgedoc", }
"var_hedgedoc_authentication_data_authelia_client_secret": "REPLACE_ME", },
"var_hedgedoc_authentication_data_authelia_url_base": "https://authelia.example.org", "guest_allow_create": false,
"var_hedgedoc_guest_allow_create": false, "guest_allow_change": false,
"var_hedgedoc_guest_allow_change": false, "free_names_mode": "authed",
"var_hedgedoc_free_names_mode": "authed" "log_level": "error"
}
} }

View file

@ -1,4 +1,11 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_hedgedoc"
}
},
{ {
"name": "packages", "name": "packages",
"become": true, "become": true,
@ -26,16 +33,41 @@
"name": "user", "name": "user",
"become": true, "become": true,
"ansible.builtin.user": { "ansible.builtin.user": {
"name": "{{var_hedgedoc_user_name}}", "name": "{{cfg_hedgedoc.user_name}}",
"create_home": true, "create_home": true,
"home": "{{var_hedgedoc_directory}}" "home": "{{cfg_hedgedoc.directory}}"
} }
}, },
{
"name": "database",
"when": "cfg_hedgedoc.database.kind == 'sqlite'",
"block": [
{
"name": "database | directory",
"become": true,
"ansible.builtin.file": {
"state": "directory",
"path": "{{cfg_hedgedoc.database.data.sqlite.path | dirname}}",
"owner": "{{cfg_hedgedoc.user_name}}"
}
},
{
"name": "database | file",
"become": true,
"ansible.builtin.file": {
"state": "touch",
"path": "{{cfg_hedgedoc.database.data.sqlite.path}}",
"owner": "{{cfg_hedgedoc.user_name}}"
}
}
]
},
{ {
"name": "download", "name": "download",
"become": false, "become": false,
"ansible.builtin.get_url": { "ansible.builtin.get_url": {
"url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{var_hedgedoc_version}}/hedgedoc-{{var_hedgedoc_version}}.tar.gz", "url": "https://github.com/hedgedoc/hedgedoc/releases/download/{{cfg_hedgedoc.version}}/hedgedoc-{{cfg_hedgedoc.version}}.tar.gz",
"dest": "/tmp/hedgedoc.tar.gz" "dest": "/tmp/hedgedoc.tar.gz"
} }
}, },
@ -45,8 +77,8 @@
"ansible.builtin.unarchive": { "ansible.builtin.unarchive": {
"remote_src": true, "remote_src": true,
"src": "/tmp/hedgedoc.tar.gz", "src": "/tmp/hedgedoc.tar.gz",
"dest": "{{var_hedgedoc_directory | dirname}}", "dest": "{{cfg_hedgedoc.directory | dirname}}",
"owner": "{{var_hedgedoc_user_name}}" "owner": "{{cfg_hedgedoc.user_name}}"
} }
}, },
{ {
@ -54,7 +86,7 @@
"become": true, "become": true,
"become_user": "hedgedoc", "become_user": "hedgedoc",
"ansible.builtin.command": { "ansible.builtin.command": {
"chdir": "{{var_hedgedoc_directory}}", "chdir": "{{cfg_hedgedoc.directory}}",
"cmd": "bin/setup" "cmd": "bin/setup"
} }
}, },
@ -63,7 +95,7 @@
"become": true, "become": true,
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "config.json.j2", "src": "config.json.j2",
"dest": "{{var_hedgedoc_directory}}/config.json" "dest": "{{cfg_hedgedoc.directory}}/config.json"
} }
}, },
{ {

View file

@ -1,61 +1,61 @@
{ {
"production": { "production": {
"loglevel": "error", "loglevel": "{{cfg_hedgedoc.log_level}}",
{% if var_hedgedoc_database_kind == 'sqlite' %} {% if cfg_hedgedoc.database.kind == 'sqlite' %}
"db": { "db": {
"dialect": "sqlite", "dialect": "sqlite",
"storage": "{{var_hedgedoc_database_data_sqlite_path}}" "storage": "{{cfg_hedgedoc.database.data.sqlite.path}}"
}, },
{% endif %} {% endif %}
{% if var_hedgedoc_database_kind == 'postgresql' %} {% if cfg_hedgedoc.database.kind == 'postgresql' %}
"db": { "db": {
"dialect": "postgres", "dialect": "postgres",
"host": "{{var_hedgedoc_database_data_postgresql_host}}", "host": "{{cfg_hedgedoc.database.data.postgresql.host}}",
"port": {{var_hedgedoc_database_data_postgresql_port | to_json}}, "port": {{cfg_hedgedoc.database.data.postgresql.port | to_json}},
"username": "{{var_hedgedoc_database_data_postgresql_username}}", "username": "{{cfg_hedgedoc.database.data.postgresql.username}}",
"password": "{{var_hedgedoc_database_data_postgresql_password}}", "password": "{{cfg_hedgedoc.database.data.postgresql.password}}",
"database": "{{var_hedgedoc_database_data_postgresql_schema}}" "database": "{{cfg_hedgedoc.database.data.postgresql.schema}}"
}, },
{% endif %} {% endif %}
"sessionSecret": "{{var_hedgedoc_session_secret}}", "sessionSecret": "{{cfg_hedgedoc.session_secret}}",
"host": "localhost", "host": "localhost",
"allowOrigin": [ "allowOrigin": [
"localhost" "localhost"
], ],
"domain": "{{var_hedgedoc_domain}}", "domain": "{{cfg_hedgedoc.domain}}",
"urlAddPort": false, "urlAddPort": false,
"protocolUseSSL": true, "protocolUseSSL": true,
{% if var_hedgedoc_authentication_kind == 'internal' %} {% if cfg_hedgedoc.authentication.kind == 'internal' %}
"email": true, "email": true,
"allowEmailRegister": true, "allowEmailRegister": true,
{% endif %} {% endif %}
{% if var_hedgedoc_authentication_kind == 'authelia' %} {% if cfg_hedgedoc.authentication.kind == 'authelia' %}
"oauth2": { "oauth2": {
"providerName": "{{var_hedgedoc_authentication_data_authelia_provider_name}}", "providerName": "{{cfg_hedgedoc.authentication.data.authelia.provider_name}}",
"clientID": "{{var_hedgedoc_authentication_data_authelia_client_id}}", "clientID": "{{cfg_hedgedoc.authentication.data.authelia.client_id}}",
"clientSecret": "{{var_hedgedoc_authentication_data_authelia_client_secret}}", "clientSecret": "{{cfg_hedgedoc.authentication.data.authelia.client_secret}}",
"scope": "openid email profile", "scope": "openid email profile",
"userProfileUsernameAttr": "sub", "userProfileUsernameAttr": "sub",
"userProfileDisplayNameAttr": "name", "userProfileDisplayNameAttr": "name",
"userProfileEmailAttr": "email", "userProfileEmailAttr": "email",
"userProfileURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/userinfo", "userProfileURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/userinfo",
"tokenURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/token", "tokenURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/token",
"authorizationURL": "{{var_hedgedoc_authentication_data_authelia_url_base}}/api/oidc/authorization" "authorizationURL": "{{cfg_hedgedoc.authentication.data.authelia.url_base}}/api/oidc/authorization"
}, },
"email": false, "email": false,
"allowEmailRegister": false, "allowEmailRegister": false,
{% endif %} {% endif %}
"allowAnonymous": {{var_hedgedoc_guest_allow_create | to_json}}, "allowAnonymous": {{cfg_hedgedoc.guest_allow_create | to_json}},
"allowAnonymousEdits": {{var_hedgedoc_guest_allow_change | to_json}}, "allowAnonymousEdits": {{cfg_hedgedoc.guest_allow_change | to_json}},
{% if var_hedgedoc_free_names_mode == 'never' %} {% if cfg_hedgedoc.free_names_mode == 'never' %}
"allowFreeURL": false, "allowFreeURL": false,
"requireFreeURLAuthentication": false, "requireFreeURLAuthentication": false,
{% endif %} {% endif %}
{% if var_hedgedoc_free_names_mode == 'authed' %} {% if cfg_hedgedoc.free_names_mode == 'authed' %}
"allowFreeURL": true, "allowFreeURL": true,
"requireFreeURLAuthentication": true, "requireFreeURLAuthentication": true,
{% endif %} {% endif %}
{% if var_hedgedoc_free_names_mode == 'always' %} {% if cfg_hedgedoc.free_names_mode == 'always' %}
"allowFreeURL": true, "allowFreeURL": true,
"requireFreeURLAuthentication": false, "requireFreeURLAuthentication": false,
{% endif %} {% endif %}

View file

@ -3,8 +3,8 @@ Description=Hedgedoc
After=multi-user.target After=multi-user.target
[Service] [Service]
WorkingDirectory={{var_hedgedoc_directory}} WorkingDirectory={{cfg_hedgedoc.directory}}
User={{var_hedgedoc_user_name}} User={{cfg_hedgedoc.user_name}}
Environment="NODE_ENV=production" Environment="NODE_ENV=production"
ExecStart=yarn start ExecStart=yarn start
SyslogIdentifier=hedgedoc SyslogIdentifier=hedgedoc

View file

@ -1,87 +0,0 @@
{
"user_name": {
"type": "string",
"mandatory": false
},
"directory": {
"type": "string",
"mandatory": false
},
"version": {
"type": "string",
"mandatory": false
},
"session_secret": {
"type": "string",
"mandatory": true
},
"database_kind": {
"type": "string",
"mandatory": false,
"options": [
"sqlite",
"postgresql",
"mariadb"
]
},
"database_data_sqlite_path": {
"type": "string",
"mandatory": false
},
"database_data_postgresql_host": {
"type": "string",
"mandatory": false
},
"database_data_postgresql_port": {
"type": "integer",
"mandatory": false
},
"database_data_postgresql_username": {
"type": "string",
"mandatory": false
},
"database_data_postgresql_password": {
"type": "string",
"mandatory": false
},
"database_data_postgresql_schema": {
"type": "string",
"mandatory": false
},
"domain": {
"type": "string",
"mandatory": false
},
"authentication_kind": {
"type": "string",
"mandatory": false,
"options": [
"internal",
"authelia"
]
},
"authentication_data_authelia_client_id": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_client_secret": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_url_base": {
"type": "string",
"mandatory": false
},
"guest_allow_create": {
"type": "boolean",
"mandatory": false
},
"guest_allow_change": {
"type": "boolean",
"mandatory": false
},
"free_names_mode": {
"type": "string",
"mandatory": false
}
}

View file

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

View file

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

View file

@ -1,4 +1,11 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_nginx"
}
},
{ {
"name": "install packages", "name": "install packages",
"become": true, "become": true,
@ -12,9 +19,10 @@
}, },
{ {
"name": "generate dhparams file", "name": "generate dhparams file",
"when": "cfg_nginx.dhparam_size != None",
"become": true, "become": true,
"ansible.builtin.command": { "ansible.builtin.command": {
"cmd": "openssl dhparam -out /etc/nginx/dhparam 4096" "cmd": "openssl dhparam -out /etc/nginx/dhparam {{cfg_nginx.dhparam_size | string}}"
}, },
"args": { "args": {
"creates": "/etc/nginx/dhparam" "creates": "/etc/nginx/dhparam"
@ -23,13 +31,16 @@
{ {
"name": "place hardening config", "name": "place hardening config",
"become": true, "become": true,
"ansible.builtin.copy": { "ansible.builtin.template": {
"src": "ssl-hardening.conf", "src": "ssl-hardening.conf.j2",
"dest": "/etc/nginx/ssl-hardening.conf" "dest": "/etc/nginx/ssl-hardening.conf"
} }
}, },
{ {
"name": "ufw | check", "name": "ufw",
"block": [
{
"name": "check",
"become": true, "become": true,
"check_mode": true, "check_mode": true,
"community.general.ufw": { "community.general.ufw": {
@ -38,7 +49,7 @@
"register": "ufw_enable_check" "register": "ufw_enable_check"
}, },
{ {
"name": "ufw | allow port 80", "name": "allow port 80",
"when": "not ufw_enable_check.changed", "when": "not ufw_enable_check.changed",
"become": true, "become": true,
"community.general.ufw": { "community.general.ufw": {
@ -48,7 +59,7 @@
} }
}, },
{ {
"name": "ufw | allow port 443", "name": "allow port 443",
"when": "not ufw_enable_check.changed", "when": "not ufw_enable_check.changed",
"become": true, "become": true,
"community.general.ufw": { "community.general.ufw": {
@ -56,16 +67,18 @@
"port": "443", "port": "443",
"proto": "tcp" "proto": "tcp"
} }
}
]
}, },
{ {
"name": "auto reload", "name": "auto reload",
"when": "var_nginx_auto_reload_interval == None", "when": "cfg_nginx.auto_reload_interval == None",
"become": true, "become": true,
"ansible.builtin.cron": { "ansible.builtin.cron": {
"name": "nginx_auto_reload", "name": "nginx_auto_reload",
"disabled": true, "disabled": true,
"minute": "0", "minute": "0",
"hour": "*/{{var_nginx_auto_reload_interval | string}}", "hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
"day": "*", "day": "*",
"month": "*", "month": "*",
"weekday": "*", "weekday": "*",
@ -74,13 +87,13 @@
}, },
{ {
"name": "auto reload", "name": "auto reload",
"when": "var_nginx_auto_reload_interval != None", "when": "cfg_nginx.auto_reload_interval != None",
"become": true, "become": true,
"ansible.builtin.cron": { "ansible.builtin.cron": {
"name": "nginx_auto_reload", "name": "nginx_auto_reload",
"disabled": false, "disabled": false,
"minute": "0", "minute": "0",
"hour": "*/{{var_nginx_auto_reload_interval | string}}", "hour": "*/{{cfg_nginx.auto_reload_interval | string}}",
"day": "*", "day": "*",
"month": "*", "month": "*",
"weekday": "*", "weekday": "*",

View file

@ -3,7 +3,9 @@ ssl_session_cache shared:MozSSL:10m; # about 40000 sessions
ssl_session_tickets off; ssl_session_tickets off;
# curl https://ssl-config.mozilla.org/ffdhe2048.txt > /path/to/dhparam # curl https://ssl-config.mozilla.org/ffdhe2048.txt > /path/to/dhparam
{% if cfg_nginx.dhparam_size != None %}
ssl_dhparam /etc/nginx/dhparam; ssl_dhparam /etc/nginx/dhparam;
{% endif %}
# intermediate configuration # intermediate configuration
ssl_protocols TLSv1.2 TLSv1.3; ssl_protocols TLSv1.2 TLSv1.3;

View file

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

View file

@ -0,0 +1,31 @@
{
"nullable": false,
"type": "object",
"properties": {
"domain": {
"nullable": false,
"type": "string"
},
"tls_mode": {
"nullable": false,
"type": "string",
"enum": [
"disable",
"enable",
"force"
],
"default": "force"
},
"maximum_upload_size": {
"nullable": false,
"type": "string",
"default": "1G"
}
},
"additionalProperties": false,
"required": [
"domain",
"tls_mode",
"maximum_upload_size"
]
}

View file

@ -1,5 +1,6 @@
{ {
"var_owncloud_and_nginx_domain": "owncloud.example.org", "cfg_owncloud_and_nginx_defaults": {
"var_owncloud_and_nginx_tls_mode": "force", "tls_mode": "force",
"var_owncloud_and_nginx_maximum_upload_size": "1G" "maximum_upload_size": "1G"
}
} }

View file

@ -1,4 +1,11 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_owncloud_and_nginx"
}
},
{ {
"name": "deactivate default site", "name": "deactivate default site",
"become": true, "become": true,
@ -12,7 +19,7 @@
"become": true, "become": true,
"ansible.builtin.template": { "ansible.builtin.template": {
"src": "conf.j2", "src": "conf.j2",
"dest": "/etc/nginx/sites-available/{{var_owncloud_and_nginx_domain}}" "dest": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}"
} }
}, },
{ {
@ -20,8 +27,8 @@
"become": true, "become": true,
"ansible.builtin.file": { "ansible.builtin.file": {
"state": "link", "state": "link",
"src": "/etc/nginx/sites-available/{{var_owncloud_and_nginx_domain}}", "src": "/etc/nginx/sites-available/{{cfg_owncloud_and_nginx.domain}}",
"dest": "/etc/nginx/sites-enabled/{{var_owncloud_and_nginx_domain}}" "dest": "/etc/nginx/sites-enabled/{{cfg_owncloud_and_nginx.domain}}"
} }
}, },
{ {

View file

@ -1,7 +1,7 @@
{% macro owncloud_common() %} {% macro owncloud_common() %}
location / { location / {
proxy_pass http://localhost:9200; proxy_pass http://localhost:9200;
client_max_body_size {{var_owncloud_and_nginx_maximum_upload_size}}; client_max_body_size {{cfg_owncloud_and_nginx.maximum_upload_size}};
} }
{% endmacro %} {% endmacro %}
@ -9,24 +9,24 @@ server {
listen 80; listen 80;
listen [::]:80; listen [::]:80;
server_name {{var_owncloud_and_nginx_domain}}; server_name {{cfg_owncloud_and_nginx.domain}};
{% if var_owncloud_and_nginx_tls_mode == 'force' %} {% if cfg_owncloud_and_nginx.tls_mode == 'force' %}
return 301 https://$http_host$request_uri; return 301 https://$http_host$request_uri;
{% else %} {% else %}
{{ owncloud_common() }} {{ owncloud_common() }}
{% endif %} {% endif %}
} }
{% if var_owncloud_and_nginx_tls_mode != 'disable' %} {% if cfg_owncloud_and_nginx.tls_mode != 'disable' %}
server { server {
listen 443 ssl; listen 443 ssl;
listen [::]:443 ssl; listen [::]:443 ssl;
server_name {{var_owncloud_and_nginx_domain}}; server_name {{cfg_owncloud_and_nginx.domain}};
ssl_certificate_key /etc/ssl/private/{{var_owncloud_and_nginx_domain}}.pem; ssl_certificate_key /etc/ssl/private/{{cfg_owncloud_and_nginx.domain}}.pem;
ssl_certificate /etc/ssl/fullchains/{{var_owncloud_and_nginx_domain}}.pem; ssl_certificate /etc/ssl/fullchains/{{cfg_owncloud_and_nginx.domain}}.pem;
include /etc/nginx/ssl-hardening.conf; include /etc/nginx/ssl-hardening.conf;
{{ owncloud_common() }} {{ owncloud_common() }}

View file

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

View file

@ -0,0 +1,152 @@
{
"nullable": false,
"type": "object",
"properties": {
"user": {
"nullable": false,
"type": "string",
"default": "owncloud"
},
"directory": {
"nullable": false,
"type": "string",
"default": "/opt/owncloud"
},
"version": {
"nullable": false,
"type": "string",
"default": "7.2.0"
},
"platform": {
"nullable": false,
"type": "string",
"default": "linux-amd64"
},
"domain": {
"nullable": false,
"type": "string"
},
"admin_password": {
"nullable": false,
"type": "string"
},
"authentication": {
"anyOf": [
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"type": "string",
"enum": ["internal"],
"default": "internal"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
},
"additionalProperties": false,
"required": [
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
]
},
{
"nullable": false,
"type": "object",
"properties": {
"kind": {
"type": "string",
"enum": ["authelia"],
"default": "authelia"
},
"data": {
"nullable": false,
"type": "object",
"properties": {
"url_base": {
"nullable": false,
"type": "string"
},
"web": {
"nullable": true,
"type": "object",
"properties": {
"client_id": {
"type": "string",
"mandatory": false,
"default": "owncloud_web"
}
},
"additionalProperties": false,
"required": [
"client_id"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"url_base",
"web"
]
}
},
"additionalProperties": false,
"required": [
"kind",
"data"
]
}
]
},
"public_share": {
"nullable": false,
"type": "object",
"properties": {
"password_necessity": {
"nullable": false,
"type": "string",
"enum": [
"nothing",
"writable",
"all"
],
"default": "writable"
},
"password_policy_active": {
"nullable": false,
"type": "boolean",
"default": true
}
},
"additionalProperties": false,
"required": [
"password_necessity",
"password_policy_active"
],
"default": {
}
}
},
"additionalProperties": false,
"required": [
"user",
"directory",
"version",
"platform",
"domain",
"admin_password",
"authentication",
"public_share"
]
}

View file

@ -1,18 +1,16 @@
{ {
"var_owncloud_user": "owncloud", "cfg_owncloud_defaults": {
"var_owncloud_directory": "/opt/owncloud", "user": "owncloud",
"var_owncloud_version": "5.0.0", "directory": "/opt/owncloud",
"var_owncloud_platform": "linux-amd64", "version": "7.2.0",
"var_owncloud_domain": "owncloud.example.org", "platform": "linux-amd64",
"var_owncloud_admin_password": "REPLACE_ME", "domain": "owncloud.example.org",
"var_owncloud_authentication_kind": "internal", "authentication": {
"var_owncloud_authentication_data_authelia_url_base": "https://authelia.example.org", "kind": "internal"
"var_owncloud_authentication_data_authelia_web_client_id": "owncloud_web", },
"var_owncloud_authentication_data_authelia_web_client_secret": "REPLACE_ME", "public_share": {
"var_owncloud_authentication_data_authelia_android_client_id": "owncloud_android", "password_necessity": "writable",
"var_owncloud_authentication_data_authelia_android_client_secret": "REPLACE_ME", "password_policy_active": true
"var_owncloud_authentication_data_authelia_ios_client_id": "owncloud_ios", }
"var_owncloud_authentication_data_authelia_ios_client_secret": "REPLACE_ME", }
"var_owncloud_public_share_password_necessity": "writable",
"var_owncloud_public_share_password_policy_active": true
} }

View file

@ -7,13 +7,26 @@ Cloud-Plattform [ownCloud](https://owncloud.com/) (the rewrite in Go named "Infi
- [ownCloud-Dokumentation | How to install ownCloud Infinite Scale Tech Preview in three easy steps](https://owncloud.com/news/howto-install-owncloud-infinite-scale-tech-preview/) - [ownCloud-Dokumentation | How to install ownCloud Infinite Scale Tech Preview in three easy steps](https://owncloud.com/news/howto-install-owncloud-infinite-scale-tech-preview/)
- [ownCloud-Dokumentation | oCIS](https://owncloud.dev/ocis/) - [ownCloud-Dokumentation | oCIS](https://owncloud.dev/ocis/)
- [ownCloud-Dokumentation | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html) - [ownCloud-Dokumentation | Upgrading](https://doc.owncloud.com/ocis/next/migration/upgrading-ocis.html)
- [ownCloud-Dokumentation | env var types](https://doc.owncloud.com/ocis/next/deployment/services/envvar-types-description.html)
- [ownCloud-Dokumentation | Service | Web](https://doc.owncloud.com/ocis/next/deployment/services/s-list/web.html) - [ownCloud-Dokumentation | Service | Web](https://doc.owncloud.com/ocis/next/deployment/services/s-list/web.html)
- [ownCloud-Dokumentation | Service | Proxy](https://doc.owncloud.com/ocis/next/deployment/services/s-list/proxy.html)
- [ownCloud-Dokumentation | Service | Sharing](https://doc.owncloud.com/ocis/next/deployment/services/s-list/sharing.html) - [ownCloud-Dokumentation | Service | Sharing](https://doc.owncloud.com/ocis/next/deployment/services/s-list/sharing.html)
- [GitHub | ocis](https://github.com/owncloud/ocis/) - [GitHub | ocis](https://github.com/owncloud/ocis/)
- [ownCloud-Foren | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222) - [ownCloud-Foren | OCIS + Authelia](https://central.owncloud.org/t/ocis-authelia/44222)
## Bemerkungen
- die `.ocis/config/ocis.yaml` wird erzeugt auf Grundlage der `.env`
- `.ocis/config/ocis.yaml` sollte niemals einfach neu erstellt werden, da man sich sonst nicht mehr einloggen kann
- wenn man sich plötzlich nicht mehr über OIDC anmelden kann, kann das daran lieget, dass `.ocis/idm/ldap.crt` abgelaufen ist — siehe dazu [diesen Thread](https://central.owncloud.org/t/certificate-error-after-upgrade-to-5-0-0-from-4-0-6/47824/7); man könnte auch `OCIS_LDAP_INSECURE` auf `true` setzen, aber naja…
## ToDo ## ToDo
- Download prüfen - Download prüfen
- `csp.yaml` einsetzen
- prüfen ob folgende `.env`-Variablen gebraucht werden:
- `PROXY_OIDC_ISSUER`
- `PROXY_OIDC_SKIP_USER_INFO`

View file

@ -1,39 +1,70 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_owncloud"
}
},
{ {
"name": "user", "name": "user",
"become": true, "become": true,
"ansible.builtin.user": { "ansible.builtin.user": {
"name": "{{var_owncloud_user}}", "name": "{{cfg_owncloud.user}}",
"create_home": true, "create_home": true,
"home": "{{var_owncloud_directory}}" "home": "{{cfg_owncloud.directory}}"
} }
}, },
{ {
"name": "download", "name": "download",
"become": true, "become": true,
"become_user": "{{var_owncloud_user}}", "become_user": "{{cfg_owncloud.user}}",
"ansible.builtin.get_url": { "ansible.builtin.get_url": {
"url": "https://download.owncloud.com/ocis/ocis/stable/{{var_owncloud_version}}/ocis-{{var_owncloud_version}}-{{var_owncloud_platform}}", "url": "https://download.owncloud.com/ocis/ocis/stable/{{cfg_owncloud.version}}/ocis-{{cfg_owncloud.version}}-{{cfg_owncloud.platform}}",
"dest": "{{var_owncloud_directory}}/ocis", "dest": "{{cfg_owncloud.directory}}/ocis",
"mode": "u+rx" "mode": "u+rx"
} }
}, },
{
"name": "directories",
"become": true,
"become_user": "{{cfg_owncloud.user}}",
"loop": [
"log"
],
"ansible.builtin.file": {
"state": "directory",
"recurse": true,
"path": "{{cfg_owncloud.directory}}/{{item}}"
}
},
{
"name": "csp",
"become": true,
"become_user": "{{cfg_owncloud.user}}",
"ansible.builtin.template": {
"src": "csp.yaml.j2",
"mode": "644",
"dest": "{{cfg_owncloud.directory}}/csp.yaml"
}
},
{
"name": "env",
"become": true,
"become_user": "{{cfg_owncloud.user}}",
"ansible.builtin.template": {
"src": "env.j2",
"mode": "644",
"dest": "{{cfg_owncloud.directory}}/.env"
}
},
{ {
"name": "setup", "name": "setup",
"become": true, "become": true,
"become_user": "{{var_owncloud_user}}", "become_user": "{{cfg_owncloud.user}}",
"ansible.builtin.shell": { "ansible.builtin.shell": {
"chdir": "{{var_owncloud_directory}}", "chdir": "{{cfg_owncloud.directory}}",
"cmd": "rm -f {{var_owncloud_directory}}/.ocis/config/ocis.yaml && ./ocis init --insecure no --admin-password={{var_owncloud_admin_password}}" "cmd": "./ocis init --insecure no --admin-password={{cfg_owncloud.admin_password}}"
}
},
{
"name": "configuration",
"become": true,
"become_user": "{{var_owncloud_user}}",
"ansible.builtin.template": {
"src": "env.j2",
"dest": "{{var_owncloud_directory}}/.env"
} }
}, },
{ {

View file

@ -0,0 +1,7 @@
directives:
connect-src:
- '''self'''
- 'https://{{cfg_owncloud.domain}}'
{% if cfg_owncloud.authentication.kind == 'authelia' %}
- '{{cfg_owncloud.authentication.data.url_base}}'
{% endif %}

View file

@ -1,44 +1,62 @@
OCIS_URL="https://{{var_owncloud_domain}}" ## web client
OCIS_INSECURE="false" WEB_LOG_LEVEL=info
WEB_LOG_FILE={{cfg_owncloud.directory}}/log/web
PROXY_TLS="false" WEB_LOG_PRETTY=true
WEB_LOG_COLOR=true
{% if var_owncloud_authentication_kind == 'internal' %} {% if cfg_owncloud.authentication.kind == 'internal' %}
PROXY_AUTOPROVISION_ACCOUNTS="false" {% endif %}
{% if cfg_owncloud.authentication.kind == 'authelia' %}
WEB_OIDC_AUTHORITY={{cfg_owncloud.authentication.data.url_base}}
WEB_OIDC_CLIENT_ID={{cfg_owncloud.authentication.data.web.client_id}}
WEB_OIDC_RESPONSE_TYPE=code
WEB_OIDC_SCOPE=openid profile email groups
WEB_OPTION_LOGIN_URL={{cfg_owncloud.authentication.data.url_base}}
WEB_OPTION_LOGOUT_URL={{cfg_owncloud.authentication.data.url_base}}
WEB_UI_THEME_SERVER=https://{{cfg_owncloud.domain}}
WEB_UI_CONFIG_SERVER=https://{{cfg_owncloud.domain}}
{% endif %} {% endif %}
{% if var_owncloud_authentication_kind == 'authelia' %} ## other clients
OCIS_OIDC_CLIENT_ID="{{var_owncloud_authentication_data_authelia_web_client_id}}" PROXY_LOG_LEVEL=info
OCIS_OIDC_ISSUER="{{var_owncloud_authentication_data_authelia_url_base}}" PROXY_LOG_FILE={{cfg_owncloud.directory}}/log/proxy
PROXY_LOG_PRETTY=true
PROXY_AUTOPROVISION_ACCOUNTS="true" PROXY_LOG_COLOR=true
PROXY_OIDC_REWRITE_WELLKNOWN="true" PROXY_CSP_CONFIG_FILE_LOCATION={{cfg_owncloud.directory}}/csp.yaml
PROXY_OIDC_ACCESS_TOKEN_VERIFY_METHOD="none" PROXY_TLS=false
PROXY_OIDC_INSECURE="false" {% if cfg_owncloud.authentication.kind == 'internal' %}
PROXY_USER_OIDC_CLAIM="name" PROXY_AUTOPROVISION_ACCOUNTS=false
PROXY_USER_CS3_CLAIM="username" {% endif %}
{% if cfg_owncloud.authentication.kind == 'authelia' %}
WEB_OIDC_AUTHORITY="{{var_owncloud_authentication_data_authelia_url_base}}" OCIS_URL=https://{{cfg_owncloud.domain}}
WEB_OIDC_METADATA_URL="{{var_owncloud_authentication_data_authelia_url_base}}/.well-known/openid-configuration" PROXY_OIDC_ISSUER={{cfg_owncloud.authentication.data.url_base}}
WEB_OIDC_CLIENT_ID="{{var_owncloud_authentication_data_authelia_web_client_id}}" PROXY_OIDC_REWRITE_WELLKNOWN=true
WEB_OIDC_SCOPE="openid profile email groups" PROXY_OIDC_ACCESS_TOKEN_VERIFY_METHOD=none
PROXY_OIDC_SKIP_USER_INFO=false
PROXY_AUTOPROVISION_ACCOUNTS=true
PROXY_AUTOPROVISION_CLAIM_USERNAME=preferred_username
PROXY_AUTOPROVISION_CLAIM_EMAIL=email
PROXY_AUTOPROVISION_CLAIM_DISPLAYNAME=name
PROXY_AUTOPROVISION_CLAIM_GROUPS=groups
PROXY_USER_OIDC_CLAIM=preferred_username
PROXY_USER_CS3_CLAIM=username
{% endif %} {% endif %}
{% if var_owncloud_public_share_password_necessity == 'nothing' %} ## sharing
OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="false" {% if cfg_owncloud.public_share.password_necessity == 'nothing' %}
OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="false" OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=false
{% endif %} {% endif %}
{% if var_owncloud_public_share_password_necessity == 'writable' %} {% if cfg_owncloud.public_share.password_necessity == 'writable' %}
OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="false" OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=false
OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="true" OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
{% endif %} {% endif %}
{% if var_owncloud_public_share_password_necessity == 'all' %} {% if cfg_owncloud.public_share.password_necessity == 'all' %}
OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD="true" OCIS_SHARING_PUBLIC_SHARE_MUST_HAVE_PASSWORD=true
OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD="true" OCIS_SHARING_PUBLIC_WRITEABLE_SHARE_MUST_HAVE_PASSWORD=true
{% endif %} {% endif %}
{% if cfg_owncloud.public_share.password_policy_active %}
{% if var_owncloud_public_share_password_policy_active %} OCIS_SHARING_PASSWORD_POLICY_DISABLED=false
OCIS_SHARING_PASSWORD_POLICY_DISABLED="false"
{% else %} {% else %}
OCIS_SHARING_PASSWORD_POLICY_DISABLED="true" OCIS_SHARING_PASSWORD_POLICY_DISABLED=true
{% endif %} {% endif %}

View file

@ -3,12 +3,12 @@ Description=ownCloud
After=network.target After=network.target
[Service] [Service]
WorkingDirectory={{var_owncloud_directory}} WorkingDirectory={{cfg_owncloud.directory}}
EnvironmentFile={{var_owncloud_directory}}/.env EnvironmentFile={{cfg_owncloud.directory}}/.env
ExecStart={{var_owncloud_directory}}/ocis server ExecStart={{cfg_owncloud.directory}}/ocis server
Type=simple Type=simple
Restart=always Restart=always
User={{var_owncloud_user}} User={{cfg_owncloud.user}}
[Install] [Install]
WantedBy=default.target WantedBy=default.target

View file

@ -1,75 +0,0 @@
{
"user": {
"type": "string",
"mandatory": false
},
"directory": {
"type": "string",
"mandatory": false
},
"version": {
"type": "string",
"mandatory": false
},
"platform": {
"type": "string",
"mandatory": false
},
"domain": {
"type": "string",
"mandatory": false
},
"admin_password": {
"type": "string",
"mandatory": true
},
"authentication_kind": {
"type": "string",
"mandatory": false,
"options": [
"internal",
"authelia"
]
},
"authentication_data_authelia_url_base": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_web_client_id": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_web_client_secret": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_android_client_id": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_android_client_secret": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_ios_client_id": {
"type": "string",
"mandatory": false
},
"authentication_data_authelia_ios_client_secret": {
"type": "string",
"mandatory": false
},
"public_share_password_necessity": {
"type": "string",
"mandatory": false,
"options": [
"nothing",
"writable",
"all"
]
},
"public_share_password_policy_active": {
"type": "boolean",
"mandatory": false
}
}

View file

@ -1,4 +0,0 @@
{
"var_sqlite_for_hedgedoc_path": "/var/hedgedoc/data.sqlite",
"var_sqlite_for_hedgedoc_user_name": "hedgedoc"
}

View file

@ -1,20 +0,0 @@
[
{
"name": "directory",
"become": true,
"ansible.builtin.file": {
"state": "directory",
"path": "{{var_sqlite_for_hedgedoc_path | dirname}}",
"owner": "{{var_hedgedoc_user_name}}"
}
},
{
"name": "file",
"become": true,
"ansible.builtin.file": {
"state": "touch",
"path": "{{var_sqlite_for_hedgedoc_path}}",
"owner": "{{var_sqlite_for_hedgedoc_user_name}}"
}
}
]

View file

@ -1,10 +0,0 @@
{
"path": {
"type": "string",
"mandatory": false
},
"user_name": {
"type": "string",
"mandatory": false
}
}

View file

@ -0,0 +1,14 @@
{
"nullable": false,
"type": "object",
"properties": {
"domain": {
"nullable": false,
"type": "string"
}
},
"additionalProperties": false,
"required": [
"domain"
]
}

View file

@ -1,3 +1,4 @@
{ {
"var_tlscert_selfsigned_domain": "foo.example.org" "cfg_tlscert_selfsigned_defaults": {
}
} }

View file

@ -1,4 +1,11 @@
[ [
{
"name": "show vars",
"when": "switch_show_vars",
"ansible.builtin.debug": {
"var": "vars.cfg_tlscert_selfsigned"
}
},
{ {
"name": "install packages", "name": "install packages",
"become": true, "become": true,
@ -28,19 +35,19 @@
"name": "csr | generate private key", "name": "csr | generate private key",
"become": true, "become": true,
"community.crypto.openssl_privatekey": { "community.crypto.openssl_privatekey": {
"path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem" "path": "/etc/ssl/private/{{cfg_tlscert_selfsigned.domain}}.pem"
} }
}, },
{ {
"name": "csr | execute", "name": "csr | execute",
"become": true, "become": true,
"community.crypto.openssl_csr": { "community.crypto.openssl_csr": {
"privatekey_path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem", "privatekey_path": "/etc/ssl/private/{{cfg_tlscert_selfsigned.domain}}.pem",
"common_name": "{{var_tlscert_selfsigned_domain}}", "common_name": "{{cfg_tlscert_selfsigned.domain}}",
"subject_alt_name": [ "subject_alt_name": [
"DNS:{{var_tlscert_selfsigned_domain}}" "DNS:{{cfg_tlscert_selfsigned.domain}}"
], ],
"path": "/etc/ssl/csr/{{var_tlscert_selfsigned_domain}}.pem" "path": "/etc/ssl/csr/{{cfg_tlscert_selfsigned.domain}}.pem"
}, },
"register": "temp_csr" "register": "temp_csr"
}, },
@ -48,17 +55,17 @@
"name": "generate certificate", "name": "generate certificate",
"become": true, "become": true,
"community.crypto.x509_certificate": { "community.crypto.x509_certificate": {
"privatekey_path": "/etc/ssl/private/{{var_tlscert_selfsigned_domain}}.pem", "privatekey_path": "/etc/ssl/private/{{cfg_tlscert_selfsigned.domain}}.pem",
"csr_path": "/etc/ssl/csr/{{var_tlscert_selfsigned_domain}}.pem", "csr_path": "/etc/ssl/csr/{{cfg_tlscert_selfsigned.domain}}.pem",
"provider": "selfsigned", "provider": "selfsigned",
"path": "/etc/ssl/certs/{{var_tlscert_selfsigned_domain}}.pem" "path": "/etc/ssl/certs/{{cfg_tlscert_selfsigned.domain}}.pem"
} }
}, },
{ {
"name": "compose fullchain", "name": "compose fullchain",
"become": true, "become": true,
"ansible.builtin.shell": { "ansible.builtin.shell": {
"cmd": "cat /etc/ssl/certs/{{var_tlscert_selfsigned_domain}}.pem > /etc/ssl/fullchains/{{var_tlscert_selfsigned_domain}}.pem" "cmd": "cat /etc/ssl/certs/{{cfg_tlscert_selfsigned.domain}}.pem > /etc/ssl/fullchains/{{cfg_tlscert_selfsigned.domain}}.pem"
} }
} }
] ]