Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source
This commit is contained in:
Rick Elrod 2017-06-08 19:14:02 +00:00
commit ba8d21ed41
6 changed files with 17 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/manual/staging-sync/mailman.yml
View file

@ -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

13
playbooks/manual/upgrade/pagure.yml
View file

@ -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

16
roles/mediawiki/files/skins/Fedora.php
View file

@ -91,22 +91,6 @@ class FedoraTemplate extends QuickTemplate {
if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
<!-- Head Scripts -->
<?php $this->html('headscripts') ?>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(["setDomains", ["*.fedoraproject.org"]]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.fedorainfracloud.org/piwik/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 12]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.fedorainfracloud.org/piwik/piwik.php?idsite=12" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</head>
<body <?php if($this->data['body_ondblclick']) { ?>ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
<?php if($this->data['body_onload' ]) { ?>onload="<?php $this->text('body_onload') ?>"<?php } ?>

16
roles/mediawiki123/files/skins/Fedora.php
View file

@ -91,22 +91,6 @@ class FedoraTemplate extends QuickTemplate {
if($this->data['trackbackhtml']) print $this->data['trackbackhtml']; ?>
<!-- Head Scripts -->
<?php $this->html('headscripts') ?>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(["setDomains", ["*.fedoraproject.org"]]);
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.fedorainfracloud.org/piwik/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 12]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.fedorainfracloud.org/piwik/piwik.php?idsite=12" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</head>
<body <?php if($this->data['body_ondblclick']) { ?>ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
<?php if($this->data['body_onload' ]) { ?>onload="<?php $this->text('body_onload') ?>"<?php } ?>

7
roles/pagure/frontend/templates/pagure.cfg
View file

@ -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']

7
roles/regcfp/templates/config.json
View file

@ -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": [],