From da660c1852cec93d8020f05c74c9b2afdaf39722 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Sat, 23 May 2020 20:02:30 +0200 Subject: [PATCH] distgit/pagure: pagure in staging runs with python 3.6 Signed-off-by: Pierre-Yves Chibon --- roles/distgit/pagure/templates/z_pagure.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/distgit/pagure/templates/z_pagure.conf b/roles/distgit/pagure/templates/z_pagure.conf index e2b58fe791..6e7a6c105b 100644 --- a/roles/distgit/pagure/templates/z_pagure.conf +++ b/roles/distgit/pagure/templates/z_pagure.conf @@ -18,7 +18,11 @@ WSGIProcessGroup pagureproc # SSLCertificateChainFile /etc/pki/tls/certs/pagure.io.intermediate.cert # SSLCertificateKeyFile /etc/pki/tls/certs/pagure.io.key +{% if env == "staging" %} + Alias /static /usr/lib/python3.6/site-packages/pagure/static/ +{% else %} Alias /static /usr/lib/python2.7/site-packages/pagure/static/ +{% endif %} Alias /grokmirror /srv/git/grokmirror WSGIProcessGroup pagureproc @@ -33,4 +37,8 @@ RewriteCond "/usr/share/pagure_dist_git/static/$1" -f RewriteRule "^/static/(.*)" "/usr/share/pagure_dist_git/static/$1" [L] # Use the application default theme for files not customized +{% if env == "staging" %} +RewriteRule "^/static/(.*)" "/usr/lib/python3.6/site-packages/pagure/static/$1" [L] +{% else %} RewriteRule "^/static/(.*)" "/usr/lib/python2.7/site-packages/pagure/static/$1" [L] +{% endif %}