Commit 7953fea6 authored by Julien Muchembled's avatar Julien Muchembled

nginx: share more parts, drop obsolete sections

parent debd2fce
[buildout] [buildout]
extends = extends =
../coreutils/buildout.cfg ../coreutils/buildout.cfg
../git/buildout.cfg
../libexpat/buildout.cfg ../libexpat/buildout.cfg
../openssl/buildout.cfg ../openssl/buildout.cfg
../patch/buildout.cfg
../pcre/buildout.cfg ../pcre/buildout.cfg
../zlib/buildout.cfg ../zlib/buildout.cfg
...@@ -12,13 +10,12 @@ parts = nginx-output ...@@ -12,13 +10,12 @@ parts = nginx-output
[nginx-common] [nginx-common]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = false shared = true
url = https://nginx.org/download/nginx-1.19.2.tar.gz url = https://nginx.org/download/nginx-1.19.2.tar.gz
md5sum = 3dc55f6451ed6f819f1c796f4e5e9617 md5sum = 3dc55f6451ed6f819f1c796f4e5e9617
[nginx] [nginx]
<= nginx-common <= nginx-common
shared = true
configure-options= configure-options=
--with-http_ssl_module --with-http_ssl_module
--with-http_v2_module --with-http_v2_module
...@@ -32,10 +29,10 @@ configure-options= ...@@ -32,10 +29,10 @@ configure-options=
[nginx-dav-ext-module] [nginx-dav-ext-module]
recipe = slapos.recipe.build:download-unpacked recipe = slapos.recipe.build:download-unpacked
shared = true
url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz url = https://github.com/arut/nginx-dav-ext-module/archive/v0.0.3.tar.gz
strip-top-level-dir = true strip-top-level-dir = true
md5sum = 2cb502dbda335be4ebd5fed0b3182bae md5sum = 2cb502dbda335be4ebd5fed0b3182bae
mode = 0644
[nginx-webdav] [nginx-webdav]
<= nginx-common <= nginx-common
...@@ -61,29 +58,11 @@ command = ${coreutils-output:test} -x ${:nginx} -a -f ${:mime} ...@@ -61,29 +58,11 @@ command = ${coreutils-output:test} -x ${:nginx} -a -f ${:mime}
nginx = ${nginx:location}/sbin/nginx nginx = ${nginx:location}/sbin/nginx
mime = ${nginx:location}/conf/mime.types mime = ${nginx:location}/conf/mime.types
[hexaglobe-nginx-module]
recipe = hexagonit.recipe.download
ignore-existing = true
url = http://easicloud-p.cdn.hexaglobe.net/nginx-easicloud.tar.gz
md5sum = 57fe2ceb09740f22b5b1023f29889e0e
strip-top-level-dir = true
[nginx-enable-sub]
# Used by Hexaglobe for watermarking
<= nginx
configure-options=
--with-ipv6
--with-http_ssl_module
--with-ld-opt="-L ${zlib:location}/lib -L ${openssl:location}/lib -L ${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${openssl:location}/lib"
--with-cc-opt="-I ${pcre:location}/include -I ${openssl:location}/include -I ${zlib:location}/include"
--add-module=${hexaglobe-nginx-module:location}/sub_module
# --add-module=${hexaglobe-nginx-module:location}/nginx-upstream-fair
[nginx-push-stream-module] [nginx-push-stream-module]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:download-unpacked
repository = https://github.com/wandenberg/nginx-push-stream-module.git shared = true
revision = 3d3a204177d3a7ab8a2858e04e792a6d11bf133f url = https://github.com/wandenberg/nginx-push-stream-module/archive/0.4.0.tar.gz
git-executable = ${git:location}/bin/git md5sum = d9cba621b8739e13bdb5e02b9425f205
[nginx-push-stream] [nginx-push-stream]
<= nginx-common <= nginx-common
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment