From 42bf43e02386a657b23a0ac8a41e8001b4dcee2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= Date: Thu, 29 Nov 2018 15:42:38 +0100 Subject: [PATCH] Fix Nginx configuration packaging (#1462) --- rpm/lemonldap-ng.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec index 4d4076cda..a241d7110 100644 --- a/rpm/lemonldap-ng.spec +++ b/rpm/lemonldap-ng.spec @@ -457,6 +457,15 @@ for i in handler manager portal test; do { mkdir -p %{buildroot}%{_sysconfdir}/nginx/conf.d/ mv %{buildroot}%{lm_confdir}/*nginx*.conf \ %{buildroot}%{_sysconfdir}/nginx/conf.d/ +# Move lua and log configuration +mv %{buildroot}%{_sysconfdir}/nginx/conf.d/nginx-lua-headers.conf \ + %{buildroot}%{_sysconfdir}/nginx/conf.d/nginx-lmlog.conf \ + %{buildroot}%{_sysconfdir}/nginx/ +# Replace paths in main configuration files +sed -i 's:/etc/lemonldap-ng/nginx-lmlog.conf:/etc/nginx/nginx-lmlog.conf:' \ + %{buildroot}%{_sysconfdir}/nginx/conf.d/handler-nginx.conf +sed -i 's:/etc/lemonldap-ng/nginx-lua-headers.conf:/etc/nginx/nginx-lua-headers.conf:' \ + %{buildroot}%{_sysconfdir}/nginx/conf.d/test-nginx.conf # Remove for_etc_hosts from %%{_sysconfdir} mv %{buildroot}%{lm_confdir}/for_etc_hosts . @@ -602,8 +611,8 @@ fi %files nginx %config(noreplace) %{_sysconfdir}/nginx/conf.d/handler-nginx.conf %config(noreplace) %{_sysconfdir}/nginx/conf.d/manager-nginx.conf -%config(noreplace) %{_sysconfdir}/nginx/conf.d/nginx-lmlog.conf -%config(noreplace) %{_sysconfdir}/nginx/conf.d/nginx-lua-headers.conf +%config(noreplace) %{_sysconfdir}/nginx/nginx-lmlog.conf +%config(noreplace) %{_sysconfdir}/nginx/nginx-lua-headers.conf %config(noreplace) %{_sysconfdir}/nginx/conf.d/portal-nginx.conf %config(noreplace) %{_sysconfdir}/nginx/conf.d/test-nginx.conf -- GitLab