# HG changeset patch # User Luke Hoersten # Date 1662923297 18000 # Node ID da34c8d7511d85b857c1c741bf791cfa800bc4e0 # Parent d1e44e23f48e02a96b565ba88f30549e0623e5af Fixed uwsgi hosting for src.nth.io. diff -r d1e44e23f48e -r da34c8d7511d mercurial/web/handlers/main.yaml --- a/mercurial/web/handlers/main.yaml Sat Sep 10 15:18:24 2022 -0500 +++ b/mercurial/web/handlers/main.yaml Sun Sep 11 14:08:17 2022 -0500 @@ -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 -r d1e44e23f48e -r da34c8d7511d mercurial/web/tasks/main.yaml --- a/mercurial/web/tasks/main.yaml Sat Sep 10 15:18:24 2022 -0500 +++ b/mercurial/web/tasks/main.yaml Sun Sep 11 14:08:17 2022 -0500 @@ -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 -r d1e44e23f48e -r da34c8d7511d mercurial/web/templates/hgweb.ini.j2 --- a/mercurial/web/templates/hgweb.ini.j2 Sat Sep 10 15:18:24 2022 -0500 +++ b/mercurial/web/templates/hgweb.ini.j2 Sun Sep 11 14:08:17 2022 -0500 @@ -3,9 +3,7 @@ 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 -r d1e44e23f48e -r da34c8d7511d mercurial/web/templates/hgweb.nginx.conf.j2 --- a/mercurial/web/templates/hgweb.nginx.conf.j2 Sat Sep 10 15:18:24 2022 -0500 +++ b/mercurial/web/templates/hgweb.nginx.conf.j2 Sun Sep 11 14:08:17 2022 -0500 @@ -28,6 +28,6 @@ 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; } }