summaryrefslogtreecommitdiffhomepage
path: root/pkg
diff options
context:
space:
mode:
authorAndrei Belov <defan@nginx.com>2019-08-22 21:33:54 +0300
committerAndrei Belov <defan@nginx.com>2019-08-22 21:33:54 +0300
commita07c4d30a64f781f93730576b5dced32422a9935 (patch)
tree06ebfaa66845a057b8069014c5379b2dcfc80861 /pkg
parent8a579acddeae0c0106e15d82aa7220ac01deba84 (diff)
parentc47af243b0e805376c4ec908f21e07dc811b33f0 (diff)
downloadunit-a07c4d30a64f781f93730576b5dced32422a9935.tar.gz
unit-a07c4d30a64f781f93730576b5dced32422a9935.tar.bz2
Merged with the default branch.1.10.0-1
Diffstat (limited to '')
-rw-r--r--pkg/deb/debian/unit.default2
-rw-r--r--pkg/deb/debian/unit.init2
-rw-r--r--pkg/deb/debian/unit.service2
-rw-r--r--pkg/docker/Dockerfile.full2
-rw-r--r--pkg/docker/Dockerfile.go1.7-dev2
-rw-r--r--pkg/docker/Dockerfile.go1.8-dev2
-rw-r--r--pkg/docker/Dockerfile.minimal2
-rw-r--r--pkg/docker/Dockerfile.perl5.242
-rw-r--r--pkg/docker/Dockerfile.php7.02
-rw-r--r--pkg/docker/Dockerfile.python2.72
-rw-r--r--pkg/docker/Dockerfile.python3.52
-rw-r--r--pkg/docker/Dockerfile.ruby2.32
-rw-r--r--pkg/docker/Makefile2
-rw-r--r--pkg/rpm/Makefile4
-rw-r--r--pkg/rpm/rpmbuild/SOURCES/unit.service4
15 files changed, 17 insertions, 17 deletions
diff --git a/pkg/deb/debian/unit.default b/pkg/deb/debian/unit.default
index b0f0f72d..8aff8bfe 100644
--- a/pkg/deb/debian/unit.default
+++ b/pkg/deb/debian/unit.default
@@ -1 +1 @@
-DAEMON_ARGS="--log /var/log/unit.log --pid /run/unit.pid"
+DAEMON_ARGS="--log /var/log/unit.log --pid /var/run/unit.pid"
diff --git a/pkg/deb/debian/unit.init b/pkg/deb/debian/unit.init
index c991b912..2f573f99 100644
--- a/pkg/deb/debian/unit.init
+++ b/pkg/deb/debian/unit.init
@@ -31,7 +31,7 @@ umask 022
case "$1" in
start)
log_daemon_msg "Starting $DESC" "$NAME"
- if start-stop-daemon --start --quiet --pidfile /run/$NAME.pid \
+ if start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
--exec $DAEMON -- $DAEMON_ARGS; then
log_end_msg 0
else
diff --git a/pkg/deb/debian/unit.service b/pkg/deb/debian/unit.service
index 445851a5..d07a06d3 100644
--- a/pkg/deb/debian/unit.service
+++ b/pkg/deb/debian/unit.service
@@ -5,7 +5,7 @@ After=network-online.target
[Service]
Type=forking
-PIDFile=/run/unit.pid
+PIDFile=/var/run/unit.pid
EnvironmentFile=-/etc/default/unit
ExecStart=/usr/sbin/unitd $DAEMON_ARGS
ExecReload=
diff --git a/pkg/docker/Dockerfile.full b/pkg/docker/Dockerfile.full
index 14afc75b..8c4baa35 100644
--- a/pkg/docker/Dockerfile.full
+++ b/pkg/docker/Dockerfile.full
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.go1.7-dev b/pkg/docker/Dockerfile.go1.7-dev
index ad3d888d..895ac69e 100644
--- a/pkg/docker/Dockerfile.go1.7-dev
+++ b/pkg/docker/Dockerfile.go1.7-dev
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.go1.8-dev b/pkg/docker/Dockerfile.go1.8-dev
index 915d859a..1ba8a92e 100644
--- a/pkg/docker/Dockerfile.go1.8-dev
+++ b/pkg/docker/Dockerfile.go1.8-dev
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.minimal b/pkg/docker/Dockerfile.minimal
index 5214c24a..44592364 100644
--- a/pkg/docker/Dockerfile.minimal
+++ b/pkg/docker/Dockerfile.minimal
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.perl5.24 b/pkg/docker/Dockerfile.perl5.24
index c2c91866..fc483796 100644
--- a/pkg/docker/Dockerfile.perl5.24
+++ b/pkg/docker/Dockerfile.perl5.24
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.php7.0 b/pkg/docker/Dockerfile.php7.0
index b14a38b4..e766bfbf 100644
--- a/pkg/docker/Dockerfile.php7.0
+++ b/pkg/docker/Dockerfile.php7.0
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.python2.7 b/pkg/docker/Dockerfile.python2.7
index 82de3318..1d0410e1 100644
--- a/pkg/docker/Dockerfile.python2.7
+++ b/pkg/docker/Dockerfile.python2.7
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.python3.5 b/pkg/docker/Dockerfile.python3.5
index b103d8f9..d83fb984 100644
--- a/pkg/docker/Dockerfile.python3.5
+++ b/pkg/docker/Dockerfile.python3.5
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Dockerfile.ruby2.3 b/pkg/docker/Dockerfile.ruby2.3
index 50ec7ed6..0cdc76c2 100644
--- a/pkg/docker/Dockerfile.ruby2.3
+++ b/pkg/docker/Dockerfile.ruby2.3
@@ -2,7 +2,7 @@ FROM debian:stretch-slim
LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
-ENV UNIT_VERSION 1.9.0-1~stretch
+ENV UNIT_VERSION 1.10.0-1~stretch
RUN set -x \
&& apt-get update \
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
index cf6de78d..e826cb95 100644
--- a/pkg/docker/Makefile
+++ b/pkg/docker/Makefile
@@ -49,7 +49,7 @@ dockerfiles: $(addprefix Dockerfile., $(MODULES))
build: dockerfiles $(addprefix build-,$(MODULES))
push: build $(addprefix push-,$(MODULES)) latest
-Dockerfile.%: ../../src/nxt_main.h
+Dockerfile.%: ../../version
@echo "===> Building $@"
cat Dockerfile.tmpl | sed \
-e 's,@@UNITPACKAGES@@,$(MODULE_$*),g' \
diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile
index 9e343aa2..4e970e45 100644
--- a/pkg/rpm/Makefile
+++ b/pkg/rpm/Makefile
@@ -140,8 +140,8 @@ CONFIGURE_ARGS=\
--prefix=/usr \
--state=%{_sharedstatedir}/unit \
--control="unix:/var/run/unit/control.sock" \
- --pid=/var/run/unit.pid \
- --log=/var/log/unit.log \
+ --pid=/var/run/unit/unit.pid \
+ --log=/var/log/unit/unit.log \
--tests \
--openssl
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service
index f888685f..6df00fbb 100644
--- a/pkg/rpm/rpmbuild/SOURCES/unit.service
+++ b/pkg/rpm/rpmbuild/SOURCES/unit.service
@@ -7,7 +7,7 @@
# the following:
# [Service]
-# Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid"
+# Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
[Unit]
Description=NGINX Unit
@@ -16,7 +16,7 @@ After=network-online.target
[Service]
Type=simple
-Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid"
+Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid"
ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon
ExecReload=
RuntimeDirectory=unit
generated by cgit (git 2.34.1) at 2025-01-09 18:58:53 +0000