diff --git a/playbooks/manual/staging-sync/mailman.yml b/playbooks/manual/staging-sync/mailman.yml
index f10ef04d04..85b1dd649a 100644
--- a/playbooks/manual/staging-sync/mailman.yml
+++ b/playbooks/manual/staging-sync/mailman.yml
@@ -13,6 +13,7 @@
- include: "{{ handlers_path }}/restart_services.yml"
tasks:
+ - service: name=webui-qcluster state=stopped
- service: name=httpd state=stopped
- service: name=mailman3 state=stopped
diff --git a/playbooks/manual/upgrade/pagure.yml b/playbooks/manual/upgrade/pagure.yml
index 349aed29ee..eb429f3ae5 100644
--- a/playbooks/manual/upgrade/pagure.yml
+++ b/playbooks/manual/upgrade/pagure.yml
@@ -39,11 +39,6 @@
update_cache=yes
when: testing
- - name: Create new tables in the database
- command: /usr/bin/python2 /usr/share/pagure/pagure_createdb.py
- environment:
- PAGURE_CONFIG: /etc/pagure/pagure.cfg
-
- name: Upgrade the database
command: /usr/bin/alembic -c /etc/pagure/alembic.ini upgrade head
args:
@@ -51,12 +46,20 @@
environment:
PAGURE_CONFIG: /etc/pagure/pagure.cfg
+ - name: call createdb
+ command: /usr/bin/python2 /usr/share/pagure/pagure_createdb.py
+ environment:
+ PAGURE_CONFIG: /etc/pagure/pagure.cfg
+
post_tasks:
- service: name="httpd" state=restarted
- service: name="pagure_ev" state=restarted
- service: name="pagure_ci" state=restarted
- service: name="pagure_webhook" state=restarted
- service: name="pagure_milter" state=restarted
+ - service: name="pagure_worker" state=restarted
+ - service: name="pagure_logcom" state=restarted
+ - service: name="pagure_loadjson" state=restarted
- name: tell nagios to unshush w.r.t. the frontend
nagios:
action=unsilence
diff --git a/roles/mediawiki/files/skins/Fedora.php b/roles/mediawiki/files/skins/Fedora.php
index fda1a78846..1956819b8c 100644
--- a/roles/mediawiki/files/skins/Fedora.php
+++ b/roles/mediawiki/files/skins/Fedora.php
@@ -91,22 +91,6 @@ class FedoraTemplate extends QuickTemplate {
if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
html('headscripts') ?>
-
-
- 
-
data['body_ondblclick']) { ?>ondblclick="text('body_ondblclick') ?>"
data['body_onload' ]) { ?>onload="text('body_onload') ?>"
diff --git a/roles/mediawiki123/files/skins/Fedora.php b/roles/mediawiki123/files/skins/Fedora.php
index fda1a78846..1956819b8c 100644
--- a/roles/mediawiki123/files/skins/Fedora.php
+++ b/roles/mediawiki123/files/skins/Fedora.php
@@ -91,22 +91,6 @@ class FedoraTemplate extends QuickTemplate {
if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
html('headscripts') ?>
-
-
-
-
data['body_ondblclick']) { ?>ondblclick="text('body_ondblclick') ?>"
data['body_onload' ]) { ?>onload="text('body_onload') ?>"
diff --git a/roles/pagure/frontend/templates/pagure.cfg b/roles/pagure/frontend/templates/pagure.cfg
index 601340e493..2344690142 100644
--- a/roles/pagure/frontend/templates/pagure.cfg
+++ b/roles/pagure/frontend/templates/pagure.cfg
@@ -158,9 +158,10 @@ SHORT_LENGTH = 7
### List of blacklisted project names that can conflicts for pagure's URLs
### or other
BLACKLISTED_PROJECTS = [
- 'static', 'pv', 'releases', 'new', 'api', 'settings',
- 'logout', 'login', 'users', 'groups', 'projects', 'ssh_info'
- 'issues', 'pull-requests', 'commits', 'tree', 'forks',
+ 'static', 'pv', 'releases', 'new', 'api', 'settings', 'search', 'fork',
+ 'logout', 'login', 'user', 'users', 'groups', 'projects', 'ssh_info',
+ 'issues', 'pull-requests', 'commits', 'tree', 'forks', 'admin', 'c',
+ 'wait',
]
DISABLED_PLUGINS = ['IRC']
diff --git a/roles/regcfp/templates/config.json b/roles/regcfp/templates/config.json
index c070b8d335..c0d0d9c9b4 100644
--- a/roles/regcfp/templates/config.json
+++ b/roles/regcfp/templates/config.json
@@ -57,13 +57,13 @@
},
"permissions": {
- "admin": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "duffy@fedoraproject.org", "decause@fedoraproject.org", "spot@fedoraproject.org", "robyduck@fedoraproject.org", "rsuehle@fedoraproject.org", "mattdm@fedoraproject.org"],
+ "admin": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "duffy@fedoraproject.org", "decause@fedoraproject.org", "spot@fedoraproject.org", "robyduck@fedoraproject.org", "rsuehle@fedoraproject.org", "mattdm@fedoraproject.org", "bex@fedoraproject.org", "duffy@fedoraproject.org"],
"papers": {
"submit": ["*authenticated*"],
"list": {
"accepted": ["jwboyer@fedoraproject.org", "spot@fedoraproject.org"],
"own": ["*authenticated*"],
- "all": ["pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "rsuehle@fedoraproject.org", "duffy@fedoraproject.org", "mattdm@fedoraproject.org", "decause@fedoraproject.org", "robyduck@fedoraproject.org", "spot@fedoraproject.org"]
+ "all": ["pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "rsuehle@fedoraproject.org", "duffy@fedoraproject.org", "mattdm@fedoraproject.org", "decause@fedoraproject.org", "robyduck@fedoraproject.org", "spot@fedoraproject.org", "bex@fedoraproject.org"]
},
"edit": {
"own": ["*authenticated*"],
@@ -83,7 +83,8 @@
"pay": ["*authenticated*"],
"request_receipt": [],
"view_public": [],
- "view_all": [""],
+ "view_all": ["bex@fedoraproject.org", "duffy@fedoraproject.org"],
+ "view_payment": ["bex@fedoraproject.org", "duffy@fedoraproject.org"],
"add_payment": [],
"print_badge": [],
"desk": [],