diff --git a/inventory/group_vars/pkgs b/inventory/group_vars/pkgs index 641a2c77bb..67227956c1 100644 --- a/inventory/group_vars/pkgs +++ b/inventory/group_vars/pkgs @@ -8,6 +8,14 @@ tcp_ports: [80, 443, 9418, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Definining these vars has a number of effects +# 1) mod_wsgi is configured to use the vars for its own setup +# 2) iptables opens enough ports for all threads for fedmsg +# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads +wsgi_fedmsg_service: pagure +wsgi_procs: 4 +wsgi_threads: 4 + fas_client_groups: sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc fas_client_restricted_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell %(username)s fas_client_admin_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell -s %(username)s diff --git a/inventory/group_vars/pkgs-stg b/inventory/group_vars/pkgs-stg index 740f735fc8..232f9e5a27 100644 --- a/inventory/group_vars/pkgs-stg +++ b/inventory/group_vars/pkgs-stg @@ -8,6 +8,14 @@ tcp_ports: [80, 443, 9418, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Definining these vars has a number of effects +# 1) mod_wsgi is configured to use the vars for its own setup +# 2) iptables opens enough ports for all threads for fedmsg +# 3) roles/fedmsg/base/ declares enough fedmsg endpoints for all threads +wsgi_fedmsg_service: pagure +wsgi_procs: 4 +wsgi_threads: 4 + fas_client_groups: sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc fas_client_restricted_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell %(username)s fas_client_admin_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell -s %(username)s diff --git a/roles/distgit/pagure/templates/0_pagure.conf b/roles/distgit/pagure/templates/0_pagure.conf index e87a778d57..80bf4d7764 100644 --- a/roles/distgit/pagure/templates/0_pagure.conf +++ b/roles/distgit/pagure/templates/0_pagure.conf @@ -3,7 +3,7 @@ WSGISocketPrefix run/wsgi WSGIRestrictSignal Off WSGIPythonOptimize 1 WSGIPassAuthorization On -WSGIDaemonProcess pagureproc user=pagure group=packager maximum-requests=1000 display-name=pagure processes=4 threads=4 inactivity-timeout=300 +WSGIDaemonProcess pagureproc user=pagure group=packager maximum-requests=1000 display-name=pagure processes={{ wsgi_procs }} threads={{ wsgi_threads }} inactivity-timeout=300 WSGIScriptAlias /pagure /var/www/pagure.wsgi