Browse Source

BUG: Fix pkgrepo.managed, from_source -> install_from_source (consistency)

susefix
Wes Turner 10 years ago
parent
commit
b2122db4f6
3 changed files with 24 additions and 3 deletions
  1. +21
    -1
      nginx/ng/install.sls
  2. +2
    -1
      nginx/ng/map.jinja
  3. +1
    -1
      nginx/ng/service.sls

+ 21
- 1
nginx/ng/install.sls View File

{% from 'nginx/ng/map.jinja' import nginx, sls_block with context %} {% from 'nginx/ng/map.jinja' import nginx, sls_block with context %}


nginx_install: nginx_install:
{% if nginx.from_source %}
{% if nginx.install_from_source %}
## add source compilation here ## add source compilation here
{% else %} {% else %}
pkg.installed: pkg.installed:
{{ sls_block(nginx.package.opts) }} {{ sls_block(nginx.package.opts) }}
- name: {{ nginx.lookup.package }} - name: {{ nginx.lookup.package }}
{% 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_install
- watch_in:
- pkg: nginx_install
{% endif %}

+ 2
- 1
nginx/ng/map.jinja View File

'vhost_use_symlink': False, 'vhost_use_symlink': False,
}, },
}, default='Debian' ), }, default='Debian' ),
'from_source': False,
'install_from_source': False,
'install_from_ppa': False,
'package': { 'package': {
'opts': {}, 'opts': {},
}, },

+ 1
- 1
nginx/ng/service.sls View File

- require: - require:
- sls: nginx.ng.install - sls: nginx.ng.install
- watch: - watch:
{% if not nginx.from_source %}
{% if not nginx.install_from_source %}
- pkg: nginx_install - pkg: nginx_install
{% endif %} {% endif %}

Loading…
Cancel
Save