Quellcode durchsuchen

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>
pull/299/head
Georg Pfuetzenreuter vor 1 Jahr
Ursprung
Commit
9ec7ed2b31
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
3 geänderte Dateien mit 15 neuen und 1 gelöschten Zeilen
  1. +1
    -0
      nginx/map.jinja
  2. +10
    -1
      nginx/pkg.sls
  3. +4
    -0
      pillar.example

+ 1
- 0
nginx/map.jinja Datei anzeigen

@@ -116,6 +116,7 @@
'install_from_ppa': False,
'install_from_repo': False,
'install_from_phusionpassenger': False,
'install_from_opensuse_devel': False,
'check_config_before_apply': False,
'ppa_version': 'stable',
'source_version': '1.10.0',

+ 10
- 1
nginx/pkg.sls Datei anzeigen

@@ -11,18 +11,27 @@
{% set from_official = true %}
{% set from_ppa = false %}
{% set from_phusionpassenger = false %}
{% set from_opensuse_devel = false %}
{% elif nginx.install_from_ppa %}
{% set from_official = false %}
{% set from_ppa = true %}
{% set from_phusionpassenger = false %}
{% set from_opensuse_devel = false %}
{% elif nginx.install_from_phusionpassenger %}
{% set from_official = false %}
{% set from_ppa = false %}
{% 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 %}
{% set from_official = false %}
{% set from_ppa = false %}
{% set from_phusionpassenger = false %}
{% set from_opensuse_devel = false %}
{%- endif %}

{%- 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' %}
nginx_zypp_repo:
pkgrepo:
{%- if from_official %}
{%- if from_opensuse_devel %}
- managed
{%- else %}
- absent

+ 4
- 0
pillar.example Datei anzeigen

@@ -24,6 +24,10 @@ nginx:
# each build accordingly ( https://launchpad.net/~nginx )
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_version: '1.10.0'
source_hash: ''

Laden…
Abbrechen
Speichern