diff --git a/roles/distgit/files/fedmsg-genacls-config.py b/roles/distgit/files/fedmsg-genacls-config.py deleted file mode 100644 index b657de1de8..0000000000 --- a/roles/distgit/files/fedmsg-genacls-config.py +++ /dev/null @@ -1,4 +0,0 @@ -config = { - 'genacls.consumer.enabled': True, - 'genacls.consumer.delay': 5, # 5 seconds -} diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index bad9e62ba0..e30672b353 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -243,7 +243,8 @@ - distgit - name: install the fedmsg configuration - copy: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py owner=root group=root mode=0644 + template: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py + owner=root group=root mode=0644 tags: - config - distgit diff --git a/roles/distgit/templates/fedmsg-genacls-config.py b/roles/distgit/templates/fedmsg-genacls-config.py new file mode 100644 index 0000000000..c9bde6c5e4 --- /dev/null +++ b/roles/distgit/templates/fedmsg-genacls-config.py @@ -0,0 +1,12 @@ +config = { + 'genacls.consumer.enabled': True, + 'genacls.consumer.delay': 5, # 5 seconds + + # New world + 'gitoliteprefix.consumer.enabled': True, + 'gitoliteprefix.consumer.delay': 5, # 5 seconds + 'gitoliteprefix.consumer.filename': '/var/tmp/gitolite-prefix.txt', + 'gitoliteprefix.consumer.fasurl': 'https://admin.fedoraproject.org/accounts', + 'gitoliteprefix.consumer.username': "fasreadonly", + 'gitoliteprefix.consumer.password': {{ fasReadOnlyPassword }}, +}