Skip to content

Commit b45a93a

Browse files
committed
feat(openresty): add OpenResty variant
Allow to install OpenResty from their official repository by introducing 'install_from_openresty' pillar.
1 parent 19a6656 commit b45a93a

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

nginx/defaults.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ nginx:
1111
install_from_ppa: false
1212
install_from_repo: false
1313
install_from_phusionpassenger: false
14+
install_from_openresty: false
1415
ppa_version: stable
1516
source_version: 1.10.0
1617
source_hash: 8ed647c3dd65bc4ced03b0e0f6bf9e633eff6b01bac772bcf97077d58bc2be4d

nginx/pkg.sls

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,27 @@
88
{% set from_official = true %}
99
{% set from_ppa = false %}
1010
{% set from_phusionpassenger = false %}
11+
{% set from_openresty = false %}
1112
{% elif nginx.install_from_ppa %}
1213
{% set from_official = false %}
1314
{% set from_ppa = true %}
1415
{% set from_phusionpassenger = false %}
16+
{% set from_openresty = false %}
1517
{% elif nginx.install_from_phusionpassenger %}
1618
{% set from_official = false %}
1719
{% set from_ppa = false %}
1820
{% set from_phusionpassenger = true %}
21+
{% set from_openresty = false %}
22+
{% elif nginx.install_from_openresty %}
23+
{% set from_official = false %}
24+
{% set from_ppa = false %}
25+
{% set from_phusionpassenger = false %}
26+
{% set from_openresty = true %}
1927
{% else %}
2028
{% set from_official = false %}
2129
{% set from_ppa = false %}
2230
{% set from_phusionpassenger = false %}
31+
{% set from_openresty = false %}
2332
{%- endif %}
2433
2534
nginx_install:
@@ -52,6 +61,22 @@ nginx_official_repo:
5261
- watch_in:
5362
- pkg: nginx_install
5463
64+
openresty_official_repo:
65+
pkgrepo:
66+
{%- if from_openresty %}
67+
- managed
68+
{%- else %}
69+
- absent
70+
{%- endif %}
71+
- humanname: openresty apt repo
72+
- name: deb http://openresty.org/package/{{ grains['os'].lower() }}/ {{ grains['oscodename'] }} openresty
73+
- file: /etc/apt/sources.list.d/openresty-{{ grains['oscodename'] }}.list
74+
- key_url: https://openresty.org/package/pubkey.gpg
75+
- require_in:
76+
- pkg: nginx_install
77+
- watch_in:
78+
- pkg: nginx_install
79+
5580
{%- if grains.os not in ('Debian',) %}
5681
## applies to Ubuntu and derivatives only #}
5782
nginx_ppa_repo:

pillar.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ nginx:
2424
# each build accordingly ( https://launchpad.net/~nginx )
2525
ppa_version: 'stable'
2626

27+
# Use OpenResty repo binaries
28+
install_from_openresty: false
29+
2730
# Source install
2831
source_version: '1.10.0'
2932
source_hash: ''

0 commit comments

Comments
 (0)