diff options
| author | Remi Collet <remi@remirepo.net> | 2019-01-24 14:05:58 +0300 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-01-24 14:05:58 +0300 |
| commit | b78ed44f396cbfde7d8353cbc3faaf35c0f4dddf (patch) | |
| tree | c09cf51ffb7a146cbcb9e0bf686ae7ccd484275f /pkg/rpm/rpmbuild | |
| parent | b1649bce9ed1521a48e18b22fb58aaf09f9637b0 (diff) | |
| download | unit-b78ed44f396cbfde7d8353cbc3faaf35c0f4dddf.tar.gz unit-b78ed44f396cbfde7d8353cbc3faaf35c0f4dddf.tar.bz2 | |
Packages: systemd and other improvements.
See the following links for details:
https://github.com/nginx/unit/pull/212
https://github.com/nginx/unit/issues/213
Closes #155, closes #212, closes #213.
Diffstat (limited to 'pkg/rpm/rpmbuild')
| -rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.logrotate | 10 | ||||
| -rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.service | 20 | ||||
| -rw-r--r-- | pkg/rpm/rpmbuild/SOURCES/unit.sysconf | 2 |
3 files changed, 27 insertions, 5 deletions
diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.logrotate b/pkg/rpm/rpmbuild/SOURCES/unit.logrotate new file mode 100644 index 00000000..8fb00199 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.logrotate @@ -0,0 +1,10 @@ +/var/log/unit/*.log { + missingok + nocreate + notifempty + postrotate + if [ -f /var/run/unit/unit.pid ]; then + /bin/kill -SIGUSR1 `cat /var/run/unit/unit.pid` + fi + endscript +} diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index 4aaf70cd..f888685f 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.service +++ b/pkg/rpm/rpmbuild/SOURCES/unit.service @@ -1,14 +1,26 @@ +# Modifying this file in-place is not recommended, because changes +# will be overwritten during package upgrades. To customize the +# behaviour, run "systemctl edit unit" to create an override unit. + +# For example, to change options given to the unitd binary at startup, +# create an override unit (as is done by systemctl edit) and enter +# the following: + +# [Service] +# Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid" + [Unit] Description=NGINX Unit Wants=network-online.target After=network-online.target [Service] -Type=forking -PIDFile=/run/unit.pid -EnvironmentFile=-/etc/sysconfig/unit -ExecStart=/usr/sbin/unitd $UNITD_OPTIONS +Type=simple +Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid" +ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon ExecReload= +RuntimeDirectory=unit +RuntimeDirectoryMode=0755 [Install] WantedBy=multi-user.target diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf index 0b28558f..9146bdac 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf +++ b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf @@ -1 +1 @@ -UNITD_OPTIONS="--log /var/log/unit.log --pid /run/unit.pid" +UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" |