From 727dcda7d73a902361b7981c833046dfa90582ee Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 23 Dec 2018 14:26:40 +0200 Subject: [PATCH] Organize Synapse setup files better --- roles/matrix-server/tasks/setup/main.yml | 2 +- roles/matrix-server/tasks/setup/setup_synapse.yml | 7 ------- roles/matrix-server/tasks/setup/setup_synapse_ext.yml | 11 ----------- roles/matrix-server/tasks/setup/synapse/ext/main.yml | 11 +++++++++++ .../{ => synapse/ext}/setup_synapse_ext_ldap_auth.yml | 0 .../ext}/setup_synapse_ext_mautrix_telegram.yml | 0 .../ext}/setup_synapse_ext_mautrix_whatsapp.yml | 0 .../{ => synapse/ext}/setup_synapse_ext_rest_auth.yml | 0 .../ext}/setup_synapse_ext_shared_secret_auth.yml | 0 roles/matrix-server/tasks/setup/synapse/main.yml | 7 +++++++ .../tasks/setup/{ => synapse}/setup_synapse_main.yml | 0 .../tasks/setup/{ => synapse}/setup_synapse_pre.yml | 0 12 files changed, 19 insertions(+), 19 deletions(-) delete mode 100644 roles/matrix-server/tasks/setup/setup_synapse.yml delete mode 100644 roles/matrix-server/tasks/setup/setup_synapse_ext.yml create mode 100644 roles/matrix-server/tasks/setup/synapse/ext/main.yml rename roles/matrix-server/tasks/setup/{ => synapse/ext}/setup_synapse_ext_ldap_auth.yml (100%) rename roles/matrix-server/tasks/setup/{ => synapse/ext}/setup_synapse_ext_mautrix_telegram.yml (100%) rename roles/matrix-server/tasks/setup/{ => synapse/ext}/setup_synapse_ext_mautrix_whatsapp.yml (100%) rename roles/matrix-server/tasks/setup/{ => synapse/ext}/setup_synapse_ext_rest_auth.yml (100%) rename roles/matrix-server/tasks/setup/{ => synapse/ext}/setup_synapse_ext_shared_secret_auth.yml (100%) create mode 100644 roles/matrix-server/tasks/setup/synapse/main.yml rename roles/matrix-server/tasks/setup/{ => synapse}/setup_synapse_main.yml (100%) rename roles/matrix-server/tasks/setup/{ => synapse}/setup_synapse_pre.yml (100%) diff --git a/roles/matrix-server/tasks/setup/main.yml b/roles/matrix-server/tasks/setup/main.yml index 33e6e7f8..34d7c8b8 100644 --- a/roles/matrix-server/tasks/setup/main.yml +++ b/roles/matrix-server/tasks/setup/main.yml @@ -47,7 +47,7 @@ - setup-all - setup-corporal -- include: tasks/setup/setup_synapse.yml +- include: tasks/setup/synapse/main.yml tags: - setup-all - setup-synapse diff --git a/roles/matrix-server/tasks/setup/setup_synapse.yml b/roles/matrix-server/tasks/setup/setup_synapse.yml deleted file mode 100644 index ecf69fdf..00000000 --- a/roles/matrix-server/tasks/setup/setup_synapse.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -- include: tasks/setup/setup_synapse_pre.yml - -- include: tasks/setup/setup_synapse_ext.yml - -- include: tasks/setup/setup_synapse_main.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext.yml b/roles/matrix-server/tasks/setup/setup_synapse_ext.yml deleted file mode 100644 index e5b3067c..00000000 --- a/roles/matrix-server/tasks/setup/setup_synapse_ext.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -- include: tasks/setup/setup_synapse_ext_rest_auth.yml - -- include: tasks/setup/setup_synapse_ext_shared_secret_auth.yml - -- include: tasks/setup/setup_synapse_ext_ldap_auth.yml - -- include: tasks/setup/setup_synapse_ext_mautrix_telegram.yml - -- include: tasks/setup/setup_synapse_ext_mautrix_whatsapp.yml diff --git a/roles/matrix-server/tasks/setup/synapse/ext/main.yml b/roles/matrix-server/tasks/setup/synapse/ext/main.yml new file mode 100644 index 00000000..507d4d72 --- /dev/null +++ b/roles/matrix-server/tasks/setup/synapse/ext/main.yml @@ -0,0 +1,11 @@ +--- + +- include: tasks/setup/synapse/ext/setup_synapse_ext_rest_auth.yml + +- include: tasks/setup/synapse/ext/setup_synapse_ext_shared_secret_auth.yml + +- include: tasks/setup/synapse/ext/setup_synapse_ext_ldap_auth.yml + +- include: tasks/setup/synapse/ext/setup_synapse_ext_mautrix_telegram.yml + +- include: tasks/setup/synapse/ext/setup_synapse_ext_mautrix_whatsapp.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml b/roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_ldap_auth.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_ext_ldap_auth.yml rename to roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_ldap_auth.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext_mautrix_telegram.yml b/roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_mautrix_telegram.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_ext_mautrix_telegram.yml rename to roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_mautrix_telegram.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext_mautrix_whatsapp.yml b/roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_mautrix_whatsapp.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_ext_mautrix_whatsapp.yml rename to roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_mautrix_whatsapp.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext_rest_auth.yml b/roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_rest_auth.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_ext_rest_auth.yml rename to roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_rest_auth.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_ext_shared_secret_auth.yml b/roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_shared_secret_auth.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_ext_shared_secret_auth.yml rename to roles/matrix-server/tasks/setup/synapse/ext/setup_synapse_ext_shared_secret_auth.yml diff --git a/roles/matrix-server/tasks/setup/synapse/main.yml b/roles/matrix-server/tasks/setup/synapse/main.yml new file mode 100644 index 00000000..a2df4df4 --- /dev/null +++ b/roles/matrix-server/tasks/setup/synapse/main.yml @@ -0,0 +1,7 @@ +--- + +- include: tasks/setup/synapse/setup_synapse_pre.yml + +- include: tasks/setup/synapse/ext/main.yml + +- include: tasks/setup/synapse/setup_synapse_main.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_main.yml b/roles/matrix-server/tasks/setup/synapse/setup_synapse_main.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_main.yml rename to roles/matrix-server/tasks/setup/synapse/setup_synapse_main.yml diff --git a/roles/matrix-server/tasks/setup/setup_synapse_pre.yml b/roles/matrix-server/tasks/setup/synapse/setup_synapse_pre.yml similarity index 100% rename from roles/matrix-server/tasks/setup/setup_synapse_pre.yml rename to roles/matrix-server/tasks/setup/synapse/setup_synapse_pre.yml