瀏覽代碼

Merge pull request #9 from anderbubble/configure-packages

Allow defaults to be overridden with pillar
tags/v2.1.1
Maximilian Eschenbacher 4 年之前
父節點
當前提交
e84cc05075
No account linked to committer's email address
共有 2 個文件被更改,包括 10 次插入2 次删除
  1. +8
    -0
      pillar.example
  2. +2
    -2
      wireguard/map.jinja

+ 8
- 0
pillar.example 查看文件

@@ -54,3 +54,11 @@ wireguard:
[Peer]
PublicKey = peer
AllowedIPs = fe80::2

# Internal formula configuration can be overridden using values placed
# in this lookup table. For more variables that can be overridden, see
# defaults.yaml and os*map.yaml
# lookup:
# packages:
# - wireguard-tools
# - wireguard-kmod

+ 2
- 2
wireguard/map.jinja 查看文件

@@ -13,9 +13,9 @@
merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
merge=salt['grains.filter_by'](osmap, grain='os',
merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
merge=salt['grains.filter_by'](salt['grains.filter_by'](osarchmap, grain='osfinger'), grain='osarch')
merge=salt['grains.filter_by'](salt['grains.filter_by'](osarchmap, grain='osfinger'), grain='osarch',
merge=salt['pillar.get']('wireguard:lookup'))
)
)
)
) %}


Loading…
取消
儲存