commit 6e44d250cddec6151cfd928f74c58b100269b796 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Fri Oct 14 23:42:07 2016 +0200 Upate to packager group group_vars/pkgs | 4 ++-- roles/bodhi2/base/templates/production.ini.j2 | 3 +-- roles/distgit/files/dist-git-upload.cgi | 2 +- roles/distgit/tasks/main.yml | 18 +++++++++--------- roles/distgit/templates/genacls.sh | 2 +- roles/fas_server/templates/fas.cfg.j2 | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) --- diff --git a/group_vars/pkgs b/group_vars/pkgs index f151d00..4f5d451 100644 --- a/group_vars/pkgs +++ b/group_vars/pkgs @@ -14,7 +14,7 @@ fas_client_admin_app: HOME=/srv/git /usr/share/gitolite3/gitolite-shell -s {user fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-build" admin_groups: "@sysadmin-build" -git_group: cvsextras +git_group: packager git_port: 9418 git_server: /usr/libexec/git-core/git-daemon git_server_args: --export-all --syslog --inetd --verbose @@ -51,7 +51,7 @@ fedmsg_certs: - logger.log - service: scm owner: root - group: cvsextras + group: packager can_send: - git.receive - service: lookaside diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2 index b9f03e3..7e6a394 100644 --- a/roles/bodhi2/base/templates/production.ini.j2 +++ b/roles/bodhi2/base/templates/production.ini.j2 @@ -377,8 +377,7 @@ important_groups = proventesters provenpackager releng security_respons packager admin_packager_groups = provenpackager releng # User must be a member of this group to submit updates -#mandatory_packager_groups = packager -mandatory_packager_groups = cvsextras +mandatory_packager_groups = packager ## ## updateinfo.xml configuraiton diff --git a/roles/distgit/files/dist-git-upload.cgi b/roles/distgit/files/dist-git-upload.cgi index 9ba9d98..e8f73c8 100755 --- a/roles/distgit/files/dist-git-upload.cgi +++ b/roles/distgit/files/dist-git-upload.cgi @@ -28,7 +28,7 @@ GITREPO = '/srv/git/repositories' CACHE_DIR = '/srv/cache/lookaside/pkgs' # Fedora Packager Group -PACKAGER_GROUP = 'cvsextras' +PACKAGER_GROUP = 'packager' def send_error(text, status='500 Internal Server Error'): """Send an error back to the client diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index f8eedb9..8deaec9 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -54,11 +54,11 @@ - selinux - name: create the distgit root directory (/srv/git/repositories) - file: dest=/srv/git/repositories state=directory mode=2775 group=cvsextras + file: dest=/srv/git/repositories state=directory mode=2775 group=packager # These should all map to pkgdb namespaces - name: create our namespace directories inside there.. - file: dest=/srv/git/repositories/{{item}} state=directory mode=2775 group=cvsextras + file: dest=/srv/git/repositories/{{item}} state=directory mode=2775 group=packager with_items: - free - nonfree @@ -101,7 +101,7 @@ # -- Gitolite -------------------------------------------- # This is the permission management for package maintainers, using Gitolite. - name: create the /var/log/gitolite directory - file: path=/var/log/gitolite owner=root group=cvsextras state=directory mode=2775 + file: path=/var/log/gitolite owner=root group=packager state=directory mode=2775 - name: create the gen-acls group group: name=gen-acls gid=417 state=present @@ -112,7 +112,7 @@ comment="dummy system account for the gen-acls fedmsg job" uid=417 group=gen-acls - groups=cvsextras + groups=packager shell=/bin/bash home=/srv/git @@ -120,11 +120,11 @@ file: path=/etc/gitolite/conf owner=gen-acls group=gen-acls state=directory mode=0755 - name: create the /etc/gitolite/logs directory - file: path=/etc/gitolite/logs owner=gen-acls group=cvsextras + file: path=/etc/gitolite/logs owner=gen-acls group=packager state=directory mode=0775 - name: create the /etc/gitolite/local/VREF directory - file: path=/etc/gitolite/local/VREF owner=gen-acls group=cvsextras + file: path=/etc/gitolite/local/VREF owner=gen-acls group=packager state=directory mode=0775 - name: create /etc/gitolite/gitolite.rc @@ -204,19 +204,19 @@ - name: Save the list the users having a shell access template: src=gitolite_admins dest=/etc/gitolite/admins - owner=gen-acls group=cvsextras mode=660 + owner=gen-acls group=packager mode=660 tags: - config - distgit - name: Fix permissions on the Gitolite stuff - file: dest={{ item.name }} group=cvsextras mode={{ item.mode }} state={{ item.state }} + file: dest={{ item.name }} group=packager mode={{ item.mode }} state={{ item.state }} with_items: - {name: /etc/gitolite/hooks, mode: 770, state: directory} - {name: /etc/gitolite/hooks/common, mode: 770, state: directory} - name: Fix permissions on the Gitolite stuff (touch update if it does not exist) - copy: content="" dest=/etc/gitolite/hooks/common/update force=no owner=root group=cvsextras mode=0755 + copy: content="" dest=/etc/gitolite/hooks/common/update force=no owner=root group=packager mode=0755 tags: - distgit - config diff --git a/roles/distgit/templates/genacls.sh b/roles/distgit/templates/genacls.sh index 69b5d3e..a00132b 100644 --- a/roles/distgit/templates/genacls.sh +++ b/roles/distgit/templates/genacls.sh @@ -33,5 +33,5 @@ HOME=/srv/git /usr/bin/gitolite compile cd / rm -rf $TEMPDIR -chown root:cvsextras /etc/gitolite/conf/gitolite.conf-compiled.pm +chown root:packager /etc/gitolite/conf/gitolite.conf-compiled.pm chmod g+r /etc/gitolite/conf/gitolite.conf-compiled.pm diff --git a/roles/fas_server/templates/fas.cfg.j2 b/roles/fas_server/templates/fas.cfg.j2 index c85f917..1020a3c 100644 --- a/roles/fas_server/templates/fas.cfg.j2 +++ b/roles/fas_server/templates/fas.cfg.j2 @@ -126,7 +126,7 @@ cla_deprecated_groups = ['cla_rpmfusion'] # Groups that automatically grant membership to other groups # Format: 'group1:a,b,c|group2:d,e,f' -auto_approve_groups = 'packager:fedorabugs|qa:fedorabugs|security-team:fedorabugs|qa-beaker-user:qa-automation-shell|docs:fedorabugs|cla_fpca:cla_done|cla_redhat:cla_done|cla_dell:cla_done|cla_ibm:cla_done|cla_intel:cla_done' +auto_approve_groups = 'packager:rpmfusionbugs|qa:rpmfusionbugs|security-team:rpmfusionbugs|qa-beaker-user:qa-automation-shell|docs:rpmfusionbugs|cla_fpca:cla_done|cla_redhat:cla_done|cla_dell:cla_done|cla_ibm:cla_done|cla_intel:cla_done' # Anti-spam approval check script, which injects in both registration and CLA steps # In Fedora, this is provided by the Basset service