From 63be401a411ffc7c2f78e450a29c69eee1af02d3 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Mon, 8 Feb 2016 12:11:21 +0100 Subject: [PATCH] doc: Updated docs with additional mirror information Signed-off-by: Wido den Hollander --- doc/install/get-packages.rst | 32 +++--------------- doc/install/get-tarballs.rst | 4 +-- doc/install/index.rst | 19 ++++++----- doc/install/mirrors.rst | 64 ++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 38 deletions(-) create mode 100644 doc/install/mirrors.rst diff --git a/doc/install/get-packages.rst b/doc/install/get-packages.rst index 537494f4cdb..cbb60c0060b 100644 --- a/doc/install/get-packages.rst +++ b/doc/install/get-packages.rst @@ -92,28 +92,6 @@ To install the ``autobuild.asc`` key, execute the following sudo rpm --import 'https://download.ceph.com/keys/autobuild.asc' -.. _mirrors: - -Mirrors -======= - -For improved user experience multiple mirrors for Ceph are available around the -world. - -These mirrors are available on the following locations: - -- **EU**: http://eu.ceph.com/ -- **AU**: http://au.ceph.com/ - -You can replace all ceph.com URLs with any of the mirrors, for example: - - http://download.ceph.com/debian-hammer - -Change this to: - - http://eu.ceph.com/debian-hammer - - Add Ceph ======== @@ -154,7 +132,7 @@ The major releases of Ceph include: was retired in May 2015), so we recommend that users upgrade to a more recent version. -.. tip:: For international users, there are various mirrors globally. See :ref:`mirrors`. +.. tip:: For international users: There might be a mirror close to you where download Ceph from. For more information see: `Ceph Mirrors`_. Debian Packages --------------- @@ -194,8 +172,7 @@ of Debian and Ubuntu releases supported. :: echo deb http://download.ceph.com/debian-testing/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list -.. tip:: For international users, there are various mirrors globally. See the - information at the start of this page. +.. tip:: For international users: There might be a mirror close to you where download Ceph from. For more information see: `Ceph Mirrors`_. RPM Packages ------------ @@ -284,8 +261,8 @@ You can download the RPMs directly from:: http://download.ceph.com/rpm-testing -.. tip:: For international users, there are various mirrors globally. See :ref:`mirrors`. -Add Ceph Development +.. tip:: For international users: There might be a mirror close to you where download Ceph from. For more information see: `Ceph Mirrors`_. + ==================== Development repositories use the ``autobuild.asc`` key to verify packages. @@ -485,3 +462,4 @@ line to get the short codename. :: .. _Install Ceph Object Storage: ../install-storage-cluster .. _the testing Debian repository: http://download.ceph.com/debian-testing/dists .. _the gitbuilder page: http://gitbuilder.ceph.com +.. _Ceph Mirrors: ../mirrors diff --git a/doc/install/get-tarballs.rst b/doc/install/get-tarballs.rst index 2fa5a3aade2..93b77524bce 100644 --- a/doc/install/get-tarballs.rst +++ b/doc/install/get-tarballs.rst @@ -7,8 +7,8 @@ source code. You may download source code tarballs for Ceph releases here: `Ceph Release Tarballs`_ -`Ceph Release Tarballs (EU mirror)`_ +.. tip:: For international users: There might be a mirror close to you where download Ceph from. For more information see: `Ceph Mirrors`_. .. _Ceph Release Tarballs: http://ceph.com/download/ -.. _Ceph Release Tarballs (EU mirror): http://eu.ceph.com/download/ +.. _Ceph Mirrors: ../mirrors diff --git a/doc/install/index.rst b/doc/install/index.rst index 07ed723cf08..033d59745e8 100644 --- a/doc/install/index.rst +++ b/doc/install/index.rst @@ -15,12 +15,13 @@ repository and build Ceph yourself. .. toctree:: - :maxdepth: 1 + :maxdepth: 1 Get Packages Get Tarballs Clone Source Build Ceph + Ceph Mirrors Install Software @@ -33,27 +34,27 @@ management tools. You should install Yum Priorities for RHEL/CentOS and other distributions that use Yum if you intend to install the Ceph Object Gateway or QEMU. -.. toctree:: +.. toctree:: :maxdepth: 1 Install ceph-deploy Install Ceph Storage Cluster Install Ceph Object Gateway - Install Virtualization for Block + Install Virtualization for Block Deploy a Cluster Manually ========================= -Once you have Ceph installed on your nodes, you can deploy a cluster manually. +Once you have Ceph installed on your nodes, you can deploy a cluster manually. The manual procedure is primarily for exemplary purposes for those developing deployment scripts with Chef, Juju, Puppet, etc. -.. toctree:: - +.. toctree:: + Manual Deployment -Upgrade Software +Upgrade Software ================ As new versions of Ceph become available, you may upgrade your cluster to take @@ -65,5 +66,5 @@ sequence. :maxdepth: 2 Upgrading Ceph - -.. _get packages: ../install/get-packages \ No newline at end of file + +.. _get packages: ../install/get-packages diff --git a/doc/install/mirrors.rst b/doc/install/mirrors.rst new file mode 100644 index 00000000000..630733f2034 --- /dev/null +++ b/doc/install/mirrors.rst @@ -0,0 +1,64 @@ +============= + Ceph Mirrors +============= + +For improved user experience multiple mirrors for Ceph are available around the +world. + +These mirrors are kindly sponsored by various companies who want to support the +Ceph project. + + +Locations +========= + +These mirrors are available on the following locations: + +- **EU: Netherlands**: http://eu.ceph.com/ +- **AU: Australia**: http://au.ceph.com/ +- **CZ: Czech Republic**: http://cz.ceph.com/ +- **SE: Sweden**: http://se.ceph.com/ +- **DE: Germany**: http://de.ceph.com/ +- **HK: Hong Kong**: http://hk.ceph.com/ +- **US-East: US East Coast**: http://us-east.ceph.com/ +- **US-West: US West Coast**: http://us-west.ceph.com/ + +You can replace all download.ceph.com URLs with any of the mirrors, for example: + + http://download.ceph.com/tarballs/ + http://download.ceph.com/debian-hammer/ + http://download.ceph.com/rpm-hammer/ + +Change this to: + + http://eu.ceph.com/tarballs/ + http://eu.ceph.com/debian-hammer/ + http://eu.ceph.com/rpm-hammer/ + + +Mirroring +========= + +You can easily mirror Ceph yourself using a Bash script and rsync. A easy to use +script can be found at `Github`_. + +When mirroring Ceph, please keep the following guidelines in mind: + +- Choose a mirror close to you +- Do not sync in a interval shorter than 3 hours +- Avoid syncing at minute 0 of the hour, use something between 0 and 59 + + +Becoming a mirror +================= + +If you want to provide a public mirror for other users of Ceph you can opt to +become a official mirror. + +To make sure all mirrors meet the same standards some requirements have been +set for all mirrors. These can be found on `Github`_. + +If you want to apply for an official mirror, please contact the ceph-users mailinglist. + + +.. _Github: https://github.com/ceph/ceph/tree/master/mirroring -- 2.39.5