summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Smoogen <smooge@redhat.com>2017-09-18 19:41:28 +0000
committerStephen Smoogen <smooge@redhat.com>2017-09-18 19:41:28 +0000
commit3d951473dd07e32ba40265ce734502817c30435d (patch)
tree8a47c5beedec4a234faaf4792efcf0d11f144408
parent216528c55ec49c14aa7cf9d10336283d0074e487 (diff)
downloadansible-3d951473dd07e32ba40265ce734502817c30435d.tar.gz
ansible-3d951473dd07e32ba40265ce734502817c30435d.tar.xz
ansible-3d951473dd07e32ba40265ce734502817c30435d.zip
and we need to fix this
-rwxr-xr-xfiles/download/sync-up-downloads.sh.ib0111
-rw-r--r--inventory/host_vars/download-ib01.fedoraproject.org2
-rw-r--r--inventory/inventory1
-rw-r--r--roles/rsyncd/templates/rsyncd.conf.download.j27
4 files changed, 17 insertions, 4 deletions
diff --git a/files/download/sync-up-downloads.sh.ib01 b/files/download/sync-up-downloads.sh.ib01
index 98624c7f5..dde40cf26 100755
--- a/files/download/sync-up-downloads.sh.ib01
+++ b/files/download/sync-up-downloads.sh.ib01
@@ -14,9 +14,13 @@ FED_EXCLUDES=""
DATE_EPEL='/root/last-epel-sync'
DATE_FED='/root/last-fed-sync'
+DATE_ARCHIVE='/root/last-archive-sync'
+DATE_ALT='/root/last-alt-sync'
+DATE_SECOND='/root/last-second-sync'
-touch ${DATE_EPEL}
-touch ${DATE_FED}
+for i in ${DATE_EPEL} ${DATE_FED} ${DATE_ARCHIVE} ${DATE_ALT} ${DATE_SECOND}; do
+ touch ${i}
+done
LAST_SYNC='/usr/local/bin/last-sync'
@@ -54,6 +58,9 @@ function sync_stuff() {
sync_stuff ${DATE_EPEL} rsync_epel fedora-epel0 /srv/pub/epel/ "-e"
sync_stuff ${DATE_FED} rsync_fedora fedora-enchilada0 /srv/pub/fedora/ "-f"
+sync_stuff ${DATE_ARCHIVE} rsync_archive fedora-archive0 /srv/pub/archive/ "-f"
+sync_stuff ${DATE_ALT} rsync_alt fedora-alt0 /srv/pub/alt/ "-f"
+sync_stuff ${DATE_SECOND} rsync_second fedora-secondary0 /srv/pub/fedora-secondary/ "-f"
# Let MM know I'm all up to date
#/usr/bin/report_mirror
diff --git a/inventory/host_vars/download-ib01.fedoraproject.org b/inventory/host_vars/download-ib01.fedoraproject.org
index ed0559d6a..d556cd591 100644
--- a/inventory/host_vars/download-ib01.fedoraproject.org
+++ b/inventory/host_vars/download-ib01.fedoraproject.org
@@ -6,7 +6,7 @@ dns: 8.8.8.8
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
-vmhost: ibiblio03.fedoraproject.org
+vmhost: ibiblio01.fedoraproject.org
volgroup: /dev/vg_guests
eth0_ip: 152.19.134.145
diff --git a/inventory/inventory b/inventory/inventory
index 59202008e..3021edf7c 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -360,7 +360,6 @@ download05.phx2.fedoraproject.org
[download-ibiblio]
download-ib01.fedoraproject.org
-download-ib02.fedoraproject.org
[download-rdu2]
download-rdu01.fedoraproject.org
diff --git a/roles/rsyncd/templates/rsyncd.conf.download.j2 b/roles/rsyncd/templates/rsyncd.conf.download.j2
index c488b9ede..9a7b0fcd9 100644
--- a/roles/rsyncd/templates/rsyncd.conf.download.j2
+++ b/roles/rsyncd/templates/rsyncd.conf.download.j2
@@ -141,6 +141,13 @@ refuse options = checksum
gid = 263
hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
+[fedora-secondary0]
+ comment = Fedora Secondary Archs
+ path = /srv/pub/fedora-secondary
+ list = no
+ uid = nobody
+ gid = 263
+ hosts allow = {% for host in vars['dl_tier1'] %}{{host}},{% endfor %}
[fedora-compose0]
comment = Fedora composes