From cf426433a4a3e947690e5034481aa1b433f9dab7 Mon Sep 17 00:00:00 2001 From: Arthur Lutz Date: Thu, 4 Jan 2018 11:56:44 +0100 Subject: [PATCH] [apt/repositories] add opts for repo name Fixes #30 --- apt/repositories.sls | 3 ++- pillar.example | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apt/repositories.sls b/apt/repositories.sls index 2e6eeb5..2a078a5 100644 --- a/apt/repositories.sls +++ b/apt/repositories.sls @@ -30,6 +30,7 @@ debian-archive-keyring: {%- set r_arch = '[arch=' ~ args.arch|join(',') ~ ']' if args.arch is defined else '' %} {%- set r_url = args.url or default_url %} {%- set r_distro = args.distro or 'stable' %} +{%- set r_opts = args.opts or '' %} {%- set r_comps = args.comps|default(['main'])|join(' ') %} {%- set r_keyserver = args.keyserver if args.keyserver is defined else apt_map.default_keyserver %} @@ -38,7 +39,7 @@ debian-archive-keyring: {{ r_type }} {{ repo }}: pkgrepo.managed: - - name: {{ r_type }} {{ r_arch }} {{ r_url }} {{ r_distro }} {{ r_comps }} + - name: {{ r_type }} {{ r_arch }} {{ r_opts }} {{ r_url }} {{ r_distro }} {{ r_comps }} - 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. #} diff --git a/pillar.example b/pillar.example index fe70c0c..0e4ba78 100644 --- a/pillar.example +++ b/pillar.example @@ -70,6 +70,10 @@ apt: arch: [i386, amd64] keyid: 1C61A2656FB57B7E4DE0F4C1FC918B335044912E keyserver: hkp://pgp.mit.edu:80 + intranet: + distro: stretch + url: http://intranet.example.org + opts: "[trusted=yes]" preferences: 00-rspamd: