Move fmn.web fedmsg endpoints into the dynamically generated set.

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,
+wsgi_fedmsg_service: fmn
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
+wsgi_procs: 2
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
+wsgi_threads: 2
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+
+tcp_ports: [ 80 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-datanommer
 

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,
+wsgi_fedmsg_service: fmn
-    # These 16 ports are used by fedmsg.  One for each wsgi thread.
+wsgi_procs: 2
-    3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007,
+wsgi_threads: 2
-    3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015]
+
+tcp_ports: [ 80 ]
 
 fas_client_groups: sysadmin-noc,sysadmin-datanommer
 

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

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:

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