Skip to content

fix(repositories): force aptkey if signed-by and allow aptkey #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
didiermfb wants to merge 5 commits into from
Closed

fix(repositories): force aptkey if signed-by and allow aptkey #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
28547b7
fix(repositories): force aptkey if signed-by and allow aptkey
didiermfb Mar 11, 2025
9abb98d
feat(repositories): stop removing sources files to get them added again
sir-ragna Mar 17, 2025
5186059
feat(repositories): support for an unmanaged sources.list file
sir-ragna Mar 17, 2025
51c3480
ci(fix): fix comment
sir-ragna Mar 19, 2025
4a10a55
fix: keyring in map file not properly defined
didiermfb Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,10 @@ rubocop:
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# yamllint disable rule:line-length
# repositories-debian-11-tiamat-py3: {extends: '.test_instance'}
# repositories-debian-10-tiamat-py3: {extends: '.test_instance'}
# repositories-debian-9-tiamat-py3: {extends: '.test_instance'}
# repositories-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
# repositories-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
# repositories-debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
# preferences-debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
# unattended-debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
# debian-12-master-py3: {extends: '.test_instance_failure_permitted'}
# repositories-debian-11-master-py3: {extends: '.test_instance'}
# preferences-debian-11-master-py3: {extends: '.test_instance'}
# unattended-debian-11-master-py3: {extends: '.test_instance'}
Expand All @@ -145,14 +143,14 @@ debian-11-master-py3: {extends: '.test_instance'}
# preferences-debian-10-master-py3: {extends: '.test_instance'}
# unattended-debian-10-master-py3: {extends: '.test_instance'}
debian-10-master-py3: {extends: '.test_instance'}
# repositories-debian-9-master-py3: {extends: '.test_instance'}
# preferences-debian-9-master-py3: {extends: '.test_instance'}
# unattended-debian-9-master-py3: {extends: '.test_instance'}
debian-9-master-py3: {extends: '.test_instance'}
# repositories-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
# preferences-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
# unattended-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
# repositories-ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
# preferences-ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
# unattended-ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
# ubuntu-2404-master-py3: {extends: '.test_instance_failure_permitted'}
# repositories-ubuntu-2204-master-py3: {extends: '.test_instance'}
# preferences-ubuntu-2204-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-2204-master-py3: {extends: '.test_instance'}
ubuntu-2204-master-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-master-py3: {extends: '.test_instance'}
# preferences-ubuntu-2004-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-2004-master-py3: {extends: '.test_instance'}
Expand All @@ -161,16 +159,20 @@ ubuntu-2004-master-py3: {extends: '.test_instance'}
# preferences-ubuntu-1804-master-py3: {extends: '.test_instance'}
# unattended-ubuntu-1804-master-py3: {extends: '.test_instance'}
ubuntu-1804-master-py3: {extends: '.test_instance'}
# repositories-debian-11-3004-1-py3: {extends: '.test_instance'}
# repositories-debian-10-3004-1-py3: {extends: '.test_instance'}
# repositories-debian-9-3004-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
# repositories-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
# repositories-debian-10-3003-4-py3: {extends: '.test_instance'}
# repositories-debian-9-3003-4-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
# repositories-debian-12-3007-1-py3: {extends: '.test_instance_failure_permitted'}
# repositories-debian-11-3007-1-py3: {extends: '.test_instance'}
# repositories-debian-10-3007-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-2404-3007-1-py3: {extends: '.test_instance_failure_permitted'}
# repositories-ubuntu-2204-3007-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3007-1-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3007-1-py3: {extends: '.test_instance'}
# repositories-debian-12-3006-9-py3: {extends: '.test_instance_failure_permitted'}
# repositories-debian-11-3006-9-py3: {extends: '.test_instance'}
# repositories-debian-10-3006-9-py3: {extends: '.test_instance'}
# repositories-ubuntu-2404-3006-9-py3: {extends: '.test_instance_failure_permitted'}
# repositories-ubuntu-2204-3006-9-py3: {extends: '.test_instance'}
# repositories-ubuntu-2004-3006-9-py3: {extends: '.test_instance'}
# repositories-ubuntu-1804-3006-9-py3: {extends: '.test_instance'}
# yamllint enable rule:line-length

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ repos:
always_run: true
pass_filenames: false
- repo: https://github.com/warpnet/salt-lint
rev: v0.8.0
rev: v0.9.2
hooks:
- id: salt-lint
name: Check Salt files using salt-lint
Expand Down
18 changes: 8 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,10 @@ jobs:
## Define the rest of the matrix based on Kitchen testing
# Make sure the instances listed below match up with
# the `platforms` defined in `kitchen.yml`
# - env: INSTANCE=repositories-debian-11-tiamat-py3
# - env: INSTANCE=repositories-debian-10-tiamat-py3
# - env: INSTANCE=repositories-debian-9-tiamat-py3
# - env: INSTANCE=repositories-ubuntu-2204-tiamat-py3
# - env: INSTANCE=repositories-ubuntu-2004-tiamat-py3
# - env: INSTANCE=repositories-ubuntu-1804-tiamat-py3
# - env: INSTANCE=repositories-debian-12-master-py3
# - env: INSTANCE=preferences-debian-12-master-py3
# - env: INSTANCE=unattended-debian-12-master-py3
# - env: INSTANCE=debian-12-master-py3
# - env: INSTANCE=repositories-debian-11-master-py3
# - env: INSTANCE=preferences-debian-11-master-py3
# - env: INSTANCE=unattended-debian-11-master-py3
Expand All @@ -97,10 +95,10 @@ jobs:
# - env: INSTANCE=preferences-debian-10-master-py3
# - env: INSTANCE=unattended-debian-10-master-py3
- env: INSTANCE=debian-10-master-py3
# - env: INSTANCE=repositories-debian-9-master-py3
# - env: INSTANCE=preferences-debian-9-master-py3
# - env: INSTANCE=unattended-debian-9-master-py3
- env: INSTANCE=debian-9-master-py3
# - env: INSTANCE=repositories-ubuntu-2404-master-py3
# - env: INSTANCE=preferences-ubuntu-2404-master-py3
# - env: INSTANCE=unattended-ubuntu-2404-master-py3
# - env: INSTANCE=ubuntu-2404-master-py3
# - env: INSTANCE=repositories-ubuntu-2204-master-py3
# - env: INSTANCE=preferences-ubuntu-2204-master-py3
# - env: INSTANCE=unattended-ubuntu-2204-master-py3
Expand Down
4 changes: 2 additions & 2 deletions apt/apt_conf.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

