feat(opensuse): optional openSUSE devel repository
All modern openSUSE releases (Leap 15.x, Tumbleweed) ship nginx in the default repositories. The devel repository should not be used unless the user knows what they are doing. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
This commit is contained in:
parent
df8cfaa6f0
commit
9ec7ed2b31
@ -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,7 +145,7 @@ 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 %}
|
{%- if from_opensuse_devel %}
|
||||||
- managed
|
- managed
|
||||||
{%- else %}
|
{%- else %}
|
||||||
- absent
|
- absent
|
||||||
|
@ -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…
Reference in New Issue
Block a user