Browse Source

Merge pull request #166 from pawelrosada/master

Add enablerepo option to php-salt-formula
tags/v0.34.0
Niels Abspoel 5 years ago
parent
commit
4a0dfac0b0
No account linked to committer's email address
2 changed files with 5 additions and 1 deletions
  1. +4
    -0
      php/ng/installed.jinja
  2. +1
    -1
      pillar.example

+ 4
- 0
php/ng/installed.jinja View File

@@ -75,6 +75,7 @@ php_ppa_{{ state }}:
{% elif grains['os_family'] == "RedHat" and (state == 'cli' or state == 'fpm' or state == 'php') %}
{% set use_scl_repo = salt['pillar.get']('php:use_scl_repo', False) %}
{% set scl_php_version = salt['pillar.get']('php:scl_php_version', 71) %}
{% set enable_php_repo = salt['pillar.get']('php:ng:lookup:enable_php_repo', False) %}
{% if use_scl_repo and grains['os'] == 'CentOS' %}
php_centos_scl_enable_{{ state }}:
pkg.installed:
@@ -90,6 +91,9 @@ php_install_{{ state }}:
pkg.installed:
- name: {{ state }}
- pkgs: {{ pkgs|json() }}
{% if enable_php_repo %}
- enablerepo: {{ enable_php_repo }}
{% endif %}

{% for pkg in specials %}


+ 1
- 1
pillar.example View File

@@ -20,7 +20,7 @@ php:
# represented, please consider adding it to the map.jinja for
# upstream inclusion
lookup:
enable_php_repo: centos-sclo-rh-testing
# package definitions, these can be strings, lists of strings, or
# lists of dictionaries
pkgs:

Loading…
Cancel
Save