Merge branch 'master' of /git/ansible

This commit is contained in:
Kevin Fenzi 2016-01-27 22:20:39 +00:00
commit 302a6f94b7
2 changed files with 6 additions and 13 deletions

View file

@ -9,10 +9,10 @@
tags: tags:
- packages - packages
- name: Clone the regcfp flock2016 branch - name: Clone the regcfp master branch
git: repo=https://github.com/puiterwijk/regcfp.git git: repo=https://github.com/puiterwijk/regcfp.git
dest=/srv/regcfp dest=/srv/regcfp
version=flock2016 version=master
clone=yes update=yes clone=yes update=yes
# TODO: Find EPEL packages for these # TODO: Find EPEL packages for these

View file

@ -46,22 +46,22 @@
"permissions": { "permissions": {
"admin": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "robyduck@fedoraproject.org", "rsuehle@fedoraproject.org"], "admin": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "robyduck@fedoraproject.org", "rsuehle@fedoraproject.org"],
"papers": { "papers": {
"submit": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "submit": ["*authenticated*"],
"list": { "list": {
"accepted": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "accepted": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"],
"own": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "own": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"],
"all": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org"] "all": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org"]
}, },
"tag": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "tag": ["*authenticated*"],
"vote": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "vote": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"],
"showvotes": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "showvotes": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"],
"accept": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org"] "accept": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org"]
}, },
"registration": { "registration": {
"register": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "register": ["*authenticated*"],
"pay": [], "pay": [],
"request_receipt": [], "request_receipt": [],
"view_public": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "view_public": ["*authenticated*"],
"view_all": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "view_all": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"],
"add_payment": [], "add_payment": [],
"print_badge": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"], "print_badge": ["puiterwijk@fedoraproject.org", "pfrields@fedoraproject.org", "jwboyer@fedoraproject.org", "jzb@fedoraproject.org", "rsuehle@fedoraproject.org"],
@ -86,13 +86,6 @@
"registration": { "registration": {
"enabled": true, "enabled": true,
"fields": { "fields": {
"fullname": {
"display_name": "Full name",
"type": "string",
"required": true,
"private": false,
"placeholder": ""
},
"country": { "country": {
"display_name": "Country", "display_name": "Country",
"type": "country", "type": "country",