diff --git a/salt/sys-bitcoin/configure-builder-source.sls b/salt/sys-bitcoin/configure-builder-source.sls index 4bed088..b79e517 100644 --- a/salt/sys-bitcoin/configure-builder-source.sls +++ b/salt/sys-bitcoin/configure-builder-source.sls @@ -6,7 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} -{% set bitcoin_tag = 'v26.0' -%} +{%- import slsdotpath ~ "/version.jinja" as version -%} + +{% set bitcoin_tag = 'v' ~ version.version -%} include: - .configure-builder-common diff --git a/salt/sys-bitcoin/configure-builder.sls b/salt/sys-bitcoin/configure-builder.sls index d1d5e8b..9403470 100644 --- a/salt/sys-bitcoin/configure-builder.sls +++ b/salt/sys-bitcoin/configure-builder.sls @@ -6,9 +6,11 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' -%} +{%- import slsdotpath ~ "/version.jinja" as version -%} + ## https://bitcoincore.org/bin/bitcoin-core-VERSION/ -## bitcoin-26.0-x86_64-linux-gnu.tar.gz|SHA256SUMS|SHA256SUMS.asc -{% set bitcoin_version = '26.0' -%} +## bitcoin-VERSION-x86_64-linux-gnu.tar.gz|SHA256SUMS|SHA256SUMS.asc +{% set bitcoin_version = version.version -%} {% set bitcoin_url_dir = 'https://bitcoincore.org/bin/bitcoin-core-' ~ bitcoin_version ~ '/' -%} {% set bitcoin_archive_dir = 'bitcoin-' ~ bitcoin_version -%} {% set bitcoin_file_archive = bitcoin_archive_dir ~ '-x86_64-linux-gnu.tar.gz' -%} diff --git a/salt/sys-bitcoin/version.jinja b/salt/sys-bitcoin/version.jinja new file mode 100644 index 0000000..624158f --- /dev/null +++ b/salt/sys-bitcoin/version.jinja @@ -0,0 +1,7 @@ +{# +SPDX-FileCopyrightText: 2024 Benjamin Grande M. S. + +SPDX-License-Identifier: AGPL-3.0-or-later +#} + +{% set version = '26.1' -%} diff --git a/salt/sys-pihole/install.sls b/salt/sys-pihole/install.sls index 153af45..3f80b14 100644 --- a/salt/sys-pihole/install.sls +++ b/salt/sys-pihole/install.sls @@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later {% if grains['nodename'] != 'dom0' %} -{% set pihole_tag = 'v5.17.2' -%} +{% set pihole_tag = 'v5.18.2' -%} include: - utils.tools.common.update