浏览代码

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

tags/v0.55.0
Wes Turner 10 年前
父节点
当前提交
1f5d6bb7ee
共有 1 个文件被更改,包括 22 次插入1 次删除
  1. +22
    -1
      nginx/package.sls

+ 22
- 1
nginx/package.sls 查看文件

@@ -1,3 +1,4 @@
{% from "nginx/map.jinja" import nginx with context %}
{% set use_upstart = pillar.get('nginx', {}).get('use_upstart', true) %}
{% if use_upstart %}
nginx-old-init:
@@ -35,9 +36,29 @@ nginx-old-init-disable:
- file: nginx-old-init
{% 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:
pkg.installed:
- name: nginx
- name: {{ nginx.package }}
{% if use_upstart %}
file:
- managed

正在加载...
取消
保存