瀏覽代碼

[apt/repositories] add opts for repo name

Fixes #30
master
Arthur Lutz 7 年之前
父節點
當前提交
cf426433a4
共有 2 個檔案被更改,包括 6 行新增1 行删除
  1. +2
    -1
      apt/repositories.sls
  2. +4
    -0
      pillar.example

+ 2
- 1
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. #}

+ 4
- 0
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:

Loading…
取消
儲存