From 2e1ea4df861fe1682331d8ac051d435bcb160cf7 Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Tue, 10 Apr 2018 23:21:42 +0800
Subject: radicale: Use the default path of uwsgi socket
---
roles/radicale/tasks/main.yml | 1 -
roles/web/templates/sites/liwt.radicale.conf.j2 | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/roles/radicale/tasks/main.yml b/roles/radicale/tasks/main.yml
index c6a88bc..a39a50c 100644
--- a/roles/radicale/tasks/main.yml
+++ b/roles/radicale/tasks/main.yml
@@ -56,7 +56,6 @@
marker: "# {mark} ANSIBLE MANAGED - uwsgi/radicale"
block: |
uwsgi_profiles="${uwsgi_profiles} radicale"
- uwsgi_radicale_socket="/var/run/uwsgi-radicale.sock"
uwsgi_radicale_uid="radicale"
uwsgi_radicale_gid="radicale"
uwsgi_radicale_flags="-L --log-reopen --logfile-chown --wsgi-file {{ radicale.wwwdir }}/radicale.wsgi --env RADICALE_CONFIG={{ radicale.etcdir }}/config"
diff --git a/roles/web/templates/sites/liwt.radicale.conf.j2 b/roles/web/templates/sites/liwt.radicale.conf.j2
index 2822fb8..728717f 100644
--- a/roles/web/templates/sites/liwt.radicale.conf.j2
+++ b/roles/web/templates/sites/liwt.radicale.conf.j2
@@ -45,7 +45,7 @@ server {
include uwsgi_params;
# Require to set 'auth/type' to 'remote_user' in config file
uwsgi_param REMOTE_USER $username;
- uwsgi_pass unix:/var/run/uwsgi-radicale.sock;
+ uwsgi_pass unix:/tmp/uwsgi-radicale.sock;
}
}
{% endif %}
--
cgit v1.2.2