Compare commits
2 Commits
bcd6274afd
...
ba4d8b1871
Author | SHA1 | Date | |
---|---|---|---|
ba4d8b1871 | |||
82ab60a03b |
@ -116,6 +116,7 @@
|
|||||||
'install_from_ppa': False,
|
'install_from_ppa': False,
|
||||||
'install_from_repo': False,
|
'install_from_repo': False,
|
||||||
'install_from_phusionpassenger': False,
|
'install_from_phusionpassenger': False,
|
||||||
|
'install_from_opensuse_devel': False,
|
||||||
'check_config_before_apply': False,
|
'check_config_before_apply': False,
|
||||||
'ppa_version': 'stable',
|
'ppa_version': 'stable',
|
||||||
'source_version': '1.10.0',
|
'source_version': '1.10.0',
|
||||||
|
@ -11,18 +11,27 @@
|
|||||||
{% set from_official = true %}
|
{% set from_official = true %}
|
||||||
{% set from_ppa = false %}
|
{% set from_ppa = false %}
|
||||||
{% set from_phusionpassenger = false %}
|
{% set from_phusionpassenger = false %}
|
||||||
|
{% set from_opensuse_devel = false %}
|
||||||
{% elif nginx.install_from_ppa %}
|
{% elif nginx.install_from_ppa %}
|
||||||
{% set from_official = false %}
|
{% set from_official = false %}
|
||||||
{% set from_ppa = true %}
|
{% set from_ppa = true %}
|
||||||
{% set from_phusionpassenger = false %}
|
{% set from_phusionpassenger = false %}
|
||||||
|
{% set from_opensuse_devel = false %}
|
||||||
{% elif nginx.install_from_phusionpassenger %}
|
{% elif nginx.install_from_phusionpassenger %}
|
||||||
{% set from_official = false %}
|
{% set from_official = false %}
|
||||||
{% set from_ppa = false %}
|
{% set from_ppa = false %}
|
||||||
{% set from_phusionpassenger = true %}
|
{% set from_phusionpassenger = true %}
|
||||||
|
{% set from_opensuse_devel = false %}
|
||||||
|
{% elif nginx.install_from_opensuse_devel %}
|
||||||
|
{% set from_official = false %}
|
||||||
|
{% set from_ppa = false %}
|
||||||
|
{% set from_phusionpassenger = false %}
|
||||||
|
{% set from_opensuse_devel = true %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set from_official = false %}
|
{% set from_official = false %}
|
||||||
{% set from_ppa = false %}
|
{% set from_ppa = false %}
|
||||||
{% set from_phusionpassenger = false %}
|
{% set from_phusionpassenger = false %}
|
||||||
|
{% set from_opensuse_devel = false %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
{%- set resource_repo_managed = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
|
{%- set resource_repo_managed = 'file' if grains.os_family == 'Debian' else 'pkgrepo' %}
|
||||||
@ -136,12 +145,9 @@ nginx_phusionpassenger_repo:
|
|||||||
{% if grains.os_family == 'Suse' or grains.os == 'SUSE' %}
|
{% if grains.os_family == 'Suse' or grains.os == 'SUSE' %}
|
||||||
nginx_zypp_repo:
|
nginx_zypp_repo:
|
||||||
pkgrepo:
|
pkgrepo:
|
||||||
{%- if from_official %}
|
|
||||||
- managed
|
|
||||||
{%- else %}
|
|
||||||
- absent
|
|
||||||
{%- endif %}
|
|
||||||
- name: server_http
|
- name: server_http
|
||||||
|
{%- if from_opensuse_devel %}
|
||||||
|
- managed
|
||||||
- humanname: server_http
|
- humanname: server_http
|
||||||
- baseurl: 'http://download.opensuse.org/repositories/server:/http/{{ grains.osrelease }}/'
|
- baseurl: 'http://download.opensuse.org/repositories/server:/http/{{ grains.osrelease }}/'
|
||||||
- enabled: True
|
- enabled: True
|
||||||
@ -149,6 +155,9 @@ nginx_zypp_repo:
|
|||||||
- gpgcheck: {{ nginx.lookup.gpg_check }}
|
- gpgcheck: {{ nginx.lookup.gpg_check }}
|
||||||
- gpgkey: {{ nginx.lookup.gpg_key }}
|
- gpgkey: {{ nginx.lookup.gpg_key }}
|
||||||
- gpgautoimport: {{ nginx.lookup.gpg_autoimport }}
|
- gpgautoimport: {{ nginx.lookup.gpg_autoimport }}
|
||||||
|
{%- else %}
|
||||||
|
- absent
|
||||||
|
{%- endif %}
|
||||||
- require_in:
|
- require_in:
|
||||||
- pkg: nginx_install
|
- pkg: nginx_install
|
||||||
- watch_in:
|
- watch_in:
|
||||||
|
@ -24,6 +24,10 @@ nginx:
|
|||||||
# each build accordingly ( https://launchpad.net/~nginx )
|
# each build accordingly ( https://launchpad.net/~nginx )
|
||||||
ppa_version: 'stable'
|
ppa_version: 'stable'
|
||||||
|
|
||||||
|
# Use openSUSE devel (server:http) repository to install nginx.
|
||||||
|
# If not set, the server_http repository will be removed if it exists.
|
||||||
|
install_from_opensuse_devel: false
|
||||||
|
|
||||||
# Source install
|
# Source install
|
||||||
source_version: '1.10.0'
|
source_version: '1.10.0'
|
||||||
source_hash: ''
|
source_hash: ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user