diff --git a/roles/authelia-for-owncloud/defaults/main.json b/roles/authelia-for-owncloud/defaults/main.json index df89782..b12d86f 100644 --- a/roles/authelia-for-owncloud/defaults/main.json +++ b/roles/authelia-for-owncloud/defaults/main.json @@ -1,9 +1,6 @@ { "var_authelia_for_owncloud_owncloud_url_base": "https://owncloud.example.org", "var_authelia_for_owncloud_web_client_id": "owncloud_web", - "var_authelia_for_owncloud_web_client_secret": "REPLACE_ME", - "var_authelia_for_owncloud_desktop_client_id": "owncloud_desktop", - "var_authelia_for_owncloud_desktop_client_secret": "REPLACE_ME", "var_authelia_for_owncloud_android_client_id": "owncloud_android", "var_authelia_for_owncloud_android_client_secret": "REPLACE_ME", "var_authelia_for_owncloud_ios_client_id": "owncloud_ios", diff --git a/roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2 b/roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2 index bafc164..61b3e43 100644 --- a/roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2 +++ b/roles/authelia-for-owncloud/templates/authelia-client-conf-desktop.json.j2 @@ -1,7 +1,8 @@ { - "client_id": "{{var_authelia_for_owncloud_desktop_client_id}}", - "client_secret": "{{var_authelia_for_owncloud_desktop_client_secret}}", + "client_id": "xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69", + "client_secret": "UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh", "client_name": "ownCloud | Desktop Client", + "authorization_policy": "one_factor", "scopes": [ "openid", "groups", diff --git a/roles/authelia-for-owncloud/vardef.json b/roles/authelia-for-owncloud/vardef.json new file mode 100644 index 0000000..8bf599d --- /dev/null +++ b/roles/authelia-for-owncloud/vardef.json @@ -0,0 +1,26 @@ +{ + "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": false + }, + "ios_client_id": { + "type": "string", + "mandatory": false + }, + "ios_client_secret": { + "type": "string", + "mandatory": false + } +} diff --git a/roles/owncloud/defaults/main.json b/roles/owncloud/defaults/main.json index 2d57364..18ef408 100644 --- a/roles/owncloud/defaults/main.json +++ b/roles/owncloud/defaults/main.json @@ -9,8 +9,6 @@ "var_owncloud_authentication_data_authelia_url_base": "https://authelia.example.org", "var_owncloud_authentication_data_authelia_web_client_id": "owncloud_web", "var_owncloud_authentication_data_authelia_web_client_secret": "REPLACE_ME", - "var_owncloud_authentication_data_authelia_desktop_client_id": "owncloud_desktop", - "var_owncloud_authentication_data_authelia_desktop_client_secret": "REPLACE_ME", "var_owncloud_authentication_data_authelia_android_client_id": "owncloud_android", "var_owncloud_authentication_data_authelia_android_client_secret": "REPLACE_ME", "var_owncloud_authentication_data_authelia_ios_client_id": "owncloud_ios", diff --git a/roles/owncloud/vardef.json b/roles/owncloud/vardef.json index d480c01..95edd32 100644 --- a/roles/owncloud/vardef.json +++ b/roles/owncloud/vardef.json @@ -43,14 +43,6 @@ "type": "string", "mandatory": false }, - "authentication_data_authelia_desktop_client_id": { - "type": "string", - "mandatory": false - }, - "authentication_data_authelia_desktop_client_secret": { - "type": "string", - "mandatory": false - }, "authentication_data_authelia_android_client_id": { "type": "string", "mandatory": false