From 1d5bd68a5548df8d84681780c924552f03066ac5 Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Sun, 11 Sep 2022 14:08:17 -0500 Subject: Fixed uwsgi hosting for src.nth.io. --- mercurial/web/handlers/main.yaml | 2 +- mercurial/web/tasks/main.yaml | 11 ++++++----- mercurial/web/templates/hgweb.ini.j2 | 4 +--- mercurial/web/templates/hgweb.nginx.conf.j2 | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/mercurial/web/handlers/main.yaml b/mercurial/web/handlers/main.yaml index 9efe84d..b17bc67 100644 --- a/mercurial/web/handlers/main.yaml +++ b/mercurial/web/handlers/main.yaml @@ -1,5 +1,5 @@ --- - name: restart uwsgi - systemd: name="uwsgi.service" enabled="yes" daemon_reload="yes" state="restarted" + systemd: name="uwsgi-app@hgweb.service" enabled="yes" daemon_reload="yes" state="restarted" become: yes diff --git a/mercurial/web/tasks/main.yaml b/mercurial/web/tasks/main.yaml index ba3c27c..963b86f 100644 --- a/mercurial/web/tasks/main.yaml +++ b/mercurial/web/tasks/main.yaml @@ -1,13 +1,10 @@ --- -- name: pip install mercurial - become: yes - pip: name="mercurial" executable="pip3" - - name: apt install uwsgi become: yes apt: name="{{item}}" loop: + - "mercurial" - "uwsgi" - "uwsgi-plugin-python3" - "python3-pygments" @@ -36,4 +33,8 @@ - name: ensure uwsgi service is started become: yes - systemd: name="uwsgi.service" enabled="yes" + systemd: name="uwsgi-app@hgweb.socket" enabled="yes" + +- name: ensure uwsgi service is started + become: yes + systemd: name="uwsgi-app@hgweb.service" enabled="yes" diff --git a/mercurial/web/templates/hgweb.ini.j2 b/mercurial/web/templates/hgweb.ini.j2 index efa0901..b3927df 100644 --- a/mercurial/web/templates/hgweb.ini.j2 +++ b/mercurial/web/templates/hgweb.ini.j2 @@ -3,9 +3,7 @@ processes = 2 max-requests = 10240 max-requests-delta = 1024 max-worker-lifetime = 604800 -socket = unix:/run/uwsgi/app/hgweb/socket + chdir = {{mercurial_uwsgi_root}} wsgi-file = hgweb.wsgi -uid = www-data -gid = www-data plugins = python3 diff --git a/mercurial/web/templates/hgweb.nginx.conf.j2 b/mercurial/web/templates/hgweb.nginx.conf.j2 index fbe6d21..eb00b16 100644 --- a/mercurial/web/templates/hgweb.nginx.conf.j2 +++ b/mercurial/web/templates/hgweb.nginx.conf.j2 @@ -28,6 +28,6 @@ server { uwsgi_param SCRIPT_NAME /; uwsgi_param AUTH_USER $remote_user; uwsgi_param REMOTE_USER $remote_user; - uwsgi_pass unix:/run/uwsgi/app/hgweb/socket; + uwsgi_pass unix:/var/run/uwsgi/hgweb.socket; } } -- cgit v1.2.3