diff --git a/createlinks b/createlinks index aaeeca1..416804c 100644 --- a/createlinks +++ b/createlinks @@ -21,10 +21,10 @@ foreach (qw(raddb/radiusd.conf raddb/mods-config/files/authorize)) )); } templates2events("/etc/raddb/radiusd.conf", "bootstrap-ldap-save"); -templates2events("/etc/radiusclient-ng/radiusclient.conf", "bootstrap-console-save"); +templates2events("/etc/radiusclient/radiusclient.conf", "bootstrap-console-save"); templates2events("/etc/raddb/radiusd.conf", "smeserver-radiusd-update"); -templates2events("/etc/radiusclient-ng/radiusclient.conf", "smeserver-radiusd-update"); +templates2events("/etc/radiusclient/radiusclient.conf", "smeserver-radiusd-update"); foreach (qw( raddb/clients.conf @@ -34,7 +34,7 @@ foreach (qw( raddb/sites-available/default raddb/sites-available/inner-tunnel raddb/proxy.conf - radiusclient-ng/servers + radiusclient/servers raddb/mods-config/files/authorize)) { templates2events("/etc/$_", qw( @@ -48,8 +48,8 @@ foreach (qw( } foreach (qw( - radiusclient-ng/dictionary - radiusclient-ng/dictionary.microsoft)) + radiusclient/dictionary + radiusclient/dictionary.microsoft)) { templates2events("/usr/share/$_", qw( bootstrap-console-save diff --git a/root/etc/e-smith/templates.metadata/etc/radiusclient-ng/servers b/root/etc/e-smith/templates.metadata/etc/radiusclient/servers similarity index 100% rename from root/etc/e-smith/templates.metadata/etc/radiusclient-ng/servers rename to root/etc/e-smith/templates.metadata/etc/radiusclient/servers diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/00AuthOrder b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/00AuthOrder similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/00AuthOrder rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/00AuthOrder diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/05LoginTries b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/05LoginTries similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/05LoginTries rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/05LoginTries diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/10LoginTimeout b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/10LoginTimeout similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/10LoginTimeout rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/10LoginTimeout diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/15NoLogin b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/15NoLogin similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/15NoLogin rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/15NoLogin diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/20Issue b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/20Issue similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/20Issue rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/20Issue diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/25Servers b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/25Servers similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/25Servers rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/25Servers diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/30Dictionary b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/30Dictionary similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/30Dictionary rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/30Dictionary diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/35LoginRadius b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/35LoginRadius similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/35LoginRadius rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/35LoginRadius diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/40SeqFile b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/40SeqFile similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/40SeqFile rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/40SeqFile diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/45MapFile b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/45MapFile similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/45MapFile rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/45MapFile diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/50Realm b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/50Realm similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/50Realm rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/50Realm diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/55RadiusTimeout b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/55RadiusTimeout similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/55RadiusTimeout rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/55RadiusTimeout diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/60RadiusRetry b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/60RadiusRetry similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/60RadiusRetry rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/60RadiusRetry diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/65LoginLocal b/root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/65LoginLocal similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/radiusclient.conf/65LoginLocal rename to root/etc/e-smith/templates/etc/radiusclient/radiusclient.conf/65LoginLocal diff --git a/root/etc/e-smith/templates/etc/radiusclient-ng/servers/10localhost b/root/etc/e-smith/templates/etc/radiusclient/servers/10localhost similarity index 100% rename from root/etc/e-smith/templates/etc/radiusclient-ng/servers/10localhost rename to root/etc/e-smith/templates/etc/radiusclient/servers/10localhost diff --git a/root/usr/lib/tmpfiles.d/radius.conf b/root/usr/lib/tmpfiles.d/radius.conf index a89b10e..4287742 100644 --- a/root/usr/lib/tmpfiles.d/radius.conf +++ b/root/usr/lib/tmpfiles.d/radius.conf @@ -1 +1 @@ -D /var/run/radiusd/tmp 0700 radiusd radiusd - +D /run/radiusd/tmp 0700 radiusd radiusd - diff --git a/smeserver-radiusd.spec b/smeserver-radiusd.spec index 351a544..9b85b8b 100644 --- a/smeserver-radiusd.spec +++ b/smeserver-radiusd.spec @@ -4,7 +4,7 @@ Summary: smeserver server and gateway - configure PPTP inbound VPN %define name smeserver-radiusd Name: %{name} %define version 11.0.0 -%define release 5 +%define release 6 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -28,6 +28,10 @@ Provides: e-smith-radiusd smeserver server and gateway - configure radius server %changelog +* Sat Apr 13 2024 Jean-Philippe Pialasse 11.0.0-6.sme +- change path from radiusclient-ng to radiusclient [SME: 12526] +- update tmpfiles.d [SME: 12584] + * Thu Apr 04 2024 Brian Read 11.0.0-5.sme - Update createlinks to create smeserver-package-update event[SME: 12579]