diff --git a/modules/release_guide/pages/sop_mass_branching.adoc b/modules/release_guide/pages/sop_mass_branching.adoc index 2948dce..650c6e4 100644 --- a/modules/release_guide/pages/sop_mass_branching.adoc +++ b/modules/release_guide/pages/sop_mass_branching.adoc @@ -152,12 +152,12 @@ we now use a script to fetch active packages by filtering out retired and never- === Generate the Active Package List -This script should be run in the **pkg machine**, which can be accessed via SSH from `batcave01.iad.fedoraproject.org`. +This script should be run in the **pkg machine**, which can be accessed via SSH from `batcave01.rdu3.fedoraproject.org`. ``` -$ ssh batcave01.iad.fedoraproject.org -$ sudo ssh pkgs01.iad.fedoraproject.org # For production -$ sudo ssh pkgs01.stg.iad.fedoraproject.org # For testing +$ ssh batcave01.rdu3.fedoraproject.org +$ sudo ssh pkgs01.rdu3.fedoraproject.org # For production +$ sudo ssh pkgs01.stg.rdu3.fedoraproject.org # For testing ``` Before running the script, you need to **obtain the script from the Fedora RelEng repository**. You can do this in one of two ways: diff --git a/modules/sysadmin_guide/pages/mastermirror.adoc b/modules/sysadmin_guide/pages/mastermirror.adoc index 4e8f43e..405173b 100644 --- a/modules/sysadmin_guide/pages/mastermirror.adoc +++ b/modules/sysadmin_guide/pages/mastermirror.adoc @@ -3,8 +3,7 @@ == Contents * <<_contact_information>> -* <<_iad_master_mirror_setup>> -* <<_rdu_i2_master_mirror_setup>> +* <<_rdu3_master_mirror_setup>> * <<_raising_issues>> == Contact Information @@ -14,60 +13,38 @@ Owner::: Contact::: #fedora-admin, Red Hat ticket Servers::: - server[1-5].download.rdu3.redhat.com + dl0[1-5].rdu3.fedoraproject.org Purpose::: Provides the master mirrors for Fedora distribution -== IAD Master Mirror Setup +== Master Mirror Setup The master mirrors are accessible as: .... -download1.fedora.redhat.com -> CNAME to download3.fedora.redhat.com -download2.fedora.redhat.com -> currently no DNS entry -download3.fedora.redhat.com -> 209.132.176.20 -download4.fedora.redhat.com -> 209.132.176.220 -download5.fedora.redhat.com -> 209.132.176.221 +dl01.fedoraproject.org -> 38.145.32.22 +dl02.fedoraproject.org -> 38.145.32.23 +dl03.fedoraproject.org -> 38.145.32.24 +dl04.fedoraproject.org -> 38.145.32.25 +dl05.fedoraproject.org -> 38.145.32.26 .... -from the outside. download.fedora.redhat.com is a round robin to the -above IPs. +from the outside. ``dl.fedoraproject.org`` is a round robin to +the first three of these IPs. -The external IPs correspond to internal load balancer IPs that balance -between server[1-5]: +External IP addresses map to internal hosts +``dl0[1-5].rdu3.fedoraproject.org``: .... -209.132.176.20 -> 10.9.24.20 -209.132.176.220 -> 10.9.24.220 -209.132.176.221 -> 10.9.24.221 +dl01.rdu3.fedoraproject.org -> 10.16.163.49 +dl02.rdu3.fedoraproject.org -> 10.16.163.50 +dl03.rdu3.fedoraproject.org -> 10.16.163.51 +dl04.rdu3.fedoraproject.org -> 10.16.163.85 +dl05.rdu3.fedoraproject.org -> 10.16.163.84 .... -The load balancers then balance between the below Fedora IPs on the -rsync servers: - -.... -10.8.24.21 (fedora1.download.rdu3.redhat.com) - server1.download.rdu3.redhat.com -10.8.24.22 (fedora2.download.rdu3.redhat.com) - server2.download.rdu3.redhat.com -10.8.24.23 (fedora3.download.rdu3.redhat.com) - server3.download.rdu3.redhat.com -10.8.24.24 (fedora4.download.rdu3.redhat.com) - server4.download.rdu3.redhat.com -10.8.24.25 (fedora5.download.rdu3.redhat.com) - server5.download.rdu3.redhat.com -.... - -== RDU I2 Master Mirror Setup - -[NOTE] -==== -This section is awaiting confirmation from RH - information here may not -be 100% accurate yet. -==== - -download-i2.fedora.redhat.com (rhm-i2.redhat.com) is a round robin -between: - -.... -204.85.14.3 - 10.11.45.3 -204.85.14.5 - 10.11.45.5 -.... +Legacy host names ``download[1-5].fedora.redhat.com`` are CNAMEs for +``dl0[1-5].fedoraproject.org``. == Raising Issues diff --git a/modules/sysadmin_guide/pages/sshaccess.adoc b/modules/sysadmin_guide/pages/sshaccess.adoc index 0f177e0..1302b6c 100644 --- a/modules/sysadmin_guide/pages/sshaccess.adoc +++ b/modules/sysadmin_guide/pages/sshaccess.adoc @@ -111,7 +111,7 @@ You can configure Putty the same way by doing this: . In Connection:Proxy add the proxy settings ____ -* ProxyHostname is bastion-iad01.fedoraproject.org +* ProxyHostname is bastion.fedoraproject.org * Port 22 * Username FAS_USERNAME * Proxy Command `plink %user@%proxyhost %host:%port`