Skip to content

Commit 324ebd8

Browse files
authored
Add enablerepo option to php-salt-formula
1 parent df0224f commit 324ebd8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

php/ng/installed.jinja

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ php_ppa_{{ state }}:
7575
{% elif grains['os_family'] == "RedHat" and (state == 'cli' or state == 'fpm' or state == 'php') %}
7676
{% set use_scl_repo = salt['pillar.get']('php:use_scl_repo', False) %}
7777
{% set scl_php_version = salt['pillar.get']('php:scl_php_version', 71) %}
78+
{% set enable_php_repo = salt['pillar.get']('php:ng:lookup:enable_php_repo', False) %}
7879
{% if use_scl_repo and grains['os'] == 'CentOS' %}
7980
php_centos_scl_enable_{{ state }}:
8081
pkg.installed:
81-
- name: centos-release-scl
82-
{% elif use_scl_repo and grains['os'] == 'RedHat' %}
83-
php_redhat_scl_enable_{{ state }}:
84-
cmd.run:
85-
- name: yum-config-manager --enable rhel-server-rhscl-{{ grains['osmajorrelease'] }}-rpms
86-
{% endif %}
82+
pkg.installed:
83+
- name: {{ state }}
84+
- pkgs: {{ pkgs|json() }}
85+
{% if enable_php_repo %}
86+
- enablerepo: {{ enable_php_repo }}
8787
{% endif %}
8888

8989
php_install_{{ state }}:

0 commit comments

Comments
 (0)