From 6c5e5f25ef74dbf4d3dc524e293863fad7fcf524 Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Fri, 5 Oct 2018 14:10:13 +0300 Subject: Packages: all CRLF newlines in examples converted to LF. --- pkg/deb/debian.module/unit.example-go-config | 30 +++---- pkg/deb/debian.module/unit.example-go1.10-config | 30 +++---- pkg/deb/debian.module/unit.example-go1.7-config | 30 +++---- pkg/deb/debian.module/unit.example-go1.8-config | 30 +++---- pkg/deb/debian.module/unit.example-go1.9-config | 30 +++---- pkg/deb/debian/unit.example.config | 102 +++++++++++------------ 6 files changed, 126 insertions(+), 126 deletions(-) (limited to 'pkg/deb') diff --git a/pkg/deb/debian.module/unit.example-go-config b/pkg/deb/debian.module/unit.example-go-config index 6ee4d001..d6a2a8a0 100644 --- a/pkg/deb/debian.module/unit.example-go-config +++ b/pkg/deb/debian.module/unit.example-go-config @@ -1,15 +1,15 @@ -{ - "applications": { - "example_go": { - "type": "go", - "user": "nobody", - "executable": "/tmp/go-app" - } - }, - - "listeners": { - "*:8500": { - "application": "example_go" - } - } -} +{ + "applications": { + "example_go": { + "type": "go", + "user": "nobody", + "executable": "/tmp/go-app" + } + }, + + "listeners": { + "*:8500": { + "application": "example_go" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-go1.10-config b/pkg/deb/debian.module/unit.example-go1.10-config index 68733256..262eae29 100644 --- a/pkg/deb/debian.module/unit.example-go1.10-config +++ b/pkg/deb/debian.module/unit.example-go1.10-config @@ -1,15 +1,15 @@ -{ - "applications": { - "example_go": { - "type": "go", - "user": "nobody", - "executable": "/tmp/go1.10-app" - } - }, - - "listeners": { - "*:8500": { - "application": "example_go" - } - } -} +{ + "applications": { + "example_go": { + "type": "go", + "user": "nobody", + "executable": "/tmp/go1.10-app" + } + }, + + "listeners": { + "*:8500": { + "application": "example_go" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-go1.7-config b/pkg/deb/debian.module/unit.example-go1.7-config index 1b1943e0..62489959 100644 --- a/pkg/deb/debian.module/unit.example-go1.7-config +++ b/pkg/deb/debian.module/unit.example-go1.7-config @@ -1,15 +1,15 @@ -{ - "applications": { - "example_go": { - "type": "go", - "user": "nobody", - "executable": "/tmp/go1.7-app" - } - }, - - "listeners": { - "*:8500": { - "application": "example_go" - } - } -} +{ + "applications": { + "example_go": { + "type": "go", + "user": "nobody", + "executable": "/tmp/go1.7-app" + } + }, + + "listeners": { + "*:8500": { + "application": "example_go" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-go1.8-config b/pkg/deb/debian.module/unit.example-go1.8-config index 6cfa0cec..551ec24e 100644 --- a/pkg/deb/debian.module/unit.example-go1.8-config +++ b/pkg/deb/debian.module/unit.example-go1.8-config @@ -1,15 +1,15 @@ -{ - "applications": { - "example_go": { - "type": "go", - "user": "nobody", - "executable": "/tmp/go1.8-app" - } - }, - - "listeners": { - "*:8500": { - "application": "example_go" - } - } -} +{ + "applications": { + "example_go": { + "type": "go", + "user": "nobody", + "executable": "/tmp/go1.8-app" + } + }, + + "listeners": { + "*:8500": { + "application": "example_go" + } + } +} diff --git a/pkg/deb/debian.module/unit.example-go1.9-config b/pkg/deb/debian.module/unit.example-go1.9-config index 4074df3b..ab026fb3 100644 --- a/pkg/deb/debian.module/unit.example-go1.9-config +++ b/pkg/deb/debian.module/unit.example-go1.9-config @@ -1,15 +1,15 @@ -{ - "applications": { - "example_go": { - "type": "go", - "user": "nobody", - "executable": "/tmp/go1.9-app" - } - }, - - "listeners": { - "*:8500": { - "application": "example_go" - } - } -} +{ + "applications": { + "example_go": { + "type": "go", + "user": "nobody", + "executable": "/tmp/go1.9-app" + } + }, + + "listeners": { + "*:8500": { + "application": "example_go" + } + } +} diff --git a/pkg/deb/debian/unit.example.config b/pkg/deb/debian/unit.example.config index f3126457..a4396a58 100644 --- a/pkg/deb/debian/unit.example.config +++ b/pkg/deb/debian/unit.example.config @@ -1,51 +1,51 @@ -{ - "applications": { - "example_php": { - "type": "php", - "user": "nobody", - "processes": 2, - "root": "/usr/share/doc/unit/examples/php-app", - "index": "index.php" - }, - - "example_python": { - "type": "python", - "user": "nobody", - "processes": 2, - "path": "/usr/share/doc/unit/examples/python-app", - "module": "wsgi" - }, - - "example_go": { - "type": "go", - "user": "nobody", - "executable": "/tmp/go-app" - }, - - "example_perl": { - "type": "perl", - "user": "nobody", - "processes": 1, - "working_directory": "/usr/share/doc/unit-perl/examples/perl-app", - "script": "/usr/share/doc/unit-perl/examples/perl-app/index.pl" - } - }, - - "listeners": { - "*:8300": { - "application": "example_php" - }, - - "*:8400": { - "application": "example_python" - }, - - "*:8500": { - "application": "example_go" - }, - - "*:8600": { - "application": "example_perl" - } - } -} +{ + "applications": { + "example_php": { + "type": "php", + "user": "nobody", + "processes": 2, + "root": "/usr/share/doc/unit/examples/php-app", + "index": "index.php" + }, + + "example_python": { + "type": "python", + "user": "nobody", + "processes": 2, + "path": "/usr/share/doc/unit/examples/python-app", + "module": "wsgi" + }, + + "example_go": { + "type": "go", + "user": "nobody", + "executable": "/tmp/go-app" + }, + + "example_perl": { + "type": "perl", + "user": "nobody", + "processes": 1, + "working_directory": "/usr/share/doc/unit-perl/examples/perl-app", + "script": "/usr/share/doc/unit-perl/examples/perl-app/index.pl" + } + }, + + "listeners": { + "*:8300": { + "application": "example_php" + }, + + "*:8400": { + "application": "example_python" + }, + + "*:8500": { + "application": "example_go" + }, + + "*:8600": { + "application": "example_perl" + } + } +} -- cgit From 029c1a9f509b2af60e02d74ef982fda1346d85e0 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Tue, 9 Oct 2018 17:53:31 +0300 Subject: Renamed "go" application type to "external". There's nothing specific to Go language. This type of application object can be used to run any external application that utilizes libunit API. --- pkg/deb/debian.module/unit.example-go-config | 2 +- pkg/deb/debian.module/unit.example-go1.10-config | 2 +- pkg/deb/debian.module/unit.example-go1.7-config | 2 +- pkg/deb/debian.module/unit.example-go1.8-config | 2 +- pkg/deb/debian.module/unit.example-go1.9-config | 2 +- pkg/deb/debian/unit.example.config | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkg/deb') diff --git a/pkg/deb/debian.module/unit.example-go-config b/pkg/deb/debian.module/unit.example-go-config index d6a2a8a0..079ce0b8 100644 --- a/pkg/deb/debian.module/unit.example-go-config +++ b/pkg/deb/debian.module/unit.example-go-config @@ -1,7 +1,7 @@ { "applications": { "example_go": { - "type": "go", + "type": "external", "user": "nobody", "executable": "/tmp/go-app" } diff --git a/pkg/deb/debian.module/unit.example-go1.10-config b/pkg/deb/debian.module/unit.example-go1.10-config index 262eae29..29bb9059 100644 --- a/pkg/deb/debian.module/unit.example-go1.10-config +++ b/pkg/deb/debian.module/unit.example-go1.10-config @@ -1,7 +1,7 @@ { "applications": { "example_go": { - "type": "go", + "type": "external", "user": "nobody", "executable": "/tmp/go1.10-app" } diff --git a/pkg/deb/debian.module/unit.example-go1.7-config b/pkg/deb/debian.module/unit.example-go1.7-config index 62489959..bd98fe3a 100644 --- a/pkg/deb/debian.module/unit.example-go1.7-config +++ b/pkg/deb/debian.module/unit.example-go1.7-config @@ -1,7 +1,7 @@ { "applications": { "example_go": { - "type": "go", + "type": "external", "user": "nobody", "executable": "/tmp/go1.7-app" } diff --git a/pkg/deb/debian.module/unit.example-go1.8-config b/pkg/deb/debian.module/unit.example-go1.8-config index 551ec24e..1c14ca25 100644 --- a/pkg/deb/debian.module/unit.example-go1.8-config +++ b/pkg/deb/debian.module/unit.example-go1.8-config @@ -1,7 +1,7 @@ { "applications": { "example_go": { - "type": "go", + "type": "external", "user": "nobody", "executable": "/tmp/go1.8-app" } diff --git a/pkg/deb/debian.module/unit.example-go1.9-config b/pkg/deb/debian.module/unit.example-go1.9-config index ab026fb3..341894b7 100644 --- a/pkg/deb/debian.module/unit.example-go1.9-config +++ b/pkg/deb/debian.module/unit.example-go1.9-config @@ -1,7 +1,7 @@ { "applications": { "example_go": { - "type": "go", + "type": "external", "user": "nobody", "executable": "/tmp/go1.9-app" } diff --git a/pkg/deb/debian/unit.example.config b/pkg/deb/debian/unit.example.config index a4396a58..8d86acbe 100644 --- a/pkg/deb/debian/unit.example.config +++ b/pkg/deb/debian/unit.example.config @@ -17,7 +17,7 @@ }, "example_go": { - "type": "go", + "type": "external", "user": "nobody", "executable": "/tmp/go-app" }, -- cgit From 0e76769c1be43fed1ad1ce32c90ca56b84af903a Mon Sep 17 00:00:00 2001 From: Andrei Belov Date: Tue, 23 Oct 2018 10:30:28 +0300 Subject: Packages: introduced unit-dev/unit-devel package. --- pkg/deb/debian/control | 8 ++++++++ pkg/deb/debian/rules.in | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'pkg/deb') diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control index e1b1bde8..c0873a1c 100644 --- a/pkg/deb/debian/control +++ b/pkg/deb/debian/control @@ -29,3 +29,11 @@ Depends: unit (= ${binary:Version}), ${misc:Depends} Description: NGINX Unit (debug symbols) This package contains the debugging symbols for NGINX Unit. + +Package: unit-dev +Section: libdevel +Priority: optional +Architecture: any +Depends: ${misc:Depends} +Description: NGINX Unit (development files) + Library and include files required for NGINX Unit modules development. diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in index a9f68189..7eab391d 100644 --- a/pkg/deb/debian/rules.in +++ b/pkg/deb/debian/rules.in @@ -9,9 +9,12 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -pie DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + BUILDDIR_unit = $(CURDIR)/debian/build-unit BUILDDIR_unit_debug = $(CURDIR)/debian/build-unit-debug INSTALLDIR = $(CURDIR)/debian/unit +INSTALLDIR_dev = $(CURDIR)/debian/unit-dev BASEDIR = $(CURDIR) DOTESTS = 0 @@ -30,6 +33,7 @@ configure.unit: config.env.unit CFLAGS= ./configure \ %%CONFIGURE_ARGS%% \ --modules=/usr/lib/unit/modules \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --cc-opt="$(CFLAGS)" \ --ld-opt="$(LDFLAGS)" touch $@ @@ -39,6 +43,7 @@ configure.unit_debug: config.env.unit_debug CFLAGS= ./configure \ %%CONFIGURE_ARGS%% \ --modules=/usr/lib/unit/debug-modules \ + --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ --cc-opt="$(CFLAGS)" \ --ld-opt="$(LDFLAGS)" \ --debug @@ -47,6 +52,7 @@ configure.unit_debug: config.env.unit_debug build-arch.%: configure.% dh_testdir $(MAKE) -C $(BUILDDIR_$*) + $(MAKE) -C $(BUILDDIR_$*) build/libunit.a ifeq ($(DOTESTS), 1) $(MAKE) -C $(BUILDDIR_$*) tests endif @@ -86,7 +92,9 @@ install: build do.tests dh_installinit dh_installlogrotate cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR) make install + cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR_dev) make libunit-install install -m 755 $(BUILDDIR_unit_debug)/build/unitd $(INSTALLDIR)/usr/sbin/unitd-debug + install -m 644 $(BUILDDIR_unit_debug)/build/libunit.a $(INSTALLDIR_dev)/usr/lib/$(DEB_HOST_MULTIARCH)/libunit-debug.a mkdir -p $(INSTALLDIR)/usr/share/doc/unit/examples install -m 644 debian/unit.example.config $(INSTALLDIR)/usr/share/doc/unit/examples/example.config install -m 644 CHANGES $(INSTALLDIR)/usr/share/doc/unit/ -- cgit From d55282105a69bd3c9e2b10787ea4561dbe7d8057 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Thu, 25 Oct 2018 17:49:10 +0300 Subject: Packages: updated to 1.5-1. --- pkg/deb/Makefile | 2 +- pkg/deb/Makefile.go | 2 +- pkg/deb/Makefile.go110 | 2 +- pkg/deb/Makefile.go17 | 2 +- pkg/deb/Makefile.go18 | 2 +- pkg/deb/Makefile.go19 | 2 +- pkg/deb/Makefile.perl | 2 +- pkg/deb/Makefile.php | 2 +- pkg/deb/Makefile.python | 2 +- pkg/deb/Makefile.python27 | 2 +- pkg/deb/Makefile.python34 | 2 +- pkg/deb/Makefile.python35 | 2 +- pkg/deb/Makefile.python36 | 2 +- pkg/deb/Makefile.ruby | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'pkg/deb') diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile index 6ed1c94a..735f283b 100644 --- a/pkg/deb/Makefile +++ b/pkg/deb/Makefile @@ -3,7 +3,7 @@ DEFAULT_VERSION := $(shell grep 'define NXT_VERSION' ../../src/nxt_main.h \ | sed -e 's/^.*"\(.*\)".*/\1/') -DEFAULT_RELEASE := 2 +DEFAULT_RELEASE := 1 VERSION ?= $(DEFAULT_VERSION) RELEASE ?= $(DEFAULT_RELEASE) diff --git a/pkg/deb/Makefile.go b/pkg/deb/Makefile.go index 66792a55..2d7d6537 100644 --- a/pkg/deb/Makefile.go +++ b/pkg/deb/Makefile.go @@ -4,7 +4,7 @@ MODULE_SUFFIX_go= go MODULE_SUMMARY_go= Go module for NGINX Unit MODULE_VERSION_go= $(VERSION) -MODULE_RELEASE_go= 2 +MODULE_RELEASE_go= 1 MODULE_CONFARGS_go= go --go-path=/usr/share/gocode MODULE_MAKEARGS_go= go diff --git a/pkg/deb/Makefile.go110 b/pkg/deb/Makefile.go110 index e4883af4..863f7c90 100644 --- a/pkg/deb/Makefile.go110 +++ b/pkg/deb/Makefile.go110 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go110= go1.10 MODULE_SUMMARY_go110= Go 1.10 module for NGINX Unit MODULE_VERSION_go110= $(VERSION) -MODULE_RELEASE_go110= 2 +MODULE_RELEASE_go110= 1 MODULE_CONFARGS_go110= go --go=/usr/lib/go-1.10/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go110= /usr/lib/go-1.10/bin/go diff --git a/pkg/deb/Makefile.go17 b/pkg/deb/Makefile.go17 index 74084b49..201b32b2 100644 --- a/pkg/deb/Makefile.go17 +++ b/pkg/deb/Makefile.go17 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go17= go1.7 MODULE_SUMMARY_go17= Go 1.7 module for NGINX Unit MODULE_VERSION_go17= $(VERSION) -MODULE_RELEASE_go17= 2 +MODULE_RELEASE_go17= 1 MODULE_CONFARGS_go17= go --go=/usr/lib/go-1.7/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go17= /usr/lib/go-1.7/bin/go diff --git a/pkg/deb/Makefile.go18 b/pkg/deb/Makefile.go18 index aaaae40d..70b155d4 100644 --- a/pkg/deb/Makefile.go18 +++ b/pkg/deb/Makefile.go18 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go18= go1.8 MODULE_SUMMARY_go18= Go 1.8 module for NGINX Unit MODULE_VERSION_go18= $(VERSION) -MODULE_RELEASE_go18= 2 +MODULE_RELEASE_go18= 1 MODULE_CONFARGS_go18= go --go=/usr/lib/go-1.8/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go18= /usr/lib/go-1.8/bin/go diff --git a/pkg/deb/Makefile.go19 b/pkg/deb/Makefile.go19 index aef41844..9ddcc493 100644 --- a/pkg/deb/Makefile.go19 +++ b/pkg/deb/Makefile.go19 @@ -4,7 +4,7 @@ MODULE_SUFFIX_go19= go1.9 MODULE_SUMMARY_go19= Go 1.9 module for NGINX Unit MODULE_VERSION_go19= $(VERSION) -MODULE_RELEASE_go19= 2 +MODULE_RELEASE_go19= 1 MODULE_CONFARGS_go19= go --go=/usr/lib/go-1.9/bin/go --go-path=/usr/share/gocode MODULE_MAKEARGS_go19= /usr/lib/go-1.9/bin/go diff --git a/pkg/deb/Makefile.perl b/pkg/deb/Makefile.perl index 31aa976a..186b8e5a 100644 --- a/pkg/deb/Makefile.perl +++ b/pkg/deb/Makefile.perl @@ -4,7 +4,7 @@ MODULE_SUFFIX_perl= perl MODULE_SUMMARY_perl= Perl module for NGINX Unit MODULE_VERSION_perl= $(VERSION) -MODULE_RELEASE_perl= 2 +MODULE_RELEASE_perl= 1 MODULE_CONFARGS_perl= perl MODULE_MAKEARGS_perl= perl diff --git a/pkg/deb/Makefile.php b/pkg/deb/Makefile.php index 4f76e13d..193670e7 100644 --- a/pkg/deb/Makefile.php +++ b/pkg/deb/Makefile.php @@ -4,7 +4,7 @@ MODULE_SUFFIX_php= php MODULE_SUMMARY_php= PHP module for NGINX Unit MODULE_VERSION_php= $(VERSION) -MODULE_RELEASE_php= 2 +MODULE_RELEASE_php= 1 MODULE_CONFARGS_php= php MODULE_MAKEARGS_php= php diff --git a/pkg/deb/Makefile.python b/pkg/deb/Makefile.python index d4822c84..dec64b26 100644 --- a/pkg/deb/Makefile.python +++ b/pkg/deb/Makefile.python @@ -4,7 +4,7 @@ MODULE_SUFFIX_python= python MODULE_SUMMARY_python= Python module for NGINX Unit MODULE_VERSION_python= $(VERSION) -MODULE_RELEASE_python= 2 +MODULE_RELEASE_python= 1 MODULE_CONFARGS_python= python MODULE_MAKEARGS_python= python diff --git a/pkg/deb/Makefile.python27 b/pkg/deb/Makefile.python27 index d9dee872..ae1ae4c0 100644 --- a/pkg/deb/Makefile.python27 +++ b/pkg/deb/Makefile.python27 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python27= python2.7 MODULE_SUMMARY_python27= Python 2.7 module for NGINX Unit MODULE_VERSION_python27= $(VERSION) -MODULE_RELEASE_python27= 2 +MODULE_RELEASE_python27= 1 MODULE_CONFARGS_python27= python --config=python2.7-config MODULE_MAKEARGS_python27= python2.7 diff --git a/pkg/deb/Makefile.python34 b/pkg/deb/Makefile.python34 index 7a9db98a..5e043ef4 100644 --- a/pkg/deb/Makefile.python34 +++ b/pkg/deb/Makefile.python34 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python34= python3.4 MODULE_SUMMARY_python34= Python 3.4 module for NGINX Unit MODULE_VERSION_python34= $(VERSION) -MODULE_RELEASE_python34= 2 +MODULE_RELEASE_python34= 1 MODULE_CONFARGS_python34= python --config=python3.4-config MODULE_MAKEARGS_python34= python3.4 diff --git a/pkg/deb/Makefile.python35 b/pkg/deb/Makefile.python35 index 60256680..557690a9 100644 --- a/pkg/deb/Makefile.python35 +++ b/pkg/deb/Makefile.python35 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python35= python3.5 MODULE_SUMMARY_python35= Python 3.5 module for NGINX Unit MODULE_VERSION_python35= $(VERSION) -MODULE_RELEASE_python35= 2 +MODULE_RELEASE_python35= 1 MODULE_CONFARGS_python35= python --config=python3.5-config MODULE_MAKEARGS_python35= python3.5 diff --git a/pkg/deb/Makefile.python36 b/pkg/deb/Makefile.python36 index 5f912ac1..07cbba90 100644 --- a/pkg/deb/Makefile.python36 +++ b/pkg/deb/Makefile.python36 @@ -4,7 +4,7 @@ MODULE_SUFFIX_python36= python3.6 MODULE_SUMMARY_python36= Python 3.6 module for NGINX Unit MODULE_VERSION_python36= $(VERSION) -MODULE_RELEASE_python36= 2 +MODULE_RELEASE_python36= 1 MODULE_CONFARGS_python36= python --config=python3.6-config MODULE_MAKEARGS_python36= python3.6 diff --git a/pkg/deb/Makefile.ruby b/pkg/deb/Makefile.ruby index 48ac4ede..1cb6baab 100644 --- a/pkg/deb/Makefile.ruby +++ b/pkg/deb/Makefile.ruby @@ -4,7 +4,7 @@ MODULE_SUFFIX_ruby= ruby MODULE_SUMMARY_ruby= Ruby module for NGINX Unit MODULE_VERSION_ruby= $(VERSION) -MODULE_RELEASE_ruby= 2 +MODULE_RELEASE_ruby= 1 MODULE_CONFARGS_ruby= ruby MODULE_MAKEARGS_ruby= ruby -- cgit