Move fedora-elections fedmsg endpoints to the dynamically generated setup.
This commit is contained in:
parent
1e82482c6d
commit
b65639bc20
5 changed files with 11 additions and 30 deletions
|
@ -4,11 +4,11 @@ lvm_size: 20000
|
||||||
mem_size: 2048
|
mem_size: 2048
|
||||||
num_cpus: 2
|
num_cpus: 2
|
||||||
|
|
||||||
tcp_ports: [ 80,
|
wsgi_fedmsg_service: fedora_elections
|
||||||
# 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 ]
|
||||||
|
|
||||||
# Neeed for rsync from log01 for logs.
|
# Neeed for rsync from log01 for logs.
|
||||||
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
|
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
|
||||||
|
|
|
@ -4,10 +4,11 @@ lvm_size: 20000
|
||||||
mem_size: 1024
|
mem_size: 1024
|
||||||
num_cpus: 2
|
num_cpus: 2
|
||||||
|
|
||||||
tcp_ports: [ 80,
|
wsgi_fedmsg_service: fedora_elections
|
||||||
# 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 ]
|
||||||
|
|
||||||
# Neeed for rsync from log01 for logs.
|
# Neeed for rsync from log01 for logs.
|
||||||
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
|
custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ]
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
Alias /voting/static /usr/lib/python2.7/site-packages/fedora_elections/static
|
Alias /voting/static /usr/lib/python2.7/site-packages/fedora_elections/static
|
||||||
|
|
||||||
WSGIDaemonProcess elections maximum-requests=1000 display-name=elections processes=4 threads=4
|
WSGIDaemonProcess elections maximum-requests=1000 display-name=elections processes={{ wsgi_procs }} threads={{ wsgi_threads }}
|
||||||
WSGISocketPrefix run/wsgi
|
WSGISocketPrefix run/wsgi
|
||||||
WSGIRestrictStdout On
|
WSGIRestrictStdout On
|
||||||
WSGIRestrictSignal Off
|
WSGIRestrictSignal Off
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
- endpoints-nuancier.py
|
- endpoints-nuancier.py
|
||||||
- endpoints-kerneltest.py
|
- endpoints-kerneltest.py
|
||||||
- endpoints-github2fedmsg.py
|
- endpoints-github2fedmsg.py
|
||||||
|
- endpoints-elections.py
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
- fedmsgdconfig
|
- fedmsgdconfig
|
||||||
|
@ -64,7 +65,6 @@
|
||||||
- endpoints-anitya.py
|
- endpoints-anitya.py
|
||||||
- endpoints-pagure.py
|
- endpoints-pagure.py
|
||||||
- endpoints-fedocal.py
|
- endpoints-fedocal.py
|
||||||
- endpoints-elections.py
|
|
||||||
- endpoints-fedbadges.py
|
- endpoints-fedbadges.py
|
||||||
- endpoints-fmn-web.py
|
- endpoints-fmn-web.py
|
||||||
- endpoints-fmn-backend.py
|
- endpoints-fmn-backend.py
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
{% if env == 'staging' %}
|
|
||||||
suffix = 'stg.phx2.fedoraproject.org'
|
|
||||||
{% else %}
|
|
||||||
suffix = 'phx2.fedoraproject.org'
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
config = dict(
|
|
||||||
endpoints={
|
|
||||||
"fedora_elections.elections01": [
|
|
||||||
"tcp://elections01.%s:30%02i" % (suffix, i)
|
|
||||||
for i in range(16)
|
|
||||||
],
|
|
||||||
{% if env != 'staging' %}
|
|
||||||
"fedora_elections.elections02": [
|
|
||||||
"tcp://elections02.%s:30%02i" % (suffix, i)
|
|
||||||
for i in range(16)
|
|
||||||
],
|
|
||||||
{% endif %}
|
|
||||||
},
|
|
||||||
)
|
|
Loading…
Add table
Add a link
Reference in a new issue