Skip to content

Commit

Permalink
fix(osfinger): provide correct package for centos-7 & oraclelinux-7
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Feb 15, 2021
1 parent 1054e0d commit 19998df
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
7 changes: 6 additions & 1 deletion letsencrypt/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{% import_yaml 'letsencrypt/defaults.yaml' as defaults %}
{% import_yaml 'letsencrypt/osfamilymap.yaml' as osfamilymap %}
{% import_yaml 'letsencrypt/osmap.yaml' as osmap %}
{% import_yaml 'letsencrypt/osfingermap.yaml' as osfingermap %}

{% set letsencrypt = salt['grains.filter_by'](
defaults,
Expand All @@ -14,7 +15,11 @@
merge=salt['grains.filter_by'](
osmap,
grain='os',
merge = salt['pillar.get']('letsencrypt', {}),
merge=salt['grains.filter_by'](
osfingermap,
grain='osfinger',
merge = salt['pillar.get']('letsencrypt', {}),
),
),
),
base='letsencrypt')
Expand Down
20 changes: 20 additions & 0 deletions letsencrypt/osfingermap.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# -*- coding: utf-8 -*-
# vim: ft=yaml
#
# Setup variables using grains['osfinger'] based logic.
# You just need to add the key:values for an `osfinger` that differ
# from `defaults.yaml` + `osarch.yaml` + `os_family.yaml` + `osmap.yaml`.
# Only add an `osfinger` which is/will be supported by the formula.
#
# If you do not need to provide defaults via the `osfinger` grain,
# you will need to provide at least an empty dict in this file, e.g.
# osfingermap: {}
---
# os: CentOS
CentOS Linux-7:
pkgs:
- python2-certbot-apache
# os: OEL
Oracle Linux Server-7:
pkgs:
- python2-certbot-apache

0 comments on commit 19998df

Please sign in to comment.