diff --git a/defaults/main.yml b/defaults/main.yml index e784fb5..c663105 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -136,11 +136,12 @@ postgresql_user_privileges: priv: "ALL" # privilege string format: example: INSERT,UPDATE/table:SELECT/anothertable:ALL role_attr_flags: "" # role attribute flags - #NGINX SETUP +#NGINX SETUP nginx_default_vhost_ssl: 'pleroma.example.lan' nginx_default_vhost: 'pleroma.example.lan' nginx_HSTS_policy: 'true' - #NGINX VHOST + +##NGINX VHOST nginx_vhosts: - name: 'pleroma.example.lan' diff --git a/tasks/main.yml b/tasks/main.yml index e57ccb8..cdd1c36 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,10 +1,13 @@ --- -- include_tasks: user.yml +- name: '[Main] - Create user' + include_tasks: user.yml -- include_tasks: installdeps.yml +- name: '[Main] - Install dependencies' + include_tasks: installdeps.yml -- include_tasks: configure.yml +- name: '[Main] - Configure' + include_tasks: configure.yml tags: - upgrade @@ -13,14 +16,17 @@ path: '{{ pleroma_app_dir }}/release' register: pleroma_release -- include_tasks: install.yml +- name: '[Main] - Install' + include_tasks: install.yml when: pleroma_release.stat.exists == False -- include_tasks: upgrade.yml +- name: '[Main] - Upgrade' + include_tasks: upgrade.yml tags: - upgrade - never -- include_tasks: frontends.yml +- name: '[Main] - Frontends' + include_tasks: frontends.yml tags: - - upgrade + - upgrade \ No newline at end of file diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml index ab27db3..791aa6c 100644 --- a/tasks/upgrade.yml +++ b/tasks/upgrade.yml @@ -32,4 +32,10 @@ daemon_reload: 'yes' tags: - upgrade - - never \ No newline at end of file + - never + +- name: '[Frontends] - Wait 10 seconds after restart of backend to make sure it is completely started' + wait_for: + timeout: 10 + tags: + - upgrade \ No newline at end of file