From 8b62cbe752a5efc018c3e30141daa1790f6d84f9 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 10 Nov 2020 12:29:19 +0100 Subject: [PATCH] docs: update package repositories Signed-off-by: Thomas Lamprecht --- debian/lintian-overrides | 2 +- debian/proxmox-backup-server.install | 2 +- debian/proxmox-backup-server.maintscript | 1 + docs/package-repositories.rst | 92 +++++++++++------------- etc/Makefile | 2 +- etc/pbs-enterprise.list | 1 + etc/pbstest-beta.list | 1 - 7 files changed, 45 insertions(+), 56 deletions(-) create mode 100644 debian/proxmox-backup-server.maintscript create mode 100644 etc/pbs-enterprise.list delete mode 100644 etc/pbstest-beta.list diff --git a/debian/lintian-overrides b/debian/lintian-overrides index c11d72ba..1e3c8ab1 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,2 +1,2 @@ -proxmox-backup-server: package-installs-apt-sources etc/apt/sources.list.d/pbstest-beta.list +proxmox-backup-server: package-installs-apt-sources etc/apt/sources.list.d/pbs-enterprise.list proxmox-backup-server: systemd-service-file-refers-to-unusual-wantedby-target lib/systemd/system/proxmox-backup-banner.service getty.target diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install index 602a96b2..d79553ec 100644 --- a/debian/proxmox-backup-server.install +++ b/debian/proxmox-backup-server.install @@ -3,7 +3,7 @@ etc/proxmox-backup.service /lib/systemd/system/ etc/proxmox-backup-banner.service /lib/systemd/system/ etc/proxmox-backup-daily-update.service /lib/systemd/system/ etc/proxmox-backup-daily-update.timer /lib/systemd/system/ -etc/pbstest-beta.list /etc/apt/sources.list.d/ +etc/pbs-enterprise.list /etc/apt/sources.list.d/ usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner diff --git a/debian/proxmox-backup-server.maintscript b/debian/proxmox-backup-server.maintscript new file mode 100644 index 00000000..c3783f8e --- /dev/null +++ b/debian/proxmox-backup-server.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/apt/sources.list.d/pbstest-beta.list 1.0.0~ proxmox-backup-server diff --git a/docs/package-repositories.rst b/docs/package-repositories.rst index c3883b8b..d6cf5c80 100644 --- a/docs/package-repositories.rst +++ b/docs/package-repositories.rst @@ -26,11 +26,8 @@ update``. .. FIXME for 7.0: change security update suite to bullseye-security -In addition, you need a package repository from Proxmox to get Proxmox Backup updates. - -During the Proxmox Backup beta phase, only one repository (pbstest) will be -available. Once released, an Enterprise repository for production use and a -no-subscription repository will be provided. +In addition, you need a package repository from Proxmox to get Proxmox Backup +updates. SecureApt ~~~~~~~~~ @@ -72,68 +69,63 @@ Here, the output should be: f3f6c5a3a67baf38ad178e5ff1ee270c /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg -.. comment - `Proxmox Backup`_ Enterprise Repository - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +`Proxmox Backup`_ Enterprise Repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - This will be the default, stable, and recommended repository. It is available for - all `Proxmox Backup`_ subscription users. It contains the most stable packages, - and is suitable for production use. The ``pbs-enterprise`` repository is - enabled by default: +This will be the default, stable, and recommended repository. It is available for +all `Proxmox Backup`_ subscription users. It contains the most stable packages, +and is suitable for production use. The ``pbs-enterprise`` repository is +enabled by default: - .. note:: During the Proxmox Backup beta phase only one repository (pbstest) - will be available. +.. code-block:: sources.list + :caption: File: ``/etc/apt/sources.list.d/pbs-enterprise.list`` - .. code-block:: sources.list - :caption: File: ``/etc/apt/sources.list.d/pbs-enterprise.list`` - - deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise + deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise - To never miss important security fixes, the superuser (``root@pam`` user) is - notified via email about new packages as soon as they are available. The - change-log and details of each package can be viewed in the GUI (if available). +To never miss important security fixes, the superuser (``root@pam`` user) is +notified via email about new packages as soon as they are available. The +change-log and details of each package can be viewed in the GUI (if available). - Please note that you need a valid subscription key to access this - repository. More information regarding subscription levels and pricing can be - found at https://www.proxmox.com/en/proxmox-backup/pricing. +Please note that you need a valid subscription key to access this +repository. More information regarding subscription levels and pricing can be +found at https://www.proxmox.com/en/proxmox-backup-server/pricing - .. note:: You can disable this repository by commenting out the above - line using a `#` (at the start of the line). This prevents error - messages if you do not have a subscription key. Please configure the - ``pbs-no-subscription`` repository in that case. +.. note:: You can disable this repository by commenting out the above line + using a `#` (at the start of the line). This prevents error messages if you do + not have a subscription key. Please configure the ``pbs-no-subscription`` + repository in that case. - `Proxmox Backup`_ No-Subscription Repository - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +`Proxmox Backup`_ No-Subscription Repository +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - As the name suggests, you do not need a subscription key to access - this repository. It can be used for testing and non-production - use. It is not recommended to use it on production servers, because these - packages are not always heavily tested and validated. +As the name suggests, you do not need a subscription key to access +this repository. It can be used for testing and non-production +use. It is not recommended to use it on production servers, because these +packages are not always heavily tested and validated. - We recommend to configure this repository in ``/etc/apt/sources.list``. +We recommend to configure this repository in ``/etc/apt/sources.list``. - .. code-block:: sources.list - :caption: File: ``/etc/apt/sources.list`` +.. code-block:: sources.list + :caption: File: ``/etc/apt/sources.list`` - deb http://ftp.debian.org/debian buster main contrib - deb http://ftp.debian.org/debian buster-updates main contrib + deb http://ftp.debian.org/debian buster main contrib + deb http://ftp.debian.org/debian buster-updates main contrib - # PBS pbs-no-subscription repository provided by proxmox.com, - # NOT recommended for production use - deb http://download.proxmox.com/debian/pbs buster pbs-no-subscription + # PBS pbs-no-subscription repository provided by proxmox.com, + # NOT recommended for production use + deb http://download.proxmox.com/debian/pbs buster pbs-no-subscription - # security updates - deb http://security.debian.org/debian-security buster/updates main contrib + # security updates + deb http://security.debian.org/debian-security buster/updates main contrib -`Proxmox Backup`_ Beta Repository +`Proxmox Backup`_ Test Repository ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -During the public beta, there is a repository called ``pbstest``. This one -contains the latest packages and is heavily used by developers to test new -features. +This repository contains the latest packages and is heavily used by developers +to test new features. .. .. warning:: the ``pbstest`` repository should (as the name implies) only be used to test new features or bug fixes. @@ -145,7 +137,3 @@ You can access this repository by adding the following line to :caption: sources.list entry for ``pbstest`` deb http://download.proxmox.com/debian/pbs buster pbstest - -If you installed Proxmox Backup Server from the official beta ISO, you should -have this repository already configured in -``/etc/apt/sources.list.d/pbstest-beta.list`` diff --git a/etc/Makefile b/etc/Makefile index 665892b7..42f639f6 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -9,7 +9,7 @@ DYNAMIC_UNITS := \ proxmox-backup.service \ proxmox-backup-proxy.service -all: $(UNITS) $(DYNAMIC_UNITS) pbstest-beta.list +all: $(UNITS) $(DYNAMIC_UNITS) pbs-enterprise.list clean: rm -f $(DYNAMIC_UNITS) diff --git a/etc/pbs-enterprise.list b/etc/pbs-enterprise.list new file mode 100644 index 00000000..5f8763c9 --- /dev/null +++ b/etc/pbs-enterprise.list @@ -0,0 +1 @@ +deb https://enterprise.proxmox.com/debian/pbs buster pbs-enterprise diff --git a/etc/pbstest-beta.list b/etc/pbstest-beta.list deleted file mode 100644 index 3cb557ec..00000000 --- a/etc/pbstest-beta.list +++ /dev/null @@ -1 +0,0 @@ -deb http://download.proxmox.com/debian/pbs buster pbstest