Skip to content

Commit

Permalink
[debops.apt_preferences] Support Debian Buster in apt_preferences__list
Browse files Browse the repository at this point in the history
  • Loading branch information
ypid committed Sep 5, 2019
1 parent 2a5d05c commit 458fa43
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.rst
Expand Up @@ -55,6 +55,11 @@ Updates of upstream application versions
``12.1``. This is the last release that supports Ruby 2.5 which is included ``12.1``. This is the last release that supports Ruby 2.5 which is included
in Debian Buster. in Debian Buster.


:ref:`debops.apt_preferences` role
''''''''''''''''''''''''''''''''''

- Support Debian Buster in :ref:`apt_preferences__list`.

:ref:`debops.resolvconf` role :ref:`debops.resolvconf` role
''''''''''''''''''''''''''''' '''''''''''''''''''''''''''''


Expand Down
6 changes: 6 additions & 0 deletions ansible/playbooks/tools/dist-upgrade.yml
Expand Up @@ -20,6 +20,12 @@
vars: vars:


# Map of current and next distribution releases # Map of current and next distribution releases
# Redundant in the following places, please update all copies:
#
# * ansible/roles/debops.apt/defaults/main.yml
# * ansible/roles/debops.apt_preferences/defaults/main.yml
# * ansible/roles/debops.reprepro/defaults/main.yml
# * ansible/playbooks/tools/dist-upgrade.yml
dist_upgrade_version_map: dist_upgrade_version_map:
'wheezy': 'jessie' 'wheezy': 'jessie'
'jessie': 'stretch' 'jessie': 'stretch'
Expand Down
10 changes: 10 additions & 0 deletions ansible/roles/debops.apt_preferences/defaults/main.yml
Expand Up @@ -160,6 +160,14 @@ apt_preferences__priority_version: 1001
# Dictionary of future releases of current stable distributions. This is used to # Dictionary of future releases of current stable distributions. This is used to
# check if the role can create autogenerated pins with preference for backported # check if the role can create autogenerated pins with preference for backported
# packages from the ``<release>-backports`` repository. # packages from the ``<release>-backports`` repository.
#
# .. Redundant in the following places, please update all copies:
#
# * ansible/roles/debops.apt/defaults/main.yml
# * ansible/roles/debops.apt_preferences/defaults/main.yml
# * ansible/roles/debops.reprepro/defaults/main.yml
# * ansible/playbooks/tools/dist-upgrade.yml
#
apt_preferences__next_release: apt_preferences__next_release:


# Debian releases # Debian releases
Expand All @@ -168,6 +176,8 @@ apt_preferences__next_release:
'wheezy': 'jessie' 'wheezy': 'jessie'
'jessie': 'stretch' 'jessie': 'stretch'
'stretch': 'buster' 'stretch': 'buster'
'buster': 'bullseye'
'bullseye': 'bookworm'


# Ubuntu releases # Ubuntu releases
'precise': 'quantal' 'precise': 'quantal'
Expand Down
18 changes: 18 additions & 0 deletions ansible/roles/debops.reprepro/defaults/main.yml
Expand Up @@ -811,22 +811,40 @@ reprepro_nginx_server_https:
# .. envvar:: reprepro_debian_previous [[[ # .. envvar:: reprepro_debian_previous [[[
# #
# Debian previous releases # Debian previous releases
#
# .. Redundant in the following places, please update all copies:
#
# * ansible/roles/debops.apt/defaults/main.yml
# * ansible/roles/debops.apt_preferences/defaults/main.yml
# * ansible/roles/debops.reprepro/defaults/main.yml
# * ansible/playbooks/tools/dist-upgrade.yml
#
reprepro_debian_previous: reprepro_debian_previous:
'wheezy': 'squeeze' 'wheezy': 'squeeze'
'jessie': 'wheezy' 'jessie': 'wheezy'
'stretch': 'jessie' 'stretch': 'jessie'
'buster': 'stretch' 'buster': 'stretch'
'bullseye': 'buster' 'bullseye': 'buster'
'bookworm': 'bullseye'


# ]]] # ]]]
# .. envvar:: reprepro_debian_next [[[ # .. envvar:: reprepro_debian_next [[[
# #
# Debian next releases # Debian next releases
#
# .. Redundant in the following places, please update all copies:
#
# * ansible/roles/debops.apt/defaults/main.yml
# * ansible/roles/debops.apt_preferences/defaults/main.yml
# * ansible/roles/debops.reprepro/defaults/main.yml
# * ansible/playbooks/tools/dist-upgrade.yml
#
reprepro_debian_next: reprepro_debian_next:
'wheezy': 'jessie' 'wheezy': 'jessie'
'jessie': 'stretch' 'jessie': 'stretch'
'stretch': 'buster' 'stretch': 'buster'
'buster': 'bullseye' 'buster': 'bullseye'
'bullseye': 'bookworm'


# ]]] # ]]]
# .. envvar:: reprepro_debian_releases [[[ # .. envvar:: reprepro_debian_releases [[[
Expand Down

0 comments on commit 458fa43

Please sign in to comment.