From 61d877720498e3f3b14d60d1d7b402d6f1ec07ad Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Thu, 15 Nov 2018 16:11:26 +0000
Subject: [PATCH] Fix logrotate and update rpm spec file
* Create log directory in spec file
* Fix logrotate file
---
nginx-ldap-auth.logrotate | 1 +
rpm/nginx-ldap-auth.spec | 13 +++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/nginx-ldap-auth.logrotate b/nginx-ldap-auth.logrotate
index da80a55..4f0524f 100644
--- a/nginx-ldap-auth.logrotate
+++ b/nginx-ldap-auth.logrotate
@@ -1,4 +1,5 @@
/var/log/nginx-ldap-auth/daemon.log {
+ compress
delaycompress
create 0644 nginx-ldap-auth nginx-ldap-auth
su nginx-ldap-auth nginx-ldap-auth
diff --git a/rpm/nginx-ldap-auth.spec b/rpm/nginx-ldap-auth.spec
index 7dd841c..5b61c3d 100644
--- a/rpm/nginx-ldap-auth.spec
+++ b/rpm/nginx-ldap-auth.spec
@@ -1,5 +1,7 @@
+%global logdir /var/log/%name
+
Name: nginx-ldap-auth
-Version: 0.0.3
+Version: 0.0.5
Release: 1%{?dist}
Summary: NGINX Plus LDAP authentication daemon
@@ -31,14 +33,17 @@ install -d -m755 %buildroot/etc/default
install -m644 %name.default %buildroot/etc/default/%name
install -d -m755 %buildroot/etc/logrotate.d
install -m644 %name.logrotate %buildroot%_sysconfdir/logrotate.d/%name
+mkdir -p %{buildroot}%{logdir}
+touch %{buildroot}%{logdir}/daemon.log
%files
%doc README.md nginx-ldap-auth.conf backend-sample-app.py LICENSE
-/etc/default/%name
-%_sysconfdir/logrotate.d/%name
+%config(noreplace) /etc/default/%name
+%config(noreplace) %_sysconfdir/logrotate.d/%name
%_bindir/nginx-ldap-auth-daemon
%_unitdir/%name.service
-
+%attr(750,nginx-ldap-auth,nginx-ldap-auth) %dir %{logdir}
+%config %ghost %attr(640,nginx-ldap-auth,nginx-ldap-auth) %{logdir}/daemon.log
%post
getent group nginx-ldap-auth > /dev/null || groupadd -r nginx-ldap-auth
--
GitLab