Skip to content

Commit 1a44d3e

Browse files
committed
hieradata: enable debian -security for trixie (and document it)
Ref #91
1 parent aae91ac commit 1a44d3e

4 files changed

Lines changed: 11 additions & 2 deletions

File tree

doc/puppet.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,13 @@ multiple profiles, use the shared part of the profile name (for example
8282
Private Hiera data is stored in `/srv/git/puppet/private/` on the
8383
Puppet server. For now, follow the instructions in `README` to edit.
8484

85+
## Adding a new Debian version
86+
87+
* Add codename to `type Debian::Codename` in `/modules/debian/types/codename.pp`
88+
* Add codename to `profile::base::apt::security_supported_versions` in `/hierdata/common/yaml`
89+
* Add version from https://packages.debian.org/stable/php to `/modules/php/manifests/init.pp`
90+
* Add version from https://packages.debian.org/stable/postgresql to `/modules/postgresql/manifests/init.pp`
91+
8592
## Managing user accounts
8693

8794
### Human users and groups

hieradata/common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ profile::wordpress::docs::enable_object_cache: true
515515
profile::wordpress::blogs::admin_email: infrastructure-team@jquery.com
516516
profile::wordpress::blogs::wordpress_version: ~
517517

518-
profile::base::apt::security_supported_versions: [bullseye, bookworm]
518+
profile::base::apt::security_supported_versions: [bullseye, bookworm, trixie]
519519

520520
profile::base::accounts:
521521
krinkle:

modules/debian/types/codename.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# @summary supported debian version codename
2-
type Debian::Codename = Enum['bullseye', 'bookworm']
2+
type Debian::Codename = Enum['bullseye', 'bookworm', 'trixie']

modules/postgresql/manifests/init.pp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
$pg_version = debian::codename() ? {
55
'bullseye' => '13',
66
'bookworm' => '15',
7+
'trixie' => '17',
8+
default => fail('postgresql: unsupported debian version'),
79
}
810

911
ensure_packages([

0 commit comments

Comments
 (0)