{{ confd_dir }}:
file.directory:
- mode: 755
- mode: '0755'
- user: root
- group: root
- clean: {{ clean_apt_conf_d }}
Expand All @@ -30,7 +30,7 @@
- template: jinja
- user: root
- group: root
- mode: 644
- mode: '0644'
- context:
data: {{ contents }}
- require_in:
Expand Down
2 changes: 1 addition & 1 deletion apt/listchanges.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ apt_listchanges_pkgs:
- template: jinja
- user: root
- group: root
- mode: 644
- mode: '0644'
- source: {{ listchanges_config_template }}
18 changes: 14 additions & 4 deletions apt/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{% set distribution = salt['grains.get']('lsb_distrib_codename') %}
{% set arch = salt['grains.get']('osarch').split(' ') %}
{% set debian_comp = ['main', 'contrib', 'non-free', 'non-free-firmware'] if salt['grains.get']('osmajorrelease') >= 12 else ['main', 'contrib', 'non-free'] %}

{% set apt = salt['grains.filter_by']({
'Debian': {
'pkgs': ['unattended-upgrades'],
Expand All @@ -13,6 +15,8 @@
'preferences': {},
'remove_preferences': false,
'clean_preferences_d': false,
'keyrings_dir': '/etc/apt/keyrings',
'clean_keyrings_list_d': false,
'remove_apt_conf': false,
'clean_apt_conf_d': false,
'apt_conf_d': {},
Expand All @@ -24,19 +28,22 @@
'distro': distribution,
'url': 'http://deb.debian.org/debian/',
'arch': arch,
'comps': ['main'],
'comps': debian_comp,
'opts': 'signed-by=/usr/share/keyrings/debian-archive-keyring.gpg'
},
'security-stable': {
'distro': distribution ~ '/updates',
'distro': distribution ~ '-security',
'url': 'http://security.debian.org/',
'arch': arch,
'comps': ['main'],
'comps': debian_comp,
'opts': 'signed-by=/usr/share/keyrings/debian-archive-keyring.gpg'
},
'default-updates': {
'distro': distribution ~ '-updates',
'url': 'http://deb.debian.org/debian/',
'arch': arch,
'comps': ['main'],
'comps': debian_comp,
'opts': 'signed-by=/usr/share/keyrings/debian-archive-keyring.gpg'
},
},
},
Expand All @@ -52,6 +59,8 @@
'preferences': {},
'remove_preferences': false,
'clean_preferences_d': false,
'keyrings_dir': '/etc/apt/keyrings',
'clean_keyrings_list_d': false,
'remove_apt_conf': false,
'clean_apt_conf_d': false,
'apt_conf_d': {},
Expand Down Expand Up @@ -83,4 +92,5 @@
'Mint': {
'keyring_package': 'linuxmint-keyring'
},

}, grain='oscodename', merge=salt['pillar.get']('apt:lookup'), default='Debian')) %}
40 changes: 39 additions & 1 deletion apt/repositories.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
{% set remove_sources_list = apt.get('remove_sources_list', apt_map.remove_sources_list) %}
{% set clean_sources_list_d = apt.get('clean_sources_list_d', apt_map.clean_sources_list_d) %}
{% set sources_list_dir = apt.get('sources_list_dir', apt_map.sources_list_dir) %}
{% set keyrings_dir = apt.get('keyrings_dir', apt_map.keyrings_dir) %}
{% set clean_keyrings_list_d = apt.get('clean_keyrings_list_d', apt_map.clean_keyrings_list_d) %}
{% set repositories = apt.get('repositories', apt_map.repositories) %}
{% set default_url = apt.get('default_url', apt_map.default_url) %}
{% set keyring_package = apt.get('keyring_package', apt_map.default_keyring_package) %}
Expand All @@ -23,12 +25,36 @@
- replace: False
{% endif %}

