--- rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec 2020/12/09 02:33:21 1.10 +++ rpms/e-smith-radiusd/sme10/e-smith-radiusd.spec 2020/12/09 02:38:43 1.11 @@ -1,4 +1,4 @@ -# $Id: e-smith-radiusd.spec,v 1.9 2019/12/19 06:00:24 jpp Exp $ +# $Id: e-smith-radiusd.spec,v 1.10 2020/12/09 02:33:21 jpp Exp $ Summary: e-smith server and gateway - configure PPTP inbound VPN %define name e-smith-radiusd @@ -202,10 +202,8 @@ rm -f %{name}-%{version}-%{release}-file --file /sbin/e-smith/systemd/radiusd-configure 'attr(0554,root,root)' \ --file /sbin/e-smith/systemd/radiusd-certificate 'attr(0554,root,root)' \ --dir /var/service/radiusd 'attr(01755,root,root)' \ - --file /var/service/radiusd/down 'attr(0644,root,root)' \ - --file /var/service/radiusd/run 'attr(0755,root,root)' \ - --file /var/service/radiusd/log/run 'attr(0755,root,root)' \ - --dir /var/service/radiusd/supervise 'attr(0700,root,root)' \ + --dir /var/log/stunnel 'attr(0755,stunnel,stunnel)' \ + --dir /var/log/stunnel/ssl 'attr(0755,stunnel,stunnel)' \ --dir /var/log/radiusd 'attr(0755,smelog,smelog)' \ |sed -e '/%dir %attr(0755,root,root) \/etc\/raddb/d' \ |sed -e '/%dir %attr(0755,root,root) \/etc\/raddb\/mods-enabled/d' \ @@ -214,15 +212,7 @@ echo "%doc COPYING" >> %{name}-%{version %pre /sbin/e-smith/create-system-user stunnel %{stunnelid} \ - 'chrooted stunnel user user' /var/log/imap/ssl /bin/false - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -f %{name}-%{version}-%{release}-filelist -%defattr(-,root,root) - -%pre + 'chrooted stunnel user user' /var/log/stunnel/ssl /bin/false if [ $1 -gt 1 ] ; then if [ -e /var/service/radiusd/run ] ; then /usr/bin/sv d radiusd @@ -234,3 +224,11 @@ if [ $1 -gt 1 ] ; then fi + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f %{name}-%{version}-%{release}-filelist +%defattr(-,root,root) + +