Skip to content

Commit bfb29bd

Browse files
committed
fix(repo): provide EPEL repo configuration for Amazon Linux-2
* Semi-automated using myii/ssf-formula#38
1 parent f458f58 commit bfb29bd

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.travis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ env:
2727
# - INSTANCE: default-amazonlinux-2-develop-py2
2828
# - INSTANCE: default-debian-9-2019-2-py3
2929
- INSTANCE: default-ubuntu-1804-2019-2-py3
30-
- INSTANCE: default-centos-7-2019-2-py3
30+
# - INSTANCE: default-centos-7-2019-2-py3
3131
# - INSTANCE: default-fedora-30-2019-2-py3
3232
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
33-
# - INSTANCE: default-amazonlinux-2-2019-2-py2
34-
- INSTANCE: default-debian-9-2018-3-py2
33+
- INSTANCE: default-amazonlinux-2-2019-2-py2
34+
# - INSTANCE: default-debian-9-2018-3-py2
3535
# - INSTANCE: default-ubuntu-1604-2018-3-py2
36-
# - INSTANCE: default-centos-7-2018-3-py2
36+
- INSTANCE: default-centos-7-2018-3-py2
3737
# - INSTANCE: default-fedora-29-2018-3-py2
3838
- INSTANCE: default-opensuse-leap-15-2018-3-py2
3939
# - INSTANCE: default-amazonlinux-2-2018-3-py2

openvpn/repo.sls

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,17 @@ openvpn_external_repo:
1313
- key_url: https://swupdate.openvpn.net/repos/repo-public.gpg
1414
- require_in:
1515
- pkg: openvpn_pkgs
16+
{#- Simulating `grains.osfinger`, which is avoided since not available in all distros #}
17+
{%- elif [grains.os, grains.osrelease] == ['Amazon', '2'] %}
18+
openvpn_external_repo:
19+
pkgrepo.managed:
20+
- name: epel
21+
- humanname: Extra Packages for Enterprise Linux 7 - $basearch
22+
- mirrorlist: https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch
23+
- enabled: 1
24+
- gpgcheck: 1
25+
- gpgkey: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7
26+
- failovermethod: priority
27+
- require_in:
28+
- pkg: openvpn_pkgs
1629
{%- endif %}

0 commit comments

Comments
 (0)