diff --git a/inventory/group_vars/notifs-web b/inventory/group_vars/notifs-web index 02424d2e57..5c14dbb78f 100644 --- a/inventory/group_vars/notifs-web +++ b/inventory/group_vars/notifs-web @@ -7,10 +7,11 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 80, 443, - # These 16 ports are used by fedmsg. One for each wsgi thread. - 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, - 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +wsgi_fedmsg_service: fmn +wsgi_procs: 2 +wsgi_threads: 2 + +tcp_ports: [ 80 ] fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/inventory/group_vars/notifs-web-stg b/inventory/group_vars/notifs-web-stg index 02424d2e57..5c14dbb78f 100644 --- a/inventory/group_vars/notifs-web-stg +++ b/inventory/group_vars/notifs-web-stg @@ -7,10 +7,11 @@ num_cpus: 2 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -tcp_ports: [ 80, 443, - # These 16 ports are used by fedmsg. One for each wsgi thread. - 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, - 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +wsgi_fedmsg_service: fmn +wsgi_procs: 2 +wsgi_threads: 2 + +tcp_ports: [ 80 ] fas_client_groups: sysadmin-noc,sysadmin-datanommer diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index c0f2aaf5cd..dc5c91c1cb 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -41,6 +41,7 @@ - endpoints-kerneltest.py - endpoints-github2fedmsg.py - endpoints-elections.py + - endpoints-fmn-web.py tags: - config - fedmsgdconfig @@ -66,7 +67,6 @@ - endpoints-pagure.py - endpoints-fedocal.py - endpoints-fedbadges.py - - endpoints-fmn-web.py - endpoints-fmn-backend.py - endpoints-hotness.py - endpoints-mailman.py diff --git a/roles/notifs/frontend/tasks/main.yml b/roles/notifs/frontend/tasks/main.yml index 9dcd27b9ca..431a5b9227 100644 --- a/roles/notifs/frontend/tasks/main.yml +++ b/roles/notifs/frontend/tasks/main.yml @@ -44,7 +44,7 @@ - notifs/frontend - name: copy fmn httpd config - copy: > + template: > src=fmn.web.conf dest=/etc/httpd/conf.d/fmn.web.conf owner=apache group=apache mode=0644 notify: diff --git a/roles/notifs/frontend/files/fmn.web.conf b/roles/notifs/frontend/templates/fmn.web.conf similarity index 82% rename from roles/notifs/frontend/files/fmn.web.conf rename to roles/notifs/frontend/templates/fmn.web.conf index 01284b2144..b99358d5de 100644 --- a/roles/notifs/frontend/files/fmn.web.conf +++ b/roles/notifs/frontend/templates/fmn.web.conf @@ -1,6 +1,6 @@ Alias /notifications/static /usr/share/fmn.web/static -WSGIDaemonProcess fmn user=apache group=apache maximum-requests=1000 display-name=fmn processes=4 threads=4 +WSGIDaemonProcess fmn user=apache group=apache maximum-requests=1000 display-name=fmn processes={{ wsgi_procs }} threads={{ wsgi_threads }} WSGISocketPrefix run/wsgi WSGIRestrictStdout On WSGIRestrictSignal Off