Explorar el Código

Merge pull request #58 from OneID/feature/repo-version

Allow ppa install using development/mainline etc
susefix
Nitin Madhok hace 10 años
padre
commit
262070ab06
Se han modificado 2 ficheros con 3 adiciones y 2 borrados
  1. +2
    -2
      nginx/package.sls
  2. +1
    -0
      pillar.example

+ 2
- 2
nginx/package.sls Ver fichero

@@ -61,8 +61,8 @@ nginx-ppa-repo:
- 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
- name: deb http://ppa.launchpad.net/nginx/{{ pillar.get('nginx', {}).get('repo_version', 'stable') }}/ubuntu {{ grains['oscodename'] }} main
- file: /etc/apt/sources.list.d/nginx-{{ pillar.get('nginx', {}).get('repo_version', 'stable') }}-{{ grains['oscodename'] }}.list
- dist: {{ grains['oscodename'] }}
- keyid: C300EE8C
- keyserver: keyserver.ubuntu.com

+ 1
- 0
pillar.example Ver fichero

@@ -5,6 +5,7 @@ nginx:
user_auth_enabled: True
with_luajit: False
with_openresty: True
repo_version: development # Must be using ppa install by setting `repo_source = ppa`
set_real_ips: # NOTE: to use this, nginx must have http_realip module enabled
from_ips:
- 10.10.10.0/24

Cargando…
Cancelar
Guardar