From e741014c59f67f5962c3c7ab97e246a00918d3d4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 10:58:41 +0100 Subject: [PATCH 01/11] switch systemd unit type from forking to simple --- pkg/rpm/rpmbuild/SOURCES/unit.service | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index 4aaf70cd7..0661f4868 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.service +++ b/pkg/rpm/rpmbuild/SOURCES/unit.service @@ -4,10 +4,9 @@ Wants=network-online.target After=network-online.target [Service] -Type=forking -PIDFile=/run/unit.pid +Type=simple EnvironmentFile=-/etc/sysconfig/unit -ExecStart=/usr/sbin/unitd $UNITD_OPTIONS +ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon ExecReload= [Install] From aa9122c36974ec4952a0972e7ec827a72ed52709 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 15:17:08 +0100 Subject: [PATCH 02/11] Improve systemd dependencies Also use systemd on Fedora --- pkg/rpm/unit.spec.in | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 1ef02881a..140d42b5a 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -1,5 +1,5 @@ # distribution specific definitions -%define use_systemd (0%{?rhel} && 0%{?rhel} >= 7) || (0%{?suse_version} >= 1315) +%define use_systemd 0%{?rhel} >= 7 || 0%{?fedora} >= 19 || 0%{?suse_version} >= 1315 %define bdir %{_builddir}/%{name}-%{version} %define dotests 0 @@ -8,18 +8,24 @@ Requires: initscripts >= 8.36 BuildRequires: openssl-devel %endif -%if 0%{?rhel} == 7 -Requires: systemd -BuildRequires: systemd-units +%if %{use_systemd} +BuildRequires: systemd +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd +%endif + +%if 0%{?rhel}%{?fedora} BuildRequires: openssl-devel +%endif + +%if 0%{?rhel} %if 0%{?amzn} == 0 -%define dist .el7 +%define dist .el%{?rhel} %endif %endif %if 0%{?suse_version} >= 1315 -BuildRequires: systemd -Requires: systemd BuildRequires: libopenssl-devel %endif From 575d6d42146a6f0138d0adf9dfb7b90422d9e52f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 15:20:45 +0100 Subject: [PATCH 03/11] Drop /etc/sysconfig/unit configuration file for systemd distributions Switch from EnvironmentFile to Environment Document how to create a oveeride file (systemctl edit unit) --- pkg/rpm/rpmbuild/SOURCES/unit.service | 13 ++++++++++++- pkg/rpm/unit.spec.in | 4 ++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index 0661f4868..4326f712c 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.service +++ b/pkg/rpm/rpmbuild/SOURCES/unit.service @@ -1,3 +1,14 @@ +# 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 @@ -5,7 +16,7 @@ After=network-online.target [Service] Type=simple -EnvironmentFile=-/etc/sysconfig/unit +Environment="UNITD_OPTIONS=--log /var/unit/unit.log --pid /run/unit.pid" ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon ExecReload= diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 140d42b5a..4527ac246 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -109,9 +109,11 @@ DESTDIR=%{buildroot} make unitd-install libunit-install %{__mkdir} -p %{buildroot}%{_libdir}/unit/modules %{__mkdir} -p %{buildroot}%{_libdir}/unit/debug-modules %{__mkdir} -p %{buildroot}%{_sharedstatedir}/unit +%if ! %{use_systemd} %{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig %{__install} -m 644 -p %{SOURCE3} \ %{buildroot}%{_sysconfdir}/sysconfig/unit +%endif %{__mkdir} -p %{buildroot}%{_sysconfdir}/unit %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit/examples %{__install} -m 644 -p %{SOURCE4} \ @@ -191,7 +193,9 @@ fi %defattr(-,root,root,-) %attr(0755,root,root) %{_sbindir}/unitd %attr(0755,root,root) %{_sbindir}/unitd-debug +%if ! %{use_systemd} %config(noreplace) %{_sysconfdir}/sysconfig/unit +%endif %dir %{_sysconfdir}/unit %if %{use_systemd} %{_unitdir}/unit.service From b0fe8286f6155afc6f0a1ba0e0f4f73361181a9b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 15:34:16 +0100 Subject: [PATCH 04/11] move log to dedicated directory --- pkg/rpm/rpmbuild/SOURCES/unit.service | 2 +- pkg/rpm/rpmbuild/SOURCES/unit.sysconf | 2 +- pkg/rpm/unit.spec.in | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index 4326f712c..a4bdfde6e 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.service +++ b/pkg/rpm/rpmbuild/SOURCES/unit.service @@ -16,7 +16,7 @@ After=network-online.target [Service] Type=simple -Environment="UNITD_OPTIONS=--log /var/unit/unit.log --pid /run/unit.pid" +Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit.pid" ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon ExecReload= diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf index 0b28558f0..2062d809a 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 /run/unit.pid" diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 4527ac246..8741afed9 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -109,6 +109,7 @@ DESTDIR=%{buildroot} make unitd-install libunit-install %{__mkdir} -p %{buildroot}%{_libdir}/unit/modules %{__mkdir} -p %{buildroot}%{_libdir}/unit/debug-modules %{__mkdir} -p %{buildroot}%{_sharedstatedir}/unit +%{__mkdir} -p %{buildroot}%{_localstatedir}/log/unit %if ! %{use_systemd} %{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig %{__install} -m 644 -p %{SOURCE3} \ @@ -193,13 +194,11 @@ fi %defattr(-,root,root,-) %attr(0755,root,root) %{_sbindir}/unitd %attr(0755,root,root) %{_sbindir}/unitd-debug -%if ! %{use_systemd} -%config(noreplace) %{_sysconfdir}/sysconfig/unit -%endif %dir %{_sysconfdir}/unit %if %{use_systemd} %{_unitdir}/unit.service %else +%config(noreplace) %{_sysconfdir}/sysconfig/unit %{_initrddir}/unit %endif %dir %{_datadir}/doc/unit @@ -207,6 +206,7 @@ fi %dir %{_libdir}/unit/modules %dir %{_libdir}/unit/debug-modules %dir %{_sharedstatedir}/unit +%dir %attr(0700,root,root) %{_localstatedir}/log/unit %files devel %{_libdir}/libunit.a From 9eedfb91fac41a6c49170a6212e426d8ac9c5263 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 15:49:30 +0100 Subject: [PATCH 05/11] move unit.pid and control.sock to /var/run/unit --- pkg/rpm/Makefile | 2 +- pkg/rpm/rpmbuild/SOURCES/unit.service | 4 +++- pkg/rpm/rpmbuild/SOURCES/unit.sysconf | 2 +- pkg/rpm/unit.spec.in | 5 ++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index ef7f33611..aa634f1c0 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -98,7 +98,7 @@ endif CONFIGURE_ARGS=\ --prefix=/usr \ --state=%{_sharedstatedir}/unit \ - --control="unix:/var/run/control.unit.sock" \ + --control="unix:/var/run/unit/control.sock" \ --pid=/var/run/unit.pid \ --log=/var/log/unit.log \ --tests \ diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index a4bdfde6e..f888685f3 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.service +++ b/pkg/rpm/rpmbuild/SOURCES/unit.service @@ -16,9 +16,11 @@ After=network-online.target [Service] Type=simple -Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit.pid" +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 2062d809a..9146bdacc 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf +++ b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf @@ -1 +1 @@ -UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /run/unit.pid" +UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 8741afed9..9ee7553cc 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -1,5 +1,5 @@ # distribution specific definitions -%define use_systemd 0%{?rhel} >= 7 || 0%{?fedora} >= 19 || 0%{?suse_version} >= 1315 +%define use_systemd (0%{?rhel} >= 7 || 0%{?fedora} >= 19 || 0%{?suse_version} >= 1315) %define bdir %{_builddir}/%{name}-%{version} %define dotests 0 @@ -110,6 +110,7 @@ DESTDIR=%{buildroot} make unitd-install libunit-install %{__mkdir} -p %{buildroot}%{_libdir}/unit/debug-modules %{__mkdir} -p %{buildroot}%{_sharedstatedir}/unit %{__mkdir} -p %{buildroot}%{_localstatedir}/log/unit +%{__mkdir} -p %{buildroot}%{_localstatedir}/run/unit %if ! %{use_systemd} %{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig %{__install} -m 644 -p %{SOURCE3} \ @@ -197,8 +198,10 @@ fi %dir %{_sysconfdir}/unit %if %{use_systemd} %{_unitdir}/unit.service +%dir %attr(0755,root,root) %ghost %{_localstatedir}/run/unit %else %config(noreplace) %{_sysconfdir}/sysconfig/unit +%dir %attr(0755,root,root) %{_localstatedir}/run/unit %{_initrddir}/unit %endif %dir %{_datadir}/doc/unit From 2dc791b4eb4b8fe32c6cde5dbb1c5bc499d41e17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 16:17:50 +0100 Subject: [PATCH 06/11] use --control option instead of build options --- pkg/rpm/Makefile | 2 +- pkg/rpm/rpmbuild/SOURCES/unit.service | 4 ++-- pkg/rpm/rpmbuild/SOURCES/unit.sysconf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index aa634f1c0..ef7f33611 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -98,7 +98,7 @@ endif CONFIGURE_ARGS=\ --prefix=/usr \ --state=%{_sharedstatedir}/unit \ - --control="unix:/var/run/unit/control.sock" \ + --control="unix:/var/run/control.unit.sock" \ --pid=/var/run/unit.pid \ --log=/var/log/unit.log \ --tests \ diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index f888685f3..3c328bdc2 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=--control unix:/run/unit/control.sock --log /var/log/unit/unit.log --pid /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=--control unix:/run/unit/control.sock --log /var/log/unit/unit.log --pid /run/unit/unit.pid" ExecStart=/usr/sbin/unitd $UNITD_OPTIONS --no-daemon ExecReload= RuntimeDirectory=unit diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf index 9146bdacc..99e96998f 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf +++ b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf @@ -1 +1 @@ -UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" +UNITD_OPTIONS="--control unix:/var/run/unit/control.sock --log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" From 11a49d6b35ee101263f267f4d788ba38aa9566b6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jan 2019 16:24:39 +0100 Subject: [PATCH 07/11] minor cleanup, duplicated BR --- pkg/rpm/unit.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 9ee7553cc..888ec0cdf 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -5,7 +5,6 @@ %if ( 0%{?rhel} == 5 || 0%{?rhel} == 6 ) Requires: initscripts >= 8.36 -BuildRequires: openssl-devel %endif %if %{use_systemd} From f8057cc3c1453c1f65187f5e25f6c03338f59ec2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Jan 2019 07:51:54 +0100 Subject: [PATCH 08/11] Revert "use --control option instead of build options" This reverts commit 2dc791b4eb4b8fe32c6cde5dbb1c5bc499d41e17. --- pkg/rpm/Makefile | 2 +- pkg/rpm/rpmbuild/SOURCES/unit.service | 4 ++-- pkg/rpm/rpmbuild/SOURCES/unit.sysconf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/rpm/Makefile b/pkg/rpm/Makefile index ef7f33611..aa634f1c0 100644 --- a/pkg/rpm/Makefile +++ b/pkg/rpm/Makefile @@ -98,7 +98,7 @@ endif CONFIGURE_ARGS=\ --prefix=/usr \ --state=%{_sharedstatedir}/unit \ - --control="unix:/var/run/control.unit.sock" \ + --control="unix:/var/run/unit/control.sock" \ --pid=/var/run/unit.pid \ --log=/var/log/unit.log \ --tests \ diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.service b/pkg/rpm/rpmbuild/SOURCES/unit.service index 3c328bdc2..f888685f3 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=--control unix:/run/unit/control.sock --log /var/log/unit/unit.log --pid /run/unit/unit.pid" +# Environment="UNITD_OPTIONS=--log /var/log/unit/unit.log --pid /run/unit/unit.pid" [Unit] Description=NGINX Unit @@ -16,7 +16,7 @@ After=network-online.target [Service] Type=simple -Environment="UNITD_OPTIONS=--control unix:/run/unit/control.sock --log /var/log/unit/unit.log --pid /run/unit/unit.pid" +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 diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf index 99e96998f..9146bdacc 100644 --- a/pkg/rpm/rpmbuild/SOURCES/unit.sysconf +++ b/pkg/rpm/rpmbuild/SOURCES/unit.sysconf @@ -1 +1 @@ -UNITD_OPTIONS="--control unix:/var/run/unit/control.sock --log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" +UNITD_OPTIONS="--log /var/log/unit/unit.log --pid /var/run/unit/unit.pid" From d6ad73252648d49d98b5643550e3a555864494f4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Jan 2019 09:21:34 +0100 Subject: [PATCH 09/11] rename /etc/sysconfig/unit to unitd as in service script --- pkg/rpm/unit.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 888ec0cdf..4a3e68521 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -113,7 +113,7 @@ DESTDIR=%{buildroot} make unitd-install libunit-install %if ! %{use_systemd} %{__mkdir} -p %{buildroot}%{_sysconfdir}/sysconfig %{__install} -m 644 -p %{SOURCE3} \ - %{buildroot}%{_sysconfdir}/sysconfig/unit + %{buildroot}%{_sysconfdir}/sysconfig/unitd %endif %{__mkdir} -p %{buildroot}%{_sysconfdir}/unit %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit/examples @@ -199,7 +199,7 @@ fi %{_unitdir}/unit.service %dir %attr(0755,root,root) %ghost %{_localstatedir}/run/unit %else -%config(noreplace) %{_sysconfdir}/sysconfig/unit +%config(noreplace) %{_sysconfdir}/sysconfig/unitd %dir %attr(0755,root,root) %{_localstatedir}/run/unit %{_initrddir}/unit %endif From 1dcab3504ea9dac0029487670f37c9a9408825c4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 16 Jan 2019 09:49:44 +0100 Subject: [PATCH 10/11] missing BR (not more installed in default buildroot, since F29) --- pkg/rpm/unit.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index 4a3e68521..dd080ebde 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -15,6 +15,7 @@ Requires(postun): systemd %endif %if 0%{?rhel}%{?fedora} +BuildRequires: gcc BuildRequires: openssl-devel %endif From 79c6b005c2f21e0c9a1d7e0362d0b1b1e6314bfe Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Jan 2019 18:06:28 +0100 Subject: [PATCH 11/11] provide logrotate configuration --- pkg/rpm/rpmbuild/SOURCES/unit.logrotate | 8 ++++++++ pkg/rpm/unit.spec.in | 5 +++++ 2 files changed, 13 insertions(+) create mode 100644 pkg/rpm/rpmbuild/SOURCES/unit.logrotate diff --git a/pkg/rpm/rpmbuild/SOURCES/unit.logrotate b/pkg/rpm/rpmbuild/SOURCES/unit.logrotate new file mode 100644 index 000000000..a8340a930 --- /dev/null +++ b/pkg/rpm/rpmbuild/SOURCES/unit.logrotate @@ -0,0 +1,8 @@ +/var/log/unit/*.log { + missingok + nocreate + notifempty + postrotate + /bin/kill -SIGUSR1 `cat /var/run/unit/unit.pid` + endscript +} diff --git a/pkg/rpm/unit.spec.in b/pkg/rpm/unit.spec.in index dd080ebde..d69a3dc97 100644 --- a/pkg/rpm/unit.spec.in +++ b/pkg/rpm/unit.spec.in @@ -51,6 +51,7 @@ Source1: unit.service Source2: unit.init Source3: unit.sysconf Source4: unit.example.config +Source5: unit.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -116,6 +117,9 @@ DESTDIR=%{buildroot} make unitd-install libunit-install %{__install} -m 644 -p %{SOURCE3} \ %{buildroot}%{_sysconfdir}/sysconfig/unitd %endif +%{__mkdir} -p %{buildroot}%{_sysconfdir}/logrotate.d +%{__install} -m 644 -p %{SOURCE5} \ + %{buildroot}%{_sysconfdir}/logrotate.d/unit %{__mkdir} -p %{buildroot}%{_sysconfdir}/unit %{__mkdir} -p %{buildroot}%{_datadir}/doc/unit/examples %{__install} -m 644 -p %{SOURCE4} \ @@ -210,6 +214,7 @@ fi %dir %{_libdir}/unit/debug-modules %dir %{_sharedstatedir}/unit %dir %attr(0700,root,root) %{_localstatedir}/log/unit +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %files devel %{_libdir}/libunit.a