diff options
| author | Aaron LI <aly@aaronly.me> | 2019-09-22 15:31:37 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2019-09-22 15:31:55 +0800 |
| commit | 1d2d14db6f719d50a95651c99ec19b69279c0ef5 (patch) | |
| tree | 6b766be6f03db7b63ee79fde18fed8002840d5bb | |
| parent | 445e8e9fda6a89d7efcb18057515a324382284d4 (diff) | |
| download | ansible-dfly-vps-1d2d14db6f719d50a95651c99ec19b69279c0ef5.tar.bz2 | |
git: Some small updates
| -rw-r--r-- | roles/git/handlers/main.yml | 2 | ||||
| -rw-r--r-- | roles/git/tasks/main.yml | 12 | ||||
| -rw-r--r-- | roles/git/templates/cgitrc.j2 (renamed from roles/git/templates/cgit/cgitrc.j2) | 0 |
3 files changed, 9 insertions, 5 deletions
diff --git a/roles/git/handlers/main.yml b/roles/git/handlers/main.yml index 6e08be5..8a672f0 100644 --- a/roles/git/handlers/main.yml +++ b/roles/git/handlers/main.yml @@ -1,3 +1,5 @@ --- - name: restart-cgit command: service uwsgi restart cgit + args: + warn: false diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml index 13c35f2..6bec804 100644 --- a/roles/git/tasks/main.yml +++ b/roles/git/tasks/main.yml @@ -140,7 +140,7 @@ - name: cgit - generate config file template: - src: cgit/cgitrc.j2 + src: cgitrc.j2 dest: "{{ git.cgit.root }}/cgitrc" notify: restart-cgit @@ -167,7 +167,7 @@ owner: "{{ git.user.name }}" mode: 0755 -- name: cgit - setup with uwsgi in rc.conf +- name: uwsgi - setup cgit blockinfile: path: /etc/rc.conf marker: "# {mark} ANSIBLE MANAGED - uwsgi/cgit" @@ -179,8 +179,10 @@ uwsgi_cgit_flags="-L --log-reopen --logfile-chown --cgi /usr/local/www/cgit/cgit.cgi --env CGIT_CONFIG={{ git.cgit.root }}/cgitrc" notify: restart-cgit -- name: enable and start uwsgi +- name: uwsgi - enable and start service command: rcenable uwsgi -- name: start cgit - command: service uwsgi start cgit +- name: uwsgi - restart to make sure cgit is started + service: + name: uwsgi + state: restarted diff --git a/roles/git/templates/cgit/cgitrc.j2 b/roles/git/templates/cgitrc.j2 index da5f33f..da5f33f 100644 --- a/roles/git/templates/cgit/cgitrc.j2 +++ b/roles/git/templates/cgitrc.j2 |