distgit/pagure: move some configuration key to the shared config

- Use fedora-messaging everywhere instead of fedmsg
- Make setting: ALWAYS_FEDMSG_ON_COMMITS always true

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

roles/distgit/pagure/templates/pagure.cfg

@@ -217,17 +217,8 @@ ENABLE_UI_NEW_PROJECTS = False
 ALLOWED_PREFIX = ['rpms', 'modules', 'flatpaks', 'container', 'tests']
 EXCLUDE_GROUP_INDEX = ['packager']
 PRIVATE_PROJECTS = False
-{% if env == 'staging' %}
-FEDMSG_NOTIFICATIONS = False
-FEDORA_MESSAGING_NOTIFICATIONS = True
-{% else %}
-FEDMSG_NOTIFICATIONS = True
-FEDORA_MESSAGING_NOTIFICATIONS = False
-{% endif %}
 PR_TARGET_MATCHING_BRANCH = True
 
-ALWAYS_FEDMSG_ON_COMMITS = True
-
 ACLS = {
     'create_branch': 'Create a git branch on a project',
     'create_project': 'Create a new project',

roles/distgit/pagure/templates/pagure_shared.cfg

@@ -55,6 +55,9 @@ ALLOW_DELETE_BRANCH = False
 EMAIL_ON_WATCHCOMMITS = False
 GIT_HOOK_DB_RO = True
 LOG_ALL_COMMITS = True
+ALWAYS_FEDMSG_ON_COMMITS = True
+FEDMSG_NOTIFICATIONS = False
+FEDORA_MESSAGING_NOTIFICATIONS = True
 
 DISABLED_PLUGINS = ['IRC', 'Pagure tickets', 'Read the Doc', 'Fedmsg']
 

roles/pagure/frontend/templates/pagure.cfg

@@ -326,7 +326,6 @@ FAST_CELERY_QUEUE = 'fast_workers'
 MEDIUM_CELERY_QUEUE = 'medium_workers'
 SLOW_CELERY_QUEUE = 'slow_workers'
 PRIVATE_PROJECTS = False
-FEDMSG_NOTIFICATIONS = True
 THEME = 'pagureio'
 
 MIRROR_SSHKEYS_FOLDER='/srv/mirror/ssh'