fix: changes default template flavor to Xfce

This commit is contained in:
Ben Grande 2024-01-04 17:25:56 +01:00
parent e0b11b3daf
commit 8a8252d6f0
4 changed files with 28 additions and 8 deletions

View File

@ -5,7 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
#}
{%- import "debian/template.jinja" as template_base -%}
{% set base = template_base.base -%}
{% set version = template_base.version -%}
{% set flavor = 'minimal' -%}
{% set repo = template_base.repo -%}
{% set template = template_base.template ~ '-minimal' -%}
{% set template_clean = template_base.template_clean ~ '-minimal' -%}
{% if flavor -%}
{% set flavor = '-' ~ flavor -%}
{% endif -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template_clean = base ~ flavor -%}

View File

@ -4,7 +4,12 @@ SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% set base = 'debian' -%}
{% set version = salt['pillar.get']('qvm:debian:version', '12') -%}
{% set flavor = salt['pillar.get']('qvm:debian:flavor', 'xfce') -%}
{% set repo = salt['pillar.get']('qvm:debian:repo', 'qubes-templates-itl') -%}
{% set template = 'debian-' ~ version -%}
{% set template_clean = 'debian' -%}
{% if flavor -%}
{% set flavor = '-' ~ flavor -%}
{% endif -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template_clean = base ~ flavor -%}

View File

@ -5,7 +5,12 @@ SPDX-License-Identifier: AGPL-3.0-or-later
#}
{%- import "fedora/template.jinja" as template_base -%}
{% set base = template_base.base -%}
{% set version = template_base.version -%}
{% set flavor = 'minimal' -%}
{% set repo = template_base.repo -%}
{% set template = template_base.template ~ '-minimal' -%}
{% set template_clean = template_base.template_clean ~ '-minimal' -%}
{% if flavor -%}
{% set flavor = '-' ~ flavor -%}
{% endif -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template_clean = base ~ flavor -%}

View File

@ -4,7 +4,12 @@ SPDX-FileCopyrightText: 2023 Benjamin Grande M. S. <ben.grande.b@gmail.com>
SPDX-License-Identifier: AGPL-3.0-or-later
#}
{% set base = 'fedora' -%}
{% set version = salt['pillar.get']('qvm:fedora:version', '38') -%}
{% set flavor = salt['pillar.get']('qvm:fedora:flavor', 'xfce') -%}
{% set repo = salt['pillar.get']('qvm:fedora:repo', 'qubes-templates-itl') -%}
{% set template = 'fedora-' ~ version -%}
{% set template_clean = 'fedora' -%}
{% if flavor -%}
{% set flavor = '-' ~ flavor -%}
{% endif -%}
{% set template = base ~ '-' ~ version ~ flavor -%}
{% set template_clean = base ~ flavor -%}