From 5acc40912c7efd159d21d1a763dbfd79f4cc6940 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 18 Dec 2020 12:38:11 -0800 Subject: [PATCH] Update CentOS/Fedora zfs-release package links Move the CentOS/Fedora release packages to a secure https address at the official zfsonlinux.org domain. Signed-off-by: Brian Behlendorf --- docs/Getting Started/Fedora.rst | 16 ++++++------ docs/Getting Started/RHEL and CentOS.rst | 33 ++++++++++++------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/docs/Getting Started/Fedora.rst b/docs/Getting Started/Fedora.rst index ff77259..0d3b39c 100644 --- a/docs/Getting Started/Fedora.rst +++ b/docs/Getting Started/Fedora.rst @@ -25,19 +25,16 @@ encouraged to verify the authenticity of the ZFS on Linux public key using the fingerprint listed here. | **Location:** /etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux -| **Fedora 31 Package:** - `http://download.zfsonlinux.org/fedora/zfs-release.fc31.noarch.rpm `__ -| **Fedora 32 Package:** - `http://download.zfsonlinux.org/fedora/zfs-release.fc32.noarch.rpm `__ -| **Fedora 33 Package:** - `http://download.zfsonlinux.org/fedora/zfs-release.fc33.noarch.rpm `__ +| **Fedora 31 Package:** `zfs-release.fc31.noarch.rpm`_ +| **Fedora 32 Package:** `zfs-release.fc32.noarch.rpm`_ +| **Fedora 33 Package:** `zfs-release.fc33.noarch.rpm`_ | **Download from:** - `pgp.mit.edu `__ + `pgp.mit.edu `__ | **Fingerprint:** C93A FFFD 9F3F 7B03 C310 CEB6 A9D5 A1C0 F14A B620 .. code:: sh - $ sudo dnf install http://download.zfsonlinux.org/fedora/zfs-release$(rpm -E %dist).noarch.rpm + $ sudo dnf install https://zfsonlinux.org/fedora/zfs-release$(rpm -E %dist).noarch.rpm $ gpg --quiet --with-fingerprint /etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux pub 2048R/F14AB620 2013-03-21 ZFS on Linux Key fingerprint = C93A FFFD 9F3F 7B03 C310 CEB6 A9D5 A1C0 F14A B620 @@ -85,3 +82,6 @@ repository can be installed as follows. .. _DKMS: https://en.wikipedia.org/wiki/Dynamic_Kernel_Module_Support .. _latest OpenZFS release: https://github.com/openzfs/zfs/releases/latest +.. _zfs-release.fc31.noarch.rpm: https://zfsonlinux.org/fedora/zfs-release.fc31.noarch.rpm +.. _zfs-release.fc32.noarch.rpm: https://zfsonlinux.org/fedora/zfs-release.fc32.noarch.rpm +.. _zfs-release.fc33.noarch.rpm: https://zfsonlinux.org/fedora/zfs-release.fc33.noarch.rpm diff --git a/docs/Getting Started/RHEL and CentOS.rst b/docs/Getting Started/RHEL and CentOS.rst index b3b0ca5..36ec33b 100644 --- a/docs/Getting Started/RHEL and CentOS.rst +++ b/docs/Getting Started/RHEL and CentOS.rst @@ -18,23 +18,20 @@ encouraged to verify the authenticity of the ZFS on Linux public key using the fingerprint listed here. | **Location:** /etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux -| **EL6 Package:** - `http://download.zfsonlinux.org/epel/zfs-release.el6.noarch.rpm `__ (zfs-0.8.x) -| **EL7.9 Package:** - `http://download.zfsonlinux.org/epel/zfs-release.el7_9.noarch.rpm `__ (zfs-0.8.x) -| **EL8.3 Package:** - `http://download.zfsonlinux.org/epel/zfs-release.el8_3.noarch.rpm `__ (zfs-0.8.x) +| **EL6 Package:** `zfs-release.el6.noarch.rpm`_ (zfs-0.8.x) +| **EL7.9 Package:** `zfs-release.el7_9.noarch.rpm`_ (zfs-0.8.x) +| **EL8.3 Package:** `zfs-release.el8_3.noarch.rpm`_ (zfs-0.8.x) | **Archived Repositories:** `el7_5`_, `el7_6`_, `el7_7`_, `el7_8`_, `el8_0`_, `el8_1`_, `el8_2`_ | **Download from:** - `pgp.mit.edu `__ + `pgp.mit.edu `__ | **Fingerprint:** C93A FFFD 9F3F 7B03 C310 CEB6 A9D5 A1C0 F14A B620 For RHEL/CentOS versions 6 and 7 run: .. code:: sh - $ sudo yum install http://download.zfsonlinux.org/epel/zfs-release..noarch.rpm + $ sudo yum install https://zfsonlinux.org/epel/zfs-release..noarch.rpm $ gpg --quiet --with-fingerprint /etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux pub 2048R/F14AB620 2013-03-21 ZFS on Linux Key fingerprint = C93A FFFD 9F3F 7B03 C310 CEB6 A9D5 A1C0 F14A B620 @@ -44,7 +41,7 @@ And for RHEL/CentOS 8 and newer: .. code:: sh - $ sudo dnf install http://download.zfsonlinux.org/epel/zfs-release..noarch.rpm + $ sudo dnf install https://zfsonlinux.org/epel/zfs-release..noarch.rpm $ gpg --quiet --with-fingerprint /etc/pki/rpm-gpg/RPM-GPG-KEY-zfsonlinux pub 2048R/F14AB620 2013-03-21 ZFS on Linux Key fingerprint = C93A FFFD 9F3F 7B03 C310 CEB6 A9D5 A1C0 F14A B620 @@ -156,11 +153,15 @@ And for RHEL/CentOS 8 and newer: .. _kABI-tracking kmod: https://elrepoproject.blogspot.com/2016/02/kabi-tracking-kmod-packages.html .. _DKMS: https://en.wikipedia.org/wiki/Dynamic_Kernel_Module_Support -.. _el7_5: http://download.zfsonlinux.org/epel/zfs-release.el7_5.noarch.rpm -.. _el7_6: http://download.zfsonlinux.org/epel/zfs-release.el7_6.noarch.rpm -.. _el7_7: http://download.zfsonlinux.org/epel/zfs-release.el7_7.noarch.rpm -.. _el7_8: http://download.zfsonlinux.org/epel/zfs-release.el7_8.noarch.rpm -.. _el8_0: http://download.zfsonlinux.org/epel/zfs-release.el8_0.noarch.rpm -.. _el8_1: http://download.zfsonlinux.org/epel/zfs-release.el8_1.noarch.rpm -.. _el8_2: http://download.zfsonlinux.org/epel/zfs-release.el8_2.noarch.rpm +.. _zfs-release.el6.noarch.rpm: https://zfsonlinux.org/epel/zfs-release.el6.noarch.rpm +.. _zfs-release.el7_9.noarch.rpm: https://zfsonlinux.org/epel/zfs-release.el7_9.noarch.rpm +.. _zfs-release.el8_3.noarch.rpm: https://zfsonlinux.org/epel/zfs-release.el8_3.noarch.rpm +.. _el7_5: https://zfsonlinux.org/epel/zfs-release.el7_5.noarch.rpm +.. _el7_6: https://zfsonlinux.org/epel/zfs-release.el7_6.noarch.rpm +.. _el7_7: https://zfsonlinux.org/epel/zfs-release.el7_7.noarch.rpm +.. _el7_8: https://zfsonlinux.org/epel/zfs-release.el7_8.noarch.rpm +.. _el8_0: https://zfsonlinux.org/epel/zfs-release.el8_0.noarch.rpm +.. _el8_1: https://zfsonlinux.org/epel/zfs-release.el8_1.noarch.rpm +.. _el8_2: https://zfsonlinux.org/epel/zfs-release.el8_2.noarch.rpm + .. _EPEL repository: https://fedoraproject.org/wiki/EPEL