From 1ea58e3452a65beb5e3321d886badda2f0791b40 Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Mon, 30 Mar 2026 20:30:11 +0200 Subject: [PATCH] remove handling of security as special case --- cook/generate_recipe.py | 10 ++-------- cook/recipe_templates.yaml | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/cook/generate_recipe.py b/cook/generate_recipe.py index 44c697c..ef49de9 100644 --- a/cook/generate_recipe.py +++ b/cook/generate_recipe.py @@ -49,8 +49,8 @@ TEMPLATES = { 'extra': 'packages/hand-picked.ks', }, 'security': { - 'enabled': 'core/security/enabled.ks', - 'disabled': 'core/security/disabled.ks', + 'secure': 'core/security/enabled.ks', + 'insecure': 'core/security/disabled.ks', }, 'initial-setup': { 'server': 'initial-setup/server/config.ks', @@ -125,14 +125,8 @@ def get_required_ingredients(variant): """Get required ingredients for a variant.""" ingredients = [] - # Handle special case: security "secure" maps to "enabled" - security = variant.get('security', 'enabled') - if security == 'secure': - security = 'enabled' - # Build variant dict with special mappings variant_map = dict(variant) - variant_map['security'] = security for category, mapping in TEMPLATES['required'].items(): key = variant_map.get(category, list(mapping.keys())[0]) diff --git a/cook/recipe_templates.yaml b/cook/recipe_templates.yaml index dbc96bb..a011fa3 100644 --- a/cook/recipe_templates.yaml +++ b/cook/recipe_templates.yaml @@ -27,7 +27,7 @@ required: extra: "extra": packages/hand-picked.ks security: - "enabled": core/security/enabled.ks + "secure": core/security/enabled.ks initial-setup: "server": initial-setup/server/config.ks modifiers: