summaryrefslogtreecommitdiffhomepage
path: root/pkg/deb
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--pkg/deb/Makefile10
-rw-r--r--pkg/deb/debian.module/control.in4
-rw-r--r--pkg/deb/debian.module/unit.example-go-config1
-rw-r--r--pkg/deb/debian.module/unit.example-perl-config1
-rw-r--r--pkg/deb/debian.module/unit.example-php-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python2.7-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python3.4-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python3.5-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python3.6-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python3.7-config1
-rw-r--r--pkg/deb/debian.module/unit.example-python3.8-config1
-rw-r--r--pkg/deb/debian.module/unit.example-ruby-config1
-rw-r--r--pkg/deb/debian/control3
-rw-r--r--pkg/deb/debian/copyright16
-rw-r--r--pkg/deb/debian/rules.in8
-rw-r--r--pkg/deb/debian/unit.example.config4
-rwxr-xr-xpkg/deb/debian/unit.postinst34
-rw-r--r--pkg/deb/debian/unit.preinst1
19 files changed, 62 insertions, 29 deletions
diff --git a/pkg/deb/Makefile b/pkg/deb/Makefile
index 8a02105c..16e73b94 100644
--- a/pkg/deb/Makefile
+++ b/pkg/deb/Makefile
@@ -2,9 +2,10 @@
include ../../version
+DEFAULT_VERSION := $(NXT_VERSION)
DEFAULT_RELEASE := 1
-VERSION ?= $(NXT_VERSION)
+VERSION ?= $(DEFAULT_VERSION)
RELEASE ?= $(DEFAULT_RELEASE)
SRCDIR= unit-$(VERSION)
@@ -157,6 +158,8 @@ CONFIGURE_ARGS=\
--pid=/var/run/unit.pid \
--log=/var/log/unit.log \
--tmp=/var/tmp \
+ --user=unit \
+ --group=unit \
--tests \
--openssl
@@ -205,6 +208,7 @@ debuild/$(SRCDIR)/debian:
cat debian/rules.in | sed \
-e "s#%%CONFIGURE_ARGS%%#$(CONFIGURE_ARGS)#g" \
> debuild/$(SRCDIR)/debian/rules ; \
+ chmod +x debuild/$(SRCDIR)/debian/rules ; \
}
debuild/$(SRCDIR)/debian/changelog: ../../docs/changes.xml | debuild/$(SRCDIR)/debian
@@ -314,7 +318,7 @@ test: unit modules
test -h debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} || \
ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit/build/$${soname} ; \
done ; \
- ( cd debuild/unit-$(VERSION)/debian/build-unit && env python3 -m pytest ) ; \
+ ( cd debuild/unit-$(VERSION)/debian/build-unit && env python3 -m pytest --user=nobody $(PYTEST_ARGS) ) ; \
}
test-debug: unit modules
@@ -325,7 +329,7 @@ test-debug: unit modules
test -h debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} || \
ln -fs `pwd`/$${so} debuild/unit-$(VERSION)/debian/build-unit-debug/build/$${soname} ; \
done ; \
- ( cd debuild/unit-$(VERSION)/debian/build-unit-debug && env python3 -m pytest ) ; \
+ ( cd debuild/unit-$(VERSION)/debian/build-unit-debug && env python3 -m pytest --user=nobody $(PYTEST_ARGS) ) ; \
}
clean:
diff --git a/pkg/deb/debian.module/control.in b/pkg/deb/debian.module/control.in
index e9b8b8e2..7e28f5e9 100644
--- a/pkg/deb/debian.module/control.in
+++ b/pkg/deb/debian.module/control.in
@@ -3,7 +3,9 @@ Section: admin
Priority: extra
Maintainer: Andrei Belov <defan@nginx.com>
Build-Depends: debhelper (>= 9),
- linux-libc-dev%%MODULE_BUILD_DEPENDS%%
+ linux-libc-dev,
+ libssl-dev,
+ libpcre2-dev%%MODULE_BUILD_DEPENDS%%
Standards-Version: 3.9.5
Homepage: https://unit.nginx.org
diff --git a/pkg/deb/debian.module/unit.example-go-config b/pkg/deb/debian.module/unit.example-go-config
index a2c91e80..8aa65939 100644
--- a/pkg/deb/debian.module/unit.example-go-config
+++ b/pkg/deb/debian.module/unit.example-go-config
@@ -2,7 +2,6 @@
"applications": {
"example_go": {
"type": "external",
- "user": "nobody",
"executable": "/tmp/go-app"
}
},
diff --git a/pkg/deb/debian.module/unit.example-perl-config b/pkg/deb/debian.module/unit.example-perl-config
index 031928ce..2182fc46 100644
--- a/pkg/deb/debian.module/unit.example-perl-config
+++ b/pkg/deb/debian.module/unit.example-perl-config
@@ -2,7 +2,6 @@
"applications": {
"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"
diff --git a/pkg/deb/debian.module/unit.example-php-config b/pkg/deb/debian.module/unit.example-php-config
index 8f23c984..9673385f 100644
--- a/pkg/deb/debian.module/unit.example-php-config
+++ b/pkg/deb/debian.module/unit.example-php-config
@@ -2,7 +2,6 @@
"applications": {
"example_php": {
"type": "php",
- "user": "nobody",
"processes": 2,
"root": "/usr/share/doc/unit-php/examples/phpinfo-app",
"index": "index.php"
diff --git a/pkg/deb/debian.module/unit.example-python-config b/pkg/deb/debian.module/unit.example-python-config
index d612c89d..b3d3a2e5 100644
--- a/pkg/deb/debian.module/unit.example-python-config
+++ b/pkg/deb/debian.module/unit.example-python-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-python2.7-config b/pkg/deb/debian.module/unit.example-python2.7-config
index bede8899..4f1d16c9 100644
--- a/pkg/deb/debian.module/unit.example-python2.7-config
+++ b/pkg/deb/debian.module/unit.example-python2.7-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python 2.7",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python2.7/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-python3.4-config b/pkg/deb/debian.module/unit.example-python3.4-config
index dd496bd8..e6d90acf 100644
--- a/pkg/deb/debian.module/unit.example-python3.4-config
+++ b/pkg/deb/debian.module/unit.example-python3.4-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python 3.4",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python3.4/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-python3.5-config b/pkg/deb/debian.module/unit.example-python3.5-config
index 2be6de4a..480327ec 100644
--- a/pkg/deb/debian.module/unit.example-python3.5-config
+++ b/pkg/deb/debian.module/unit.example-python3.5-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python 3.5",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python3.5/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-python3.6-config b/pkg/deb/debian.module/unit.example-python3.6-config
index a77e8e07..543024ff 100644
--- a/pkg/deb/debian.module/unit.example-python3.6-config
+++ b/pkg/deb/debian.module/unit.example-python3.6-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python 3.6",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python3.6/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-python3.7-config b/pkg/deb/debian.module/unit.example-python3.7-config
index 9b13c058..e7b8dbc3 100644
--- a/pkg/deb/debian.module/unit.example-python3.7-config
+++ b/pkg/deb/debian.module/unit.example-python3.7-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python 3.7",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python3.7/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-python3.8-config b/pkg/deb/debian.module/unit.example-python3.8-config
index 435e025f..dc649e30 100644
--- a/pkg/deb/debian.module/unit.example-python3.8-config
+++ b/pkg/deb/debian.module/unit.example-python3.8-config
@@ -2,7 +2,6 @@
"applications": {
"example_python": {
"type": "python 3.8",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit-python3.8/examples/python-app",
"module": "wsgi"
diff --git a/pkg/deb/debian.module/unit.example-ruby-config b/pkg/deb/debian.module/unit.example-ruby-config
index 15a92735..930aa987 100644
--- a/pkg/deb/debian.module/unit.example-ruby-config
+++ b/pkg/deb/debian.module/unit.example-ruby-config
@@ -2,7 +2,6 @@
"applications": {
"example_ruby": {
"type": "ruby",
- "user": "nobody",
"processes": 2,
"script": "/usr/share/doc/unit-ruby/examples/ruby-app.ru"
}
diff --git a/pkg/deb/debian/control b/pkg/deb/debian/control
index 9828b6ab..a8e8cdc4 100644
--- a/pkg/deb/debian/control
+++ b/pkg/deb/debian/control
@@ -4,7 +4,8 @@ Priority: extra
Maintainer: Andrei Belov <defan@nginx.com>
Build-Depends: debhelper (>= 9),
linux-libc-dev,
- libssl-dev
+ libssl-dev,
+ libpcre2-dev
Standards-Version: 3.9.5
Homepage: https://unit.nginx.org
diff --git a/pkg/deb/debian/copyright b/pkg/deb/debian/copyright
index 2acb87b9..2a2c5fd0 100644
--- a/pkg/deb/debian/copyright
+++ b/pkg/deb/debian/copyright
@@ -1,14 +1,14 @@
NGINX Unit.
- Copyright 2017-2020 NGINX, Inc.
- Copyright 2017-2020 Igor Sysoev
- Copyright 2017-2020 Valentin V. Bartenev
- Copyright 2017-2020 Max Romanov
- Copyright 2017-2020 Andrei Zeliankou
- Copyright 2017-2020 Andrei Belov
- Copyright 2018-2020 Konstantin Pavlov
- Copyright 2019-2020 Tiago Natel de Moura
+ Copyright 2017-2021 NGINX, Inc.
+ Copyright 2017-2021 Igor Sysoev
+ Copyright 2017-2021 Valentin V. Bartenev
+ Copyright 2017-2021 Max Romanov
+ Copyright 2017-2021 Andrei Zeliankou
+ Copyright 2017-2021 Andrei Belov
+ Copyright 2018-2021 Konstantin Pavlov
+ Copyright 2019-2021 Tiago Natel de Moura
Copyright 2019-2020 Axel Duch
Copyright 2018-2019 Alexander Borisov
diff --git a/pkg/deb/debian/rules.in b/pkg/deb/debian/rules.in
index a4696793..aa7921d1 100644
--- a/pkg/deb/debian/rules.in
+++ b/pkg/deb/debian/rules.in
@@ -10,6 +10,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+CODENAME := $(shell lsb_release -cs)
BUILDDIR_unit = $(CURDIR)/debian/build-unit
BUILDDIR_unit_debug = $(CURDIR)/debian/build-unit-debug
@@ -96,7 +97,11 @@ install: build do.tests
dh_testroot
dh_prep
dh_installdirs
+ifeq ($(CODENAME), xenial)
dh_installinit
+else
+ dh_installsystemd
+endif
dh_installlogrotate
cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR) make install
cd $(BUILDDIR_unit) && DESTDIR=$(INSTALLDIR_dev) make libunit-install
@@ -104,8 +109,9 @@ install: build do.tests
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/
+ install -m 644 CHANGES $(INSTALLDIR)/usr/share/doc/unit/changelog
install -m 644 README $(INSTALLDIR)/usr/share/doc/unit/
+ install -m 644 NOTICE $(INSTALLDIR)/usr/share/doc/unit/
binary-indep: build install
dh_testdir
diff --git a/pkg/deb/debian/unit.example.config b/pkg/deb/debian/unit.example.config
index 5610cb3a..66695327 100644
--- a/pkg/deb/debian/unit.example.config
+++ b/pkg/deb/debian/unit.example.config
@@ -2,7 +2,6 @@
"applications": {
"example_php": {
"type": "php",
- "user": "nobody",
"processes": 2,
"root": "/usr/share/doc/unit/examples/php-app",
"index": "index.php"
@@ -10,7 +9,6 @@
"example_python": {
"type": "python",
- "user": "nobody",
"processes": 2,
"path": "/usr/share/doc/unit/examples/python-app",
"module": "wsgi"
@@ -18,13 +16,11 @@
"example_go": {
"type": "external",
- "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"
diff --git a/pkg/deb/debian/unit.postinst b/pkg/deb/debian/unit.postinst
index 76375a2b..8aa476b3 100755
--- a/pkg/deb/debian/unit.postinst
+++ b/pkg/deb/debian/unit.postinst
@@ -6,6 +6,40 @@ if [ "$1" != "configure" ]; then
exit 0
fi
+if [ -n "$2" ]; then
+ if dpkg --compare-versions "${2%%-*}" le "1.21.0"; then
+ cat <<BANNER
+----------------------------------------------------------------------
+
+WARNING:
+
+Since version 1.22.0, Unit's non-privileged processes run as unit:unit by
+default. Review your system permissions and Unit configuration so apps and
+routes that relied on these processes running as nobody:nogroup stay working.
+
+More info: https://unit.nginx.org/installation/#official-packages
+
+----------------------------------------------------------------------
+BANNER
+ fi
+fi
+
+if ! getent group unit >/dev/null; then
+ addgroup --system unit >/dev/null
+fi
+
+if ! getent passwd unit >/dev/null; then
+ adduser \
+ --system \
+ --disabled-login \
+ --ingroup unit \
+ --no-create-home \
+ --home /nonexistent \
+ --gecos "unit user" \
+ --shell /bin/false \
+ unit >/dev/null
+fi
+
#DEBHELPER#
exit 0
diff --git a/pkg/deb/debian/unit.preinst b/pkg/deb/debian/unit.preinst
index d4be468d..bd513788 100644
--- a/pkg/deb/debian/unit.preinst
+++ b/pkg/deb/debian/unit.preinst
@@ -17,6 +17,7 @@ Online documentation is available at https://unit.nginx.org/
----------------------------------------------------------------------
BANNER
;;
+
upgrade)
;;
generated by cgit (git 2.34.1) at 2025-01-10 20:57:53 +0000