From 36c2f227955d5b340ff7bd94b81b27e2fa548227 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Thu, 26 Jun 2025 21:47:14 +0200 Subject: [PATCH] bundles/basic: support debian trixie --- bundles/basic/files/{locale => locale.conf} | 0 bundles/basic/items.py | 20 ++++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) rename bundles/basic/files/{locale => locale.conf} (100%) diff --git a/bundles/basic/files/locale b/bundles/basic/files/locale.conf similarity index 100% rename from bundles/basic/files/locale rename to bundles/basic/files/locale.conf diff --git a/bundles/basic/items.py b/bundles/basic/items.py index c2cdd49..e7b6ec7 100644 --- a/bundles/basic/items.py +++ b/bundles/basic/items.py @@ -4,12 +4,6 @@ from uuid import UUID from bundlewrap.utils.text import italic files = { - '/etc/default/locale': { - 'content_type': 'mako', - 'needs': { - 'action:locale-gen', - }, - }, '/etc/hosts': { 'content_type': 'mako', }, @@ -28,6 +22,20 @@ files = { }, } +if node.os_version[0] < 13: + locale_file = '/etc/default/locale' +else: + locale_file = '/etc/locale.conf' + +files[locale_file] = { + 'content_type': 'mako', + 'source': 'locale.conf', + 'needs': { + 'action:locale-gen', + }, +} + + if node.has_any_bundle([ 'dovecot', 'nginx',