Bläddra i källkod

Fix resource name to avoid conflicting ID

master
Javier Bértoli 8 år sedan
förälder
incheckning
4a26e31ed5
3 ändrade filer med 6 tillägg och 5 borttagningar
  1. +2
    -2
      .kitchen.yml
  2. +3
    -2
      apt/repositories.sls
  3. +1
    -1
      test/integration/repositories/serverspec/repositories_spec.rb

+ 2
- 2
.kitchen.yml Visa fil

@@ -32,12 +32,12 @@ suites:
remove_sources_list: true
clean_sources_list_d: true
repositories:
debian-jessie-source:
debian-jessie:
distro: jessie
url: http://httpredir.debian.org/debian
type: [source]
comps: [main, contrib, non-free]
dropbox-repo:
dropbox:
distro: jessie
url: http://linux.dropbox.com/debian
arch: [i386, amd64]

+ 3
- 2
apt/repositories.sls Visa fil

@@ -35,10 +35,11 @@ debian-archive-keyring:

{%- for type in args.type|d(['binary']) %}
{%- set r_type = 'deb-src' if type == 'source' else 'deb' %}
{{ repo }}:

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

+ 1
- 1
test/integration/repositories/serverspec/repositories_spec.rb Visa fil

@@ -25,7 +25,7 @@ describe 'apt.repositories' do
its(:content) { should match('deb-src http://httpredir.debian.org/debian jessie contrib non-free main') }
end

describe file('/etc/apt/sources.list.d/dropbox-repo.list') do
describe file('/etc/apt/sources.list.d/dropbox-binary.list') do
it { should exist }
it { should be_mode 644 }
it { should be_owned_by 'root' }

Laddar…
Avbryt
Spara