--- 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	2021/06/02 14:51:18	1.18
@@ -1,10 +1,10 @@
-# $Id: e-smith-radiusd.spec,v 1.9 2019/12/19 06:00:24 jpp Exp $
+# $Id: e-smith-radiusd.spec,v 1.17 2021/05/31 04:12:24 jpp Exp $
 
 Summary: e-smith server and gateway - configure PPTP inbound VPN
 %define name e-smith-radiusd
 Name: %{name}
 %define version 2.6.0
-%define release 10
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,6 +15,8 @@ Patch1: e-smith-radiusd-2.6.0-freeradius
 Patch2: e-smith-radiusd-2.6.0-freeradius3ter.patch
 Patch3: e-smith-radiusd-2.6.0-bz10853.patch
 Patch4: e-smith-radiusd-2.6.0-bz11113-bz11155-systemd-update.patch
+Patch5: e-smith-radiusd-2.6.0-bz11302.patch
+Patch6: e-smith-radiusd-2.6.0-bz11602-ssl-template.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.13.16-27
@@ -31,9 +33,23 @@ BuildArchitectures: noarch
 e-smith server and gateway - configure radius server
 
 %changelog
-* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-10.sme
+* Wed Jun 02 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+- remove services2adjust in bootstrap-console-save event, this put systemd in a loop [SME: 11602]
+
+* Mon May 31 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-14.sme
+- ssl pem using template in place of copy [SME: 11602]
+
+* Sun Jan 03 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-13.sme
+- radiusd needs ldap started before [SME: 11302]
+
+* Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- add Restart=always [SME: 11113]
+  change group of pem file to radiusd
+
+* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-11.sme
 - create -update event [SME: 11155]
-- move radiusd to systemd {SME: 11113] 
+- move radiusd to systemd {SME: 11113]
+  remove noise from spec file 
 
 * Thu Dec 19 2019 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-9.sme
 - fix server restartting with virtual_server error  [SME: 10853]
@@ -189,7 +205,10 @@ e-smith server and gateway - configure r
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-rm -rf root/service root/var/service
+rm -rf root/service root/var/service root/var/log/radiusd
+mkdir -p root/var/log/stunnel/ssl 
+%patch5 -p1
+%patch6 -p1
 
 %build
 perl createlinks
@@ -202,11 +221,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/radiusd 'attr(0755,smelog,smelog)' \
+    --dir /var/log/stunnel 'attr(0755,stunnel,stunnel)' \
+    --dir /var/log/stunnel/ssl 'attr(0755,stunnel,stunnel)' \
  |sed -e '/%dir %attr(0755,root,root) \/etc\/raddb/d' \
  |sed  -e '/%dir %attr(0755,root,root) \/etc\/raddb\/mods-enabled/d' \
     > %{name}-%{version}-%{release}-filelist
@@ -214,7 +230,14 @@ echo "%doc COPYING" >> %{name}-%{version
 
 %pre
 /sbin/e-smith/create-system-user stunnel %{stunnelid} \
-    'chrooted stunnel user user' /var/log/imap/ssl /bin/false
+    '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
+        /usr/bin/sv d radiusd/log
+  fi
+fi
+
 
 %clean 
 rm -rf $RPM_BUILD_ROOT
@@ -222,15 +245,4 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-%{version}-%{release}-filelist
 %defattr(-,root,root)
 
-%pre
-if [ $1 -gt 1 ] ; then
-  if [ -e /var/service/radiusd/run ] ; then
-        /usr/bin/sv d radiusd
-        /usr/bin/sv d radiusd/log
-  fi
-  if [ -e /var/service/radiusd ] ; then
-        rm -rf /var/service/radiusd
-  fi
-
-fi