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

Kill git protocol on pkgs with fire

Browse source 
Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
This commit is contained in:
Patrick Uiterwijk 2018-10-04 18:09:08 +02:00
parent 9095cedd90
commit 6782635a14
3 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
inventory/group_vars/pkgs
View file

@ -3,7 +3,7 @@ lvm_size: 100000
mem_size: 4096 mem_size: 4096
num_cpus: 4 num_cpus: 4
tcp_ports: [ 9418, 80, 443 ] tcp_ports: [ 80, 443 ]
# We have both celery (pagure_worker) and web thread wanting to send out fedmsg's. # 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. # To make things easy on the listening side (so avoid contention of binding ports), let's set the pkgs boxes to active fedmsg.
@ -23,13 +23,6 @@ fas_client_admin_app: PAGURE_CONFIG=/etc/pagure/pagure_hook.cfg HOME=/srv/git /u
fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc,sysadmin-veteran" fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc,sysadmin-veteran"
admin_groups: "@sysadmin-cvs @sysadmin-releng" admin_groups: "@sysadmin-cvs @sysadmin-releng"
git_group: packager
git_port: 9418
git_server: /usr/libexec/git-core/git-daemon
git_server_args: --export-all --syslog --inetd --verbose
git_basepath: /srv/git/repositories
git_daemon_user: nobody
clamscan_mailto: admin@fedoraproject.org clamscan_mailto: admin@fedoraproject.org
clamscan_paths: clamscan_paths:
- /srv/cache/lookaside/pkgs - /srv/cache/lookaside/pkgs

9
inventory/group_vars/pkgs-stg
View file

@ -3,7 +3,7 @@ lvm_size: 100000
mem_size: 4096 mem_size: 4096
num_cpus: 4 num_cpus: 4
tcp_ports: [ 9418, 80, 443, 8444, 8443 ] tcp_ports: [ 80, 443, 8444, 8443 ]
# Definining these vars has a number of effects # Definining these vars has a number of effects
# 1) mod_wsgi is configured to use the vars for its own setup # 1) mod_wsgi is configured to use the vars for its own setup
# 2) iptables opens enough ports for all threads for fedmsg # 2) iptables opens enough ports for all threads for fedmsg
@ -22,13 +22,6 @@ fas_client_admin_app: PAGURE_CONFIG=/etc/pagure/pagure_hook.cfg HOME=/srv/git /u
fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc,sysadmin-veteran" fas_client_ssh_groups: "@cvs,sysadmin-main,sysadmin-cvs,sysadmin-releng,sysadmin-noc,sysadmin-veteran"
admin_groups: "@sysadmin-cvs @sysadmin-releng" admin_groups: "@sysadmin-cvs @sysadmin-releng"
git_group: packager
git_port: 9418
git_server: /usr/libexec/git-core/git-daemon
git_server_args: --export-all --syslog --inetd --verbose
git_basepath: /srv/git/repositories
git_daemon_user: nobody
clamscan_mailto: admin@fedoraproject.org clamscan_mailto: admin@fedoraproject.org
clamscan_paths: clamscan_paths:
- /srv/cache/lookaside/pkgs - /srv/cache/lookaside/pkgs

1
playbooks/groups/pkgs.yml
View file

@ -30,7 +30,6 @@
- cgit/make_pkgs_list - cgit/make_pkgs_list
- gitolite/check_fedmsg_hooks - gitolite/check_fedmsg_hooks
- { role: git/make_checkout_seed, when: env != "staging" } - { role: git/make_checkout_seed, when: env != "staging" }
- git/server
- git/hooks - git/hooks
- git/checks - git/checks
- clamav - clamav