diff --git a/inventory/group_vars/notifs-web b/inventory/group_vars/notifs-web index bb20797c5f..9ecc4d22c4 100644 --- a/inventory/group_vars/notifs-web +++ b/inventory/group_vars/notifs-web @@ -10,3 +10,12 @@ num_cpus: 2 tcp_ports: [ 80, 443 ] fas_client_groups: sysadmin-noc,sysadmin-datanommer + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- service: fmn + owner: root + group: apache diff --git a/inventory/group_vars/notifs-web-stg b/inventory/group_vars/notifs-web-stg index bb20797c5f..9ecc4d22c4 100644 --- a/inventory/group_vars/notifs-web-stg +++ b/inventory/group_vars/notifs-web-stg @@ -10,3 +10,12 @@ num_cpus: 2 tcp_ports: [ 80, 443 ] fas_client_groups: sysadmin-noc,sysadmin-datanommer + +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- service: fmn + owner: root + group: apache diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index eeea233e2e..53376d7756 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -35,6 +35,7 @@ - endpoints.py - endpoints-fedocal.py - endpoints-fedbadges.py + - endpoints-fmn-web.py - endpoints-nuancier.py - endpoints-mailman.py - endpoints-summershum.py diff --git a/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 new file mode 100644 index 0000000000..4be8ac300f --- /dev/null +++ b/roles/fedmsg/base/templates/endpoints-fmn-web.py.j2 @@ -0,0 +1,18 @@ +{% if env == 'staging' %} +suffix = 'stg.phx2.fedoraproject.org' +{% else %} +suffix = 'phx2.fedoraproject.org' +{% endif %} + +config = dict( + endpoints={ + "fmn.notifs-web01": [ + "tcp://notifs-web01.%s:30%0.2i" % suffix + for i in range(16) + ], + "fmn.notifs-web02": [ + "tcp://notifs-web02.%s:30%0.2i" % suffix + for i in range(16) + ], + }, +) diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index fec9e94409..e37c071a37 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -25,6 +25,12 @@ config = dict( certnames=dict( [ + ("shell.notifs-web0%i" % i, "shell-notifs-web0%i.%s" % (i, suffix)) + for i in range(1, 3) + ] + [ + ("fmn.notifs-web0%i" % i, "pkgdb-notifs-web0%i.%s" % (i, suffix)) + for i in range(1, 3) + ] + [ ("shell.pkgdb0%i" % i, "shell-pkgdb0%i.%s" % (i, suffix)) for i in range(1, 3) ] + [