Skip to content

Commit

Permalink
doc: standardize EPEL instructions
Browse files Browse the repository at this point in the history
Prior to this change, the documentation pages contained different ways
to enable EPEL. Pick a simple, secure (https) way and standardize on
that.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
  • Loading branch information
ktdreyer committed Oct 26, 2016
1 parent f7a761a commit 9411017
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/install/get-packages.rst
Expand Up @@ -409,7 +409,7 @@ RPM Packages
Ceph requires additional additional third party libraries.
To add the EPEL repository, execute the following::

su -c 'rpm -Uvh http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm'
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm

Ceph requires the following packages:

Expand Down
3 changes: 1 addition & 2 deletions doc/start/documenting-ceph.rst
Expand Up @@ -306,8 +306,7 @@ Packages for Enterprise Linux) repository as it provides some extra packages
which are not available in the default repository. To install ``epel``, execute
the following::

wget http://ftp.riken.jp/Linux/fedora/epel/7/x86_64/e/epel-release-7-2.noarch.rpm
sudo yum install epel-release-7-2.noarch.rpm
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm

For CentOS/RHEL distributions, execute the following::

Expand Down
7 changes: 4 additions & 3 deletions doc/start/quick-start-preflight.rst
Expand Up @@ -57,11 +57,12 @@ For CentOS 7, perform the following steps:
sudo subscription-manager repos --enable=rhel-7-server-extras-rpms

#. Install and enable the Extra Packages for Enterprise Linux (EPEL)
repository. Please see the `EPEL wiki`_ page for more information.
repository::

#. On CentOS, you can execute the following command chain::
sudo yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm

Please see the `EPEL wiki`_ page for more information.

sudo yum install -y yum-utils && sudo yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/7/x86_64/ && sudo yum install --nogpgcheck -y epel-release && sudo rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-7 && sudo rm /etc/yum.repos.d/dl.fedoraproject.org*

#. Add the package to your repository. Open a text editor and create a
Yellowdog Updater, Modified (YUM) entry. Use the file path
Expand Down

0 comments on commit 9411017

Please sign in to comment.