diff options
| author | Andrei Belov <defan@nginx.com> | 2019-08-22 21:33:54 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-08-22 21:33:54 +0300 |
| commit | a07c4d30a64f781f93730576b5dced32422a9935 (patch) | |
| tree | 06ebfaa66845a057b8069014c5379b2dcfc80861 /pkg/rpm | |
| parent | 8a579acddeae0c0106e15d82aa7220ac01deba84 (diff) | |
| parent | c47af243b0e805376c4ec908f21e07dc811b33f0 (diff) | |
| download | unit-a07c4d30a64f781f93730576b5dced32422a9935.tar.gz unit-a07c4d30a64f781f93730576b5dced32422a9935.tar.bz2 | |
Merged with the default branch.1.10.0-1
Diffstat (limited to 'pkg/rpm')
| -rw-r--r-- | pkg/rpm/Makefile | 4 | ||||
| -rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.service | 4 |
2 files changed, 4 insertions, 4 deletions
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 |