Skip to content

Commit 4a0dfac

Browse files
authored
Merge pull request #166 from pawelrosada/master
Add enablerepo option to php-salt-formula
2 parents 75431af + 1b25ed6 commit 4a0dfac

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

php/ng/installed.jinja

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ 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:
@@ -90,6 +91,9 @@ php_install_{{ state }}:
9091
pkg.installed:
9192
- name: {{ state }}
9293
- pkgs: {{ pkgs|json() }}
94+
{% if enable_php_repo %}
95+
- enablerepo: {{ enable_php_repo }}
96+
{% endif %}
9397

9498
{% for pkg in specials %}
9599

pillar.example

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ php:
2020
# represented, please consider adding it to the map.jinja for
2121
# upstream inclusion
2222
lookup:
23-
23+
enable_php_repo: centos-sclo-rh-testing
2424
# package definitions, these can be strings, lists of strings, or
2525
# lists of dictionaries
2626
pkgs:

0 commit comments

Comments
 (0)