Skip to content

Commit a88b274

Browse files
committed
- Clone to rw_src
- Var for our env - Set perms after we db:migrate - Only restart when we have rc changes
1 parent abbb32c commit a88b274

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

tasks/main.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,39 @@
2525
- name: get rubywarden code
2626
git:
2727
repo: "https://github.com/jcs/rubywarden.git"
28-
dest: "{{ rw_home }}/rw"
28+
dest: "{{ rw_src }}"
2929
version: "{{ rw_commit }}"
3030

3131
- name: run bundler
3232
bundler:
3333
executable: /usr/local/bin/bundle24
3434
gem_path: "{{ rw_home }}/rb"
3535
binstub_directory: "{{ rw_home }}/rb/bin"
36-
chdir: "{{ rw_home }}/rw"
36+
chdir: "{{ rw_src }}"
3737
state: present
3838

39-
- name: make the production db dir
39+
- name: make the {{ rw_env }} db dir
4040
file:
41-
path: "{{ rw_home }}/rw/db/production"
41+
path: "{{ rw_src }}/db/{{ rw_env }}"
4242
state: directory
4343
owner: "{{ rw_user }}"
4444
group: "{{ rw_group }}"
45+
recurse: yes
4546
register: migrate
4647

4748
- name: run db:migrate
4849
when: migrate.changed
4950
command: "env RACK_ENV={{ rw_env }} bundle24 exec rake db:migrate"
5051
args:
51-
chdir: "{{ rw_home }}/rw"
52+
chdir: "{{ rw_src }}"
53+
54+
- name: verify perms {{ rw_env }} db dir
55+
file:
56+
path: "{{ rw_src }}/db/{{ rw_env }}"
57+
state: directory
58+
owner: "{{ rw_user }}"
59+
group: "{{ rw_group }}"
60+
recurse: yes
5261

5362
- name: create rubywarden rc script
5463
register: rc_status
@@ -60,13 +69,17 @@
6069
mode: 755
6170

6271
- name: enable rubywarden on boot
72+
register: started
6373
service:
6474
name: rubywarden
6575
state: started
6676
enabled: True
6777

78+
- name: debug
79+
debug: msg="{{ started }}"
80+
6881
- name: restart rubywarden
69-
when: rc_status.changed
82+
when: rc_status.changed and started.changed == False
7083
service:
7184
name: rubywarden
7285
state: restarted

0 commit comments

Comments
 (0)