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

removing koji/compose from downloads as nothing seems to be getting packages from it

Browse source
This commit is contained in:
Stephen Smoogen 2019-08-06 18:25:28 +00:00 • committed by Pierre-Yves Chibon
parent fbe2b5fea7
commit ffdc193701
4 changed files with 0 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
playbooks/groups/download.yml
View file

@ -38,7 +38,6 @@
- { role: mod_limitipconn, when: ansible_distribution_major_version|int != '7'} - { role: mod_limitipconn, when: ansible_distribution_major_version|int != '7'}
- rsyncd - rsyncd
- { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
- { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/mnt/koji/compose', nfs_src_dir: 'fedora_koji/koji/compose' }
- { role: nfs/client, when: datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' }
- sudo - sudo
- { role: openvpn/client, when: datacenter != "phx2" } - { role: openvpn/client, when: datacenter != "phx2" }

3
roles/download/tasks/main.yml
View file

@ -16,9 +16,6 @@
- name: Create /srv/web directory - name: Create /srv/web directory
file: path=/srv/web state=directory file: path=/srv/web state=directory
- name: Create /mnt/koji/compose directory
file: path=/mnt/koji/compose state=directory
- name: Set httpd_use_nfs seboolean - name: Set httpd_use_nfs seboolean
seboolean: name=httpd_use_nfs state=yes persistent=yes seboolean: name=httpd_use_nfs state=yes persistent=yes

13
roles/download/templates/httpd/dl.fedoraproject.org.conf
View file

@ -27,18 +27,5 @@
SSLProtocol {{ ssl_protocols }} SSLProtocol {{ ssl_protocols }}
SSLCipherSuite {{ ssl_ciphers }} SSLCipherSuite {{ ssl_ciphers }}
{% if inventory_hostname.startswith('download0') %}
# In phx2, also serve /compose content
Alias /compose /mnt/koji/compose
<Directory /mnt/koji/compose>
HeaderName /HEADER.html
ReadmeName /FOOTER.html
Options Indexes FollowSymLinks
Require all granted
IndexOptions NameWidth=* FancyIndexing
</Directory>
{% endif %}
Include "conf.d/dl.fedoraproject.org/*.conf" Include "conf.d/dl.fedoraproject.org/*.conf"
</VirtualHost> </VirtualHost>

10
roles/rsyncd/templates/rsyncd.conf.download.j2
View file

@ -149,16 +149,6 @@ refuse options = checksum
gid = 263 gid = 263
hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %} hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
{% if datacenter == 'phx2' %}
[fedora-compose0]
comment = Fedora composes
path = /mnt/koji/compose
list = no
uid = nobody
gid = nobody
hosts allow = 10.0.0.0/8, 209.132.0.0/16
{% endif %}
# For distributing applications # For distributing applications
[log] [log]
comment = Server Logs comment = Server Logs