From 716b0a2ed8e7456ef2fcf929e3545cb65dd78aad Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Thu, 31 Aug 2017 10:55:08 +0200 Subject: [PATCH] redmine: use tasks instead of handlers --- redmine/handlers/main.yml | 24 ------------------------ redmine/tasks/main.yml | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 32 deletions(-) delete mode 100644 redmine/handlers/main.yml diff --git a/redmine/handlers/main.yml b/redmine/handlers/main.yml deleted file mode 100644 index 73b42e23..00000000 --- a/redmine/handlers/main.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- name: bundle update - bundler: - state: present - gemfile: "/home/{{ redmine_user }}/www/Gemfile" - gem_path: "/home/{{ redmine_user }}/.gems" - user_install: yes - become_user: "{{ redmine_user }}" - -- name: rake migrate - shell: bundle exec rake -qf ~/www/Rakefile db:migrate - become_user: "{{ redmine_user }}" - become_method: sudo - become_flags: '-iu {{ redmine_user }}' - -- name: puma reload - systemd: - name: puma - daemon_reload: yes - state: reloaded - user: yes - become_user: "{{ redmine_user }}" - become_method: sudo - become_flags: '-iu {{ redmine_user }}' diff --git a/redmine/tasks/main.yml b/redmine/tasks/main.yml index e6b4dd42..717b158d 100644 --- a/redmine/tasks/main.yml +++ b/redmine/tasks/main.yml @@ -124,9 +124,7 @@ umask: "027" update: yes become_user: "{{ redmine_user }}" - notify: - - bundle update - - rake migrate + register: redmine_git_task tags: - redmine @@ -137,7 +135,7 @@ owner: "{{ redmine_user }}" group: "{{ redmine_user }}" mode: "0640" - notify: bundle update + register: redmine_local_gemfile_task - name: Get actual Mysql password shell: "grep password /home/{{ redmine_user }}/.my.cnf | awk '{ print $3 }'" @@ -212,7 +210,21 @@ tags: - redmine -- meta: flush_handlers +- name: Update local gems with bundle + bundler: + state: present + gemfile: "/home/{{ redmine_user }}/www/Gemfile" + gem_path: "/home/{{ redmine_user }}/.gems" + user_install: yes + become_user: "{{ redmine_user }}" + when: redmine_git_task.changed or redmine_local_gemfile_task.changed + +- name: Migrate database with rake + shell: bundle exec rake -qf ~/www/Rakefile db:migrate + become_user: "{{ redmine_user }}" + become_method: sudo + become_flags: '-iu {{ redmine_user }}' + when: redmine_git_task.changed - name: Populate Mysql database shell: bundle exec rake -qf ~/www/Rakefile redmine:load_default_data REDMINE_LANG=fr && touch ~/.populated @@ -239,8 +251,7 @@ owner: "{{ redmine_user }}" group: "{{ redmine_user }}" mode: "0640" - notify: - - puma reload + register: redmine_puma_config_task tags: - redmine @@ -257,4 +268,13 @@ tags: - redmine -- meta: flush_handlers +- name: Reload puma service + systemd: + name: puma + daemon_reload: yes + state: reloaded + user: yes + become_user: "{{ redmine_user }}" + become_method: sudo + become_flags: '-iu {{ redmine_user }}' + when: redmine_puma_config_task.changed