cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

release -> codename

Browse source
This commit is contained in:
cronekorkn 2023-03-31 21:48:32 +02:00
parent 0667304dd7
commit d8963141fc
Signed by: cronekorkn
SSH key fingerprint: SHA256:v0410ZKfuO1QHdgKBsdQNF64xmTxOF8osF1LIqwTcVw
9 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bundles/apt/items.py
View file

@ -68,7 +68,7 @@ for host, sources in hosts.items():
files[f'/etc/apt/sources.list.d/{host}.list'] = { files[f'/etc/apt/sources.list.d/{host}.list'] = {
'content': '\n'.join(sorted(set( 'content': '\n'.join(sorted(set(
str(source).format( str(source).format(
release=node.metadata.get('os_release'), codename=node.metadata.get('os_codename'),
version=node.os_version[0], # WIP crystal version=node.os_version[0], # WIP crystal
) )
for source in sources for source in sources
@ -95,7 +95,7 @@ for package, options in node.metadata.get('apt/packages', {}).items():
files[f'/etc/apt/preferences.d/{package}'] = { files[f'/etc/apt/preferences.d/{package}'] = {
'content': '\n'.join([ 'content': '\n'.join([
f"Package: {package}", f"Package: {package}",
f"Pin: release a={node.metadata.get('os_release')}-backports", f"Pin: release a={node.metadata.get('os_codename')}-backports",
f"Pin-Priority: 900", f"Pin-Priority: 900",
]), ]),
'needed_by': [ 'needed_by': [

2
bundles/icinga2/metadata.py
View file

@ -9,7 +9,7 @@ defaults = {
'monitoring-plugins': {}, 'monitoring-plugins': {},
}, },
'sources': { 'sources': {
'deb https://packages.icinga.com/debian icinga-{release} main', 'deb https://packages.icinga.com/debian icinga-{codename} main',
}, },
}, },
'icinga2': { 'icinga2': {

2
bundles/icingaweb2/metadata.py
View file

@ -14,7 +14,7 @@ defaults = {
'icingaweb2-module-monitoring': {}, 'icingaweb2-module-monitoring': {},
}, },
'sources': { 'sources': {
'deb https://packages.icinga.com/debian icinga-{release} main', 'deb https://packages.icinga.com/debian icinga-{codename} main',
}, },
}, },
'icingaweb2': { 'icingaweb2': {

2
bundles/influxdb2/metadata.py
View file

@ -7,7 +7,7 @@ defaults = {
'influxdb2-cli': {}, 'influxdb2-cli': {},
}, },
'sources': { 'sources': {
'deb https://repos.influxdata.com/debian {release} stable', 'deb https://repos.influxdata.com/debian {codename} stable',
}, },
}, },
'nftables': { 'nftables': {

4
bundles/nodejs/metadata.py
View file

@ -23,8 +23,8 @@ def sources(metadata):
return { return {
'apt': { 'apt': {
'sources': { 'sources': {
f'deb https://deb.nodesource.com/node_{version}.x {{release}} main', f'deb https://deb.nodesource.com/node_{version}.x {{codename}} main',
f'deb-src https://deb.nodesource.com/node_{version}.x {{release}} main', f'deb-src https://deb.nodesource.com/node_{version}.x {{codename}} main',
}, },
}, },
} }

6
bundles/telegraf/metadata.py
View file

@ -95,11 +95,11 @@ defaults = {
'apt/sources', 'apt/sources',
) )
def apt(metadata): def apt(metadata):
release = { codename = {
'buster': 'buster', 'buster': 'buster',
'bullseye': 'bullseye', 'bullseye': 'bullseye',
'bookworm': 'bullseye', 'bookworm': 'bullseye',
}[metadata.get('os_release')] }[metadata.get('os_codename')]
return { return {
'apt': { 'apt': {
@ -107,7 +107,7 @@ def apt(metadata):
'telegraf': {}, 'telegraf': {},
}, },
'sources': { 'sources': {
f"deb https://repos.influxdata.com/debian {release} stable", f"deb https://repos.influxdata.com/debian {codename} stable",
}, },
}, },
} }

2
groups/os/debian-11.py
View file

@ -9,7 +9,7 @@
'postgresql': { 'postgresql': {
'version': '13', 'version': '13',
}, },
'os_release': 'bullseye', 'os_codename': 'bullseye',
}, },
'os_version': (11,), 'os_version': (11,),
} }

2
groups/os/debian-12.py
View file

@ -9,7 +9,7 @@
'postgresql': { 'postgresql': {
'version': '14', 'version': '14',
}, },
'os_release': 'bookworm', 'os_codename': 'bookworm',
}, },
'os_version': (12,), 'os_version': (12,),
} }

8
groups/os/debian.py
View file

@ -10,10 +10,10 @@
'metadata': { 'metadata': {
'apt': { 'apt': {
'sources': { 'sources': {
'deb https://deb.debian.org/debian {release} main contrib non-free', 'deb https://deb.debian.org/debian {codename} main contrib non-free',
'deb https://deb.debian.org/debian {release}-updates main contrib non-free', 'deb https://deb.debian.org/debian {codename}-updates main contrib non-free',
'deb https://deb.debian.org/debian {release}-backports main contrib non-free', 'deb https://deb.debian.org/debian {codename}-backports main contrib non-free',
'deb https://security.debian.org/ {release}-security main contrib non-free', 'deb https://security.debian.org/ {codename}-security main contrib non-free',
}, },
'packages': { 'packages': {
'mtr-tiny': {}, 'mtr-tiny': {},