Skip to content

Commit

Permalink
Merge pull request #122 from myii/feat/add-epel-repo-for-amazon
Browse files Browse the repository at this point in the history
fix(repo): provide EPEL repo configuration for `Amazon Linux-2`
  • Loading branch information
myii authored Sep 21, 2019
2 parents f458f58 + bfb29bd commit b7befe3
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ env:
# - INSTANCE: default-amazonlinux-2-develop-py2
# - INSTANCE: default-debian-9-2019-2-py3
- INSTANCE: default-ubuntu-1804-2019-2-py3
- INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-centos-7-2019-2-py3
# - INSTANCE: default-fedora-30-2019-2-py3
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
# - INSTANCE: default-amazonlinux-2-2019-2-py2
- INSTANCE: default-debian-9-2018-3-py2
- INSTANCE: default-amazonlinux-2-2019-2-py2
# - INSTANCE: default-debian-9-2018-3-py2
# - INSTANCE: default-ubuntu-1604-2018-3-py2
# - INSTANCE: default-centos-7-2018-3-py2
- INSTANCE: default-centos-7-2018-3-py2
# - INSTANCE: default-fedora-29-2018-3-py2
- INSTANCE: default-opensuse-leap-15-2018-3-py2
# - INSTANCE: default-amazonlinux-2-2018-3-py2
Expand Down
13 changes: 13 additions & 0 deletions openvpn/repo.sls
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,17 @@ openvpn_external_repo:
- key_url: https://swupdate.openvpn.net/repos/repo-public.gpg
- require_in:
- pkg: openvpn_pkgs
{#- Simulating `grains.osfinger`, which is avoided since not available in all distros #}
{%- elif [grains.os, grains.osrelease] == ['Amazon', '2'] %}
openvpn_external_repo:
pkgrepo.managed:
- name: epel
- humanname: Extra Packages for Enterprise Linux 7 - $basearch
- mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
- enabled: 1
- gpgcheck: 1
- gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
- failovermethod: priority
- require_in:
- pkg: openvpn_pkgs
{%- endif %}

0 comments on commit b7befe3

Please sign in to comment.