From 3ff1649a8a5fa043f5d82c5f951860de5dc4158a Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sun, 1 Jul 2018 23:39:54 +0000 Subject: [PATCH] and we will try to get this to work --- files/download/sync-up-downloads.cc-rdu01.sh | 24 +++++++++++++++++++ inventory/group_vars/download | 1 + inventory/inventory | 2 +- playbooks/groups/download.yml | 2 +- .../templates/httpd/dl.fedoraproject.org.conf | 4 ++-- 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100755 files/download/sync-up-downloads.cc-rdu01.sh diff --git a/files/download/sync-up-downloads.cc-rdu01.sh b/files/download/sync-up-downloads.cc-rdu01.sh new file mode 100755 index 0000000000..93bd557fc2 --- /dev/null +++ b/files/download/sync-up-downloads.cc-rdu01.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +## +## This script is used to sync data from main download servers to +## secondary server at RDU community cage. +## + +RSYNC='/usr/bin/rsync' +RS_OPT="-avSHP --numeric-ids" +RS_DEADLY="--delete --delete-excluded --delete-delay --delay-updates" +EPL_EXCLUDES="" +FED_EXCLUDES="" + +SERVER=dl.fedoraproject.org + +# http://dl.fedoraproject.org/pub/epel/ +${RSYNC} ${RS_OPT} ${RS_DEADLY} ${EPL_EXCLUDES} ${SERVER}::fedora-epel/ /srv/pub/epel/ | tail -n2 | logger -p local0.notice -t rsync_updates_epel +# http://dl.fedoraproject.org/pub/fedora/ +${RSYNC} ${RS_OPT} ${RS_DEADLY} ${FED_EXCLUDES} ${SERVER}::fedora-enchilada0/ /srv/pub/fedora/ | tail -n2 | logger -p local0.notice -t rsync_updates_fedora +# http://dl.fedoraproject.org/pub/fedora-secondary/ +${RSYNC} ${RS_OPT} ${RS_DEADLY} ${FED_EXCLUDES} ${SERVER}::fedora-secondary0/ /srv/pub/fedora-secondary/ | tail -n2 | logger -p local0.notice -t rsync_updates_fedora_2nd + +# Let MM know I'm all up to date +#/usr/bin/report_mirror diff --git a/inventory/group_vars/download b/inventory/group_vars/download index 13345c789c..7d3fe98e72 100644 --- a/inventory/group_vars/download +++ b/inventory/group_vars/download @@ -33,6 +33,7 @@ dl_tier1: - auslistsprd01.us.dell.com # 143.166.82.43 - bonaparte.hrz.tu-chemnitz.de # 134.109.228.109 - download-ib01.fedoraproject.org # 152.19.134.145 + - download-cc-rdu01.fedoraproject.org # 8.43.85.72 - fedora.c3sl.ufpr.br # 200.236.31.8 - frisal.switch.ch # 130.59.113.36 - ftp.heanet.ie # 193.1.193.64 diff --git a/inventory/inventory b/inventory/inventory index 21f9aaca42..75c77f6bd5 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -340,7 +340,7 @@ download-ib01.fedoraproject.org [download-rdu2] download-rdu01.fedoraproject.org -[download-cc-rdu2] +[download-cc-rdu] download-cc-rdu01.fedoraproject.org [download_tier1] diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index c194b6c265..8b0021df71 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -1,4 +1,4 @@ -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download-ibiblio" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download-ibiblio:download-cc-rdu" - name: Download servers hosts: download diff --git a/roles/download/templates/httpd/dl.fedoraproject.org.conf b/roles/download/templates/httpd/dl.fedoraproject.org.conf index cc2e662ab1..edf3c7223f 100644 --- a/roles/download/templates/httpd/dl.fedoraproject.org.conf +++ b/roles/download/templates/httpd/dl.fedoraproject.org.conf @@ -1,6 +1,6 @@ ServerName dl.fedoraproject.org - ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org download-ib01.fedoraproject.org + ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org download-ib01.fedoraproject.org download-cc-rdu01.fedoraproject.org ServerAdmin webmaster@fedoraproject.org TraceEnable Off @@ -10,7 +10,7 @@ ServerName dl.fedoraproject.org - ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org download-ib01.fedoraproject.org + ServerAlias archive.fedoraproject.org archives.fedoraproject.org secondary.fedoraproject.org download-ib01.fedoraproject.org download-cc-rdu01.fedoraproject.org ServerAdmin webmaster@fedoraproject.org