Sfoglia il codice sorgente

feat(repositories): allow to specify custom filename

tags/v0.11.0
Javier Bértoli 2 anni fa
parent
commit
2a7e4afe5a
4 ha cambiato i file con 30 aggiunte e 2 eliminazioni
  1. +3
    -2
      apt/repositories.sls
  2. +3
    -0
      pillar.example
  3. +16
    -0
      test/integration/repositories/controls/repositories_spec.rb
  4. +8
    -0
      test/salt/pillar/repositories.sls

+ 3
- 2
apt/repositories.sls Vedi File

@@ -58,12 +58,13 @@
{%- set r_keyserver = args.keyserver if args.keyserver is defined else apt_map.default_keyserver %}

{%- for type in args.type|d(['binary']) %}
{%- set r_type = 'deb-src' if type == 'source' else 'deb' %}
{%- set r_type = 'deb-src' if type == 'source' else 'deb' %}
{%- set r_file = args.filename if args.filename is defined else repo ~ '-' ~ type ~ '.list' %}

{{ r_type }} {{ repo }}:
pkgrepo.managed:
- name: {{ r_type }} {{ r_options }} {{ r_url }} {{ r_distro }} {{ r_comps }}
- file: {{ sources_list_dir }}/{{ repo }}-{{ type }}.list
- file: {{ sources_list_dir }}/{{ r_file }}
{# You can use either keyid+keyserver or key_url. If both are provided
the latter will be used. #}
{% if args.key_url is defined %}

+ 3
- 0
pillar.example Vedi File

@@ -98,6 +98,9 @@ apt:
comps: [main, contrib, non-free]
key_url: https://ftp-master.debian.org/keys/archive-key-10.asc
raspbian:
# If you want to use a particular filename under /etc/apt/sources.list.d
# set it here, with extension included
filename: my_raspbian_repo.list
distro: stable
url: http://archive.raspbian.org/raspbian
type: [source]

+ 16
- 0
test/integration/repositories/controls/repositories_spec.rb Vedi File

@@ -48,4 +48,20 @@ control 'Apt repositories' do
)
end
end

describe file('/etc/apt/sources.list.d/my_raspbian_repo.list') do
it { should exist }
it { should be_owned_by 'root' }
it { should be_grouped_into 'root' }
its('mode') { should cmp '0644' }
its(:content) do
should match(
%r{deb-src http://archive.raspbian.org/raspbian stable main}
)
end
end

describe file('/etc/apt/sources.list.d/raspbian-binary.list') do
it { should_not exist }
end
end

+ 8
- 0
test/salt/pillar/repositories.sls Vedi File

@@ -19,3 +19,11 @@ apt:
arch: [amd64]
comps: []
key_url: https://cli-assets.heroku.com/apt/release.key
raspbian:
# If you want to use a particular filename under /etc/apt/sources.list.d
# set it here, with extension included
filename: my_raspbian_repo.list
distro: stable
url: http://archive.raspbian.org/raspbian
type: [source]
key_url: https://archive.raspbian.org/raspbian.public.key

Loading…
Annulla
Salva