Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-05-20 11:33:45 +02:00
Code Issues Activity

fix(pkgrepo): New style since 3006 not 3005

Browse Source
This commit is contained in:
Justin Zandbergen 2024-04-25 14:27:03 +02:00
parent 916bb2903b
commit 0a8bd5fe11
No known key found for this signature in database
GPG Key ID: 2AA3406BA4B5EB37
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/osfamilymap.yaml
View File

@ -16,7 +16,7 @@
# Different salt versions have different repo's, keyrings, pubkeys and hashes. # Different salt versions have different repo's, keyrings, pubkeys and hashes.
# 'latest' cannot be coerced into an integer and it's result will be int(0). # 'latest' cannot be coerced into an integer and it's result will be int(0).
{%- if salt_release.split('.')[0] | int >= 3005 or salt_release.split('.')[0] | int == 0 %} {%- if salt_release.split('.')[0] | int >= 3006 or salt_release.split('.')[0] | int == 0 %}
{%- set default_repo = 'https://repo.saltproject.io/salt' %} {%- set default_repo = 'https://repo.saltproject.io/salt' %}
{%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %} {%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %}
{%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %} {%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %}

2
salt/osfingermap.yaml
View File

@ -14,7 +14,7 @@
# Different salt versions have different repo's, keyrings, pubkeys and hashes. # Different salt versions have different repo's, keyrings, pubkeys and hashes.
# 'latest' cannot be coerced into an integer and it's result will be int(0). # 'latest' cannot be coerced into an integer and it's result will be int(0).
{%- if salt_release.split('.')[0] | int >= 3005 or salt_release.split('.')[0] | int == 0 %} {%- if salt_release.split('.')[0] | int >= 3006 or salt_release.split('.')[0] | int == 0 %}
{%- set default_repo = 'https://repo.saltproject.io/salt' %} {%- set default_repo = 'https://repo.saltproject.io/salt' %}
{%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %} {%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %}
{%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %} {%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %}

2
salt/osmap.yaml
View File

@ -16,7 +16,7 @@
# Different salt versions have different repo's, keyrings, pubkeys and hashes. # Different salt versions have different repo's, keyrings, pubkeys and hashes.
# 'latest' cannot be coerced into an integer and it's result will be int(0). # 'latest' cannot be coerced into an integer and it's result will be int(0).
{%- if salt_release.split('.')[0] | int >= 3005 or salt_release.split('.')[0] | int == 0 %} {%- if salt_release.split('.')[0] | int >= 3006 or salt_release.split('.')[0] | int == 0 %}
{%- set default_repo = 'https://repo.saltproject.io/salt' %} {%- set default_repo = 'https://repo.saltproject.io/salt' %}
{%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %} {%- set default_repo_keyring_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.gpg' %}
{%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %} {%- set default_repo_pubkey_filename = 'SALT-PROJECT-GPG-PUBKEY-2023.pub' %}