From 87ce71a5a9a41e3527002a84d7642a4b9b9c5adb Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Tue, 14 Jan 2020 19:13:25 +0000 Subject: [PATCH] [pkgs] make it so pkgs has pagure user --- inventory/group_vars/pkgs | 3 +++ inventory/group_vars/pkgs_stg | 2 ++ playbooks/groups/pkgs.yml | 16 +++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/inventory/group_vars/pkgs b/inventory/group_vars/pkgs index 682663bdd9..b36bd81718 100644 --- a/inventory/group_vars/pkgs +++ b/inventory/group_vars/pkgs @@ -17,6 +17,9 @@ wsgi_fedmsg_service: pagure wsgi_procs: 6 wsgi_threads: 6 +pagure_static_uid: 600 + + fas_client_groups: sysadmin-main,sysadmin-cvs,sysadmin-noc,sysadmin-veteran fas_client_restricted_app: PAGURE_CONFIG=/etc/pagure/pagure_hook.cfg HOME=/srv/git /usr/libexec/pagure/aclchecker.py %(username)s fas_client_admin_app: PAGURE_CONFIG=/etc/pagure/pagure_hook.cfg HOME=/srv/git /usr/libexec/pagure/aclchecker.py %(username)s diff --git a/inventory/group_vars/pkgs_stg b/inventory/group_vars/pkgs_stg index 3bb26222db..045c8d8393 100644 --- a/inventory/group_vars/pkgs_stg +++ b/inventory/group_vars/pkgs_stg @@ -12,6 +12,8 @@ wsgi_fedmsg_service: pagure wsgi_procs: 4 wsgi_threads: 4 +pagure_static_uid: 600 + # We have both celery (pagure_worker) and web thread wanting to send out fedmsg's. # To make things easy on the listening side (so avoid contention of binding ports), let's set the pkgs boxes to active fedmsg. fedmsg_active: True diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 00a261f395..27640af0e6 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -30,7 +30,7 @@ mnt_dir: '/srv/cache/lookaside', nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='rw,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3' } - { role: nfs/client, - when: env == "staging" and inventory_hostname.startswith('pkgs02'), + when: env == "staging" and inventory_hostname.startswith('pkgs01'), mnt_dir: '/srv/cache/lookaside_prod', nfs_src_dir: 'fedora_sourcecache', nfs_mount_opts='ro,hard,bg,intr,noatime,nodev,nosuid,sec=sys,nfsvers=3' } - role: distgit/pagure @@ -56,6 +56,20 @@ handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" +- name: setup users on pkgs + hosts: pkgs_stg:pkgs02.phx2.fedoraproject.org + user: root + gather_facts: True + + tasks: + - name: Setup pagure user + user: + name: pagure + uid: "{{ pagure_static_uid }}" + shell: /sbin/nologin + comment: "Pagure User" + when: env == "staging" and inventory_hostname.startswith('pkgs01'), + - name: setup fedmsg on pkgs hosts: pkgs_stg:pkgs02.phx2.fedoraproject.org