Browse Source

BUG: Conditional pkgrepo.absent instead of enabled, pkgrepo:watch_in

susefix
Wes Turner 10 years ago
parent
commit
1f5d6bb7ee
1 changed files with 22 additions and 1 deletions
  1. +22
    -1
      nginx/package.sls

+ 22
- 1
nginx/package.sls View File

{% from "nginx/map.jinja" import nginx with context %}
{% set use_upstart = pillar.get('nginx', {}).get('use_upstart', true) %} {% set use_upstart = pillar.get('nginx', {}).get('use_upstart', true) %}
{% if use_upstart %} {% if use_upstart %}
nginx-old-init: nginx-old-init:
- file: nginx-old-init - file: nginx-old-init
{% endif %} {% endif %}


{% if salt['grains.get']('os_family') == 'Debian' %}
nginx-ppa-repo:
pkgrepo:
{%- if nginx.install_from_ppa %}
- managed
{%- else %}
- absent
{%- endif %}
- humanname: nginx-ppa-{{ grains['oscodename'] }}
- name: deb http://ppa.launchpad.net/nginx/stable/ubuntu {{ grains['oscodename'] }} main
- file: /etc/apt/sources.list.d/nginx-stable-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }}
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com
- require_in:
- pkg: nginx
- watch_in:
- pkg: nginx
{% endif %}

nginx: nginx:
pkg.installed: pkg.installed:
- name: nginx
- name: {{ nginx.package }}
{% if use_upstart %} {% if use_upstart %}
file: file:
- managed - managed

Loading…
Cancel
Save