Commit e56ced55 authored by Tobias Stein's avatar Tobias Stein
Browse files

Adjust packagement to allow Ubuntu

* Add defaults for ubuntu
* Use suite selector for ubuntu
parent 47f999de
......@@ -2,6 +2,71 @@
ansible_nopasswd: False
repo_defaults:
core:
ubuntu:
allowed_suffixes:
- null
- backports
#- proposed
- security
- updates
type:
- deb
- deb-src
url:
base: "http://de.archive.ubuntu.com/ubuntu/"
security: "http://de.archive.ubuntu.com/ubuntu/"
#security: "http://security.ubuntu.com/ubuntu/"
archive: "http://old-releases.ubuntu.com/ubuntu/"
components:
- main
- multiverse
- universe
#- restriced
code_names:
xenial:
release_number: 16.04
release_name: "Xenial Xerus"
archive: false
lts: true
release_suffixes:
- suffix: null
- suffix: backports
- suffix: proposed
- suffix: security
- suffix: updates
bionic:
release_number: 18.04
release_name: "Bionic Beaver"
archive: false
lts: true
release_suffixes:
- suffix: null
- suffix: backports
- suffix: proposed
- suffix: security
- suffix: updates
focal:
release_number: 20.04
release_name: "Focal Fossa"
archive: false
lts: true
release_suffixes:
- suffix: null
- suffix: backports
- suffix: proposed
- suffix: security
- suffix: updates
jammy:
release_number: 22.04
release_name: "Jammy Jellyfish"
archive: false
lts: true
release_suffixes:
- suffix: null
- suffix: backports
- suffix: proposed
- suffix: security
- suffix: updates
debian:
allowed_suffixes:
- null
......@@ -102,13 +167,16 @@ repo_defaults:
package_set:
core:
debian:
standard: [
standard: &DEBIAN_STANDARD [
apt-file, apt-transport-https, aptitude, bash-completion, byobu, ca-certificates, curl,
dmidecode, dnsutils, dosfstools, ethtool, git, hdparm, htop, haveged, iftop, info,
iotop, jq, libcrack2, locales, lsb-release, lsof, man-db, mc, mlocate, openssl,
parted, pigz, psmisc, pv, pwgen, python3-apt, rsync, screen, sqlite3, ssl-cert, strace,
sudo, sysstat, tmux, unattended-upgrades, vim, wget, zsh ]
extra: [ btrfs-progs ]
extra: &DEBIAN_EXTRA [ btrfs-progs ]
ubuntu:
standard: *DEBIAN_STANDARD
extra: *DEBIAN_EXTRA
#aliases:
# - name: 'root'
......
......@@ -20,7 +20,9 @@ Pin-Priority: {{ priority }}
{%- set release = os_release.release -%}
{%- set release_suffixes = release_names[release].release_suffixes -%}
{%- set security_suffixes = release_names[release].security_suffixes -%}
{% if release in context.code_names %}
{% if ansible_distribution|lower == "ubuntu" %}
{% set selector = "a" %}
{% elif release in context.code_names %}
{% set selector = "n" %}
{% elif release in context.suite_names %}
{% set selector = "a" %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment