Skip to content

Commit

Permalink
Merge pull request #6384 from ktdreyer/wip-doc-download-gpg-key
Browse files Browse the repository at this point in the history
doc: download GPG key from download.ceph.com

Reviewed-by: Loic Dachary <ldachary@redhat.com>
  • Loading branch information
Loic Dachary committed Oct 28, 2015
2 parents b54f9aa + f119fb5 commit 1d1ecb8
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
32 changes: 16 additions & 16 deletions doc/install/get-packages.rst
Expand Up @@ -70,26 +70,26 @@ APT

To install the ``release.asc`` key, execute the following::

wget -q -O- 'https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | sudo apt-key add -
wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -


To install the ``autobuild.asc`` key, execute the following
(QA and developers only)::

wget -q -O- 'https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc' | sudo apt-key add -
wget -q -O- 'https://download.ceph.com/keys/autobuild.asc' | sudo apt-key add -


RPM
---

To install the ``release.asc`` key, execute the following::

sudo rpm --import 'https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc'
sudo rpm --import 'https://download.ceph.com/keys/release.asc'

To install the ``autobuild.asc`` key, execute the following
(QA and developers only)::

sudo rpm --import 'https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc'
sudo rpm --import 'https://download.ceph.com/keys/autobuild.asc'


.. _mirrors:
Expand Down Expand Up @@ -216,7 +216,7 @@ take priority over standard packages, so you must ensure that you set
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-noarch]
name=Ceph noarch packages
Expand All @@ -225,7 +225,7 @@ take priority over standard packages, so you must ensure that you set
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-source]
name=Ceph source packages
Expand All @@ -234,7 +234,7 @@ take priority over standard packages, so you must ensure that you set
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc


For development release packages, you may specify the repository
Expand All @@ -247,7 +247,7 @@ for development releases instead. ::
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-noarch]
name=Ceph noarch packages
Expand All @@ -256,7 +256,7 @@ for development releases instead. ::
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-source]
name=Ceph source packages
Expand All @@ -265,7 +265,7 @@ for development releases instead. ::
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc


For specific packages, you may retrieve them by specifically downloading the
Expand Down Expand Up @@ -324,7 +324,7 @@ install. ::
enabled=0
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
gpgkey=https://download.ceph.com/keys/autobuild.asc


You may view http://gitbuilder.ceph.com directory to see which distributions
Expand Down Expand Up @@ -366,7 +366,7 @@ http://gitbuilder.ceph.com directory to see which distributions Ceph supports.
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
gpgkey=https://download.ceph.com/keys/autobuild.asc

[apache2-ceph-source]
name=Apache source packages for Ceph
Expand All @@ -375,7 +375,7 @@ http://gitbuilder.ceph.com directory to see which distributions Ceph supports.
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
gpgkey=https://download.ceph.com/keys/autobuild.asc


Repeat the forgoing process by creating a ``ceph-fastcgi.repo`` file. ::
Expand All @@ -387,7 +387,7 @@ Repeat the forgoing process by creating a ``ceph-fastcgi.repo`` file. ::
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
gpgkey=https://download.ceph.com/keys/autobuild.asc

[fastcgi-ceph-noarch]
name=FastCGI noarch packages for Ceph
Expand All @@ -396,7 +396,7 @@ Repeat the forgoing process by creating a ``ceph-fastcgi.repo`` file. ::
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
gpgkey=https://download.ceph.com/keys/autobuild.asc

[fastcgi-ceph-source]
name=FastCGI source packages for Ceph
Expand All @@ -405,7 +405,7 @@ Repeat the forgoing process by creating a ``ceph-fastcgi.repo`` file. ::
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://git.ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/autobuild.asc
gpgkey=https://download.ceph.com/keys/autobuild.asc


Download Packages
Expand Down
8 changes: 4 additions & 4 deletions doc/install/install-storage-cluster.rst
Expand Up @@ -47,7 +47,7 @@ To install Ceph with RPMs, execute the following steps:
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-noarch]
name=Ceph noarch packages
Expand All @@ -56,7 +56,7 @@ To install Ceph with RPMs, execute the following steps:
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc

[ceph-source]
name=Ceph source packages
Expand All @@ -65,7 +65,7 @@ To install Ceph with RPMs, execute the following steps:
priority=2
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc


#. Install pre-requisite packages::
Expand All @@ -91,4 +91,4 @@ If you install Ceph locally, ``make`` will place the executables in
``usr/local/bin``. You may add the Ceph configuration file to the
``usr/local/bin`` directory to run Ceph from a single directory.

.. _Get Packages: ../get-packages
.. _Get Packages: ../get-packages
10 changes: 5 additions & 5 deletions doc/install/upgrading-ceph.rst
Expand Up @@ -275,7 +275,7 @@ Then add a new ``ceph.repo`` repository entry with the following contents.
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc
.. note:: Ensure you use the correct URL for your distribution. Check the
Expand Down Expand Up @@ -313,7 +313,7 @@ replace ``{distro}`` with your distribution (e.g., ``el6``, ``rhel6``, etc).
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc
.. note:: Ensure you use the correct URL for your distribution. Check the
Expand Down Expand Up @@ -439,7 +439,7 @@ replace ``{distro}`` with your distribution (e.g., ``el6``, ``rhel6``,
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc
Upgrade daemons in the following order:
Expand Down Expand Up @@ -512,7 +512,7 @@ replace ``{distro}`` with your distribution (e.g., ``el6``, ``rhel6``,
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc
.. note:: Ensure you use the correct URL for your distribution. Check the
Expand Down Expand Up @@ -748,4 +748,4 @@ Under those directories, the keyring should be in a file named ``keyring``.
.. _Operating a Cluster: ../../rados/operations/operating
.. _Monitoring a Cluster: ../../rados/operations/monitoring
.. _Firefly release notes: ../../release-notes/#v0-80-firefly
.. _release notes: ../../release-notes
.. _release notes: ../../release-notes
2 changes: 1 addition & 1 deletion doc/rados/deployment/preflight-checklist.rst
Expand Up @@ -89,7 +89,7 @@ Install ceph-deploy

To install ``ceph-deploy``, execute the following::

wget -q -O- 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | sudo apt-key add -
wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -
echo deb http://ceph.com/debian-dumpling/ $(lsb_release -sc) main | sudo tee /etc/apt/sources.list.d/ceph.list
sudo apt-get update
sudo apt-get install ceph-deploy
Expand Down
4 changes: 2 additions & 2 deletions doc/start/quick-start-preflight.rst
Expand Up @@ -31,7 +31,7 @@ For Debian and Ubuntu distributions, perform the following steps:

#. Add the release key::

wget -q -O- 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | sudo apt-key add -
wget -q -O- 'https://download.ceph.com/keys/release.asc' | sudo apt-key add -

#. Add the Ceph packages to your repository. Replace ``{ceph-stable-release}``
with a stable Ceph release (e.g., ``cuttlefish``, ``dumpling``,
Expand Down Expand Up @@ -74,7 +74,7 @@ following steps:
enabled=1
gpgcheck=1
type=rpm-md
gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
gpgkey=https://download.ceph.com/keys/release.asc


#. Update your repository and install ``ceph-deploy``::
Expand Down

0 comments on commit 1d1ecb8

Please sign in to comment.