Download:
parent 3:697ce0fdd884
4:14841fed8ac3 default tip
Anton Shestakov <av6@dwimlabs.net>, Mon, 28 Sep 2020 11:31:48 +0800
hgweb: run on Python 3

5 файлов изменено, 6 вставок(+), 5 удалений(-) [+]
playbook-example.yml file | annotate | diff | comparison | revisions
roles/hgweb/handlers/main.yml file | annotate | diff | comparison | revisions
roles/hgweb/tasks/main.yml file | annotate | diff | comparison | revisions
roles/hgweb/templates/etc/uwsgi/apps-available/hgweb.yaml file | annotate | diff | comparison | revisions
roles/hgweb/templates/hgweb.wsgi file | annotate | diff | comparison | revisions
--- a/playbook-example.yml Mon Sep 28 11:12:42 2020 +0800
+++ b/playbook-example.yml Mon Sep 28 11:31:48 2020 +0800
@@ -30,7 +30,7 @@
apt:
package:
- uwsgi
- - uwsgi-plugin-python
+ - uwsgi-plugin-python3
state: present
roles:
# - role: lighttpd
--- a/roles/hgweb/handlers/main.yml Mon Sep 28 11:12:42 2020 +0800
+++ b/roles/hgweb/handlers/main.yml Mon Sep 28 11:31:48 2020 +0800
@@ -1,6 +1,6 @@
---
- name: make local
- command: make --directory /home/{{ hgweb_user }}/hg/ local
+ command: make PYTHON=python3 --directory /home/{{ hgweb_user }}/hg/ local
become: yes
become_user: '{{ hgweb_user }}'
--- a/roles/hgweb/tasks/main.yml Mon Sep 28 11:12:42 2020 +0800
+++ b/roles/hgweb/tasks/main.yml Mon Sep 28 11:31:48 2020 +0800
@@ -10,8 +10,8 @@
with_items:
- build-essential
- mercurial
- - python-dev
- - python-pygments # for hightlight extension
+ - python3-dev
+ - python3-pygments # for hightlight extension
tags: [packages, inert]
- include: appinstall.yml
--- a/roles/hgweb/templates/etc/uwsgi/apps-available/hgweb.yaml Mon Sep 28 11:12:42 2020 +0800
+++ b/roles/hgweb/templates/etc/uwsgi/apps-available/hgweb.yaml Mon Sep 28 11:31:48 2020 +0800
@@ -2,6 +2,7 @@
chdir: /home/{{ hgweb_user }}/hgwebfiles/
wsgi-file: hgweb.wsgi
touch-reload: hgweb.wsgi
+ plugins: python3
uid: {{ hgweb_user }}
# PATH_INFO is empty when using uwsgi protocol?
http-socket: socket
--- a/roles/hgweb/templates/hgweb.wsgi Mon Sep 28 11:12:42 2020 +0800
+++ b/roles/hgweb/templates/hgweb.wsgi Mon Sep 28 11:31:48 2020 +0800
@@ -1,5 +1,5 @@
# Path to repo or hgweb config to serve (see 'hg help hgweb')
-config = "/home/{{ hgweb_user }}/hgwebfiles/hgweb.conf"
+config = b"/home/{{ hgweb_user }}/hgwebfiles/hgweb.conf"
# Uncomment and adjust if Mercurial is not installed system-wide
# (consult "installed modules" path from 'hg debuginstall'):