{% set excluded_sources = [] %}
{% set unmanaged_repos = [] %}
{% for repo, args in repositories.items() %}
{% if args.unmanaged is defined and args.unmanaged %}
{# repo.list is considered the filename unless filename is explicitly defined.
# managed repo lists files are constructed repo-type.list #}
{% do excluded_sources.append(args.filename if args.filename is defined else repo ~ '.list') %}
{% do unmanaged_repos.append(repo) %}
{% endif %}
{% endfor %}
{% for repo in unmanaged_repos %}
{# remove these repo's to avoid pgrepo.managed loop #}
{% do repositories.pop(repo) %}
{% endfor %}

{{ sources_list_dir }}:
file.directory:
- mode: '0755'
- user: root
- group: root
- clean: {{ clean_sources_list_d }}
- exclude_pat: {{ excluded_sources | json }}

{{ keyrings_dir }}:
file.directory:
- mode: '0755'
- user: root
- group: root
- clean: {{ clean_keyrings_list_d }}


{% for repo, args in repositories.items() %}

Expand Down Expand Up @@ -69,6 +95,9 @@
the latter will be used. #}
{% if args.key_url is defined %}
- key_url: {{ args.key_url }}
{% if 'signed-by=' in r_opts|lower and args.aptkey is not defined %}
- aptkey: false
{% endif %}
{% elif args.key_text is defined %}
- key_text: {{ args.key_text }}
{% elif args.keyid is defined %}
Expand All @@ -78,9 +107,18 @@
- clean_file: true
- refresh: False
- refresh_db: False
{% if args.aptkey is defined %}
- aptkey: {{ args.aptkey }}
{% endif %}
- onchanges_in:
- module: apt.refresh_db

file.managed:
- name: {{ sources_list_dir }}/{{ r_file }}
- replace: false
- require_in:
- file: {{ sources_list_dir }}
# require_in the directory clean state
# This way, we don't remove all the files, just to add them again.
{%- endfor %}
{% endfor %}

Expand Down
Loading
Loading