diff options
| author | Aaron LI <aly@aaronly.me> | 2018-04-09 22:00:10 +0800 |
|---|---|---|
| committer | Aaron LI <aly@aaronly.me> | 2018-04-09 22:00:10 +0800 |
| commit | 87c6e2caf082fbc68b721b5384861b283c0d7582 (patch) | |
| tree | bf742856594839f8e81bc2ee807db8a84a040285 /roles/radicale | |
| parent | ab65c723c00717aad19549bde33ed26e6b441f5f (diff) | |
| download | ansible-dfly-vps-87c6e2caf082fbc68b721b5384861b283c0d7582.tar.bz2 | |
radicale: use full path to git; rotation log file
Diffstat (limited to 'roles/radicale')
| -rw-r--r-- | roles/radicale/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/radicale/templates/config.j2 | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/roles/radicale/tasks/main.yml b/roles/radicale/tasks/main.yml index dbd6839..213b523 100644 --- a/roles/radicale/tasks/main.yml +++ b/roles/radicale/tasks/main.yml @@ -63,3 +63,9 @@ - name: enable and start uwsgi command: rcenable uwsgi + +- name: newsyslog - uwsgi/radicale log rotation + lineinfile: + path: /etc/newsyslog.conf + regexp: '/var/log/uwsgi-radicale.log' + line: "/var/log/uwsgi-radicale.log 640 7 * @T00 Z /var/run/uwsgi-radicale.pid" diff --git a/roles/radicale/templates/config.j2 b/roles/radicale/templates/config.j2 index ca5e251..182cad1 100644 --- a/roles/radicale/templates/config.j2 +++ b/roles/radicale/templates/config.j2 @@ -67,7 +67,7 @@ filesystem_folder = {{ radicale.home }} # Command that is run after changes to storage # See: http://radicale.org/versioning/ -hook = ([ -d .git ] || git init) && git add -A && (git diff --cached --quiet || git commit -m "Changes by "%(user)s) +hook = ([ -d .git ] || /usr/local/bin/git init) && /usr/local/bin/git add -A && (/usr/local/bin/git diff --cached --quiet || /usr/local/bin/git commit -m "Changes by %(user)s") # Web interface backend |