diff --git a/inventory/group_vars/pagure b/inventory/group_vars/pagure index 936691cf59..eb77f8a928 100644 --- a/inventory/group_vars/pagure +++ b/inventory/group_vars/pagure @@ -12,6 +12,15 @@ tcp_ports: [ 22, 80, 443, 9418, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015 ] +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- service: pagure + owner: git + group: apache + fas_client_groups: sysadmin-noc,sysadmin-web freezes: false diff --git a/inventory/group_vars/pagure-stg b/inventory/group_vars/pagure-stg index 3d2eb3019a..47f74d8bc6 100644 --- a/inventory/group_vars/pagure-stg +++ b/inventory/group_vars/pagure-stg @@ -12,6 +12,15 @@ tcp_ports: [ 22, 80, 443, 9418, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015 ] +# These are consumed by a task in roles/fedmsg/base/main.yml +fedmsg_certs: +- service: shell + owner: root + group: sysadmin +- service: pagure + owner: git + group: apache + fas_client_groups: sysadmin-noc,sysadmin-web freezes: false diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index fd032b9ac8..3f407be7f3 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -56,6 +56,7 @@ roles: - pagure + - fedmsg/base handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/roles/fedmsg/base/templates/endpoints.py.j2 b/roles/fedmsg/base/templates/endpoints.py.j2 index c4ad687e99..3fa819aba5 100644 --- a/roles/fedmsg/base/templates/endpoints.py.j2 +++ b/roles/fedmsg/base/templates/endpoints.py.j2 @@ -89,6 +89,19 @@ config = dict( for i in range(2) ], + # pagure runs as 4 procs and 4 threads, so 16 endpoints in total. +{% if env != 'staging' %} + "pagure.pagure01": [ + "tcp://pagure01.fedoraproject.org:30%02i" % i + for i in range(16) + ], +{% else %} + "pagure.pagure-stg01": [ + "tcp://pagure-stg01.fedoraproject.org:30%02i" % i + for i in range(16) + ], +{% endif %} + # mizdebsk says he thinks we'll need three sockets. Two services # (koschei-resolver and koschei-polling) are only sending messages, one # service (koschei-watcher) can both send and receive them. The wsgi diff --git a/roles/fedmsg/base/templates/ssl.py.j2 b/roles/fedmsg/base/templates/ssl.py.j2 index ab3e6c3499..85500dfe07 100644 --- a/roles/fedmsg/base/templates/ssl.py.j2 +++ b/roles/fedmsg/base/templates/ssl.py.j2 @@ -175,6 +175,14 @@ config = dict( ("shell.koschei01", "shell-koschei01.%s" % suffix), ("koschei.koschei01", "koschei-koschei01.%s" % suffix), +{% if env == 'staging' %} + ("shell.pagure01", "shell-pagure01.fedoraproject.org"), + ("pagure.pagure01", "pagure-pagure01.fedoraproject.org"), +{% else %} + ("shell.pagure-stg01", "shell-pagure-stg01.fedoraproject.org"), + ("pagure.pagure-stg01", "pagure-pagure-stg01.fedoraproject.org"), +{% endif %} + ("shell.elections01", "shell-elections01.%s" % suffix), ("shell.elections02", "shell-elections02.%s" % suffix), ("fedora_elections.elections01", "fedora_elections-elections01.%s" % suffix),