* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme

- handle dhparam via template [SME: 12964]
This commit is contained in:
Jean-Philippe Pialasse 2025-03-18 01:20:46 -04:00
parent 3986d4512c
commit b4d575a11f
5 changed files with 21 additions and 4 deletions

View File

@ -82,6 +82,8 @@ $event="smeserver-radiusd-update";
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/radiusd");
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/rsyslog");
templates2events("/etc/rsyslog.conf",$event);
templates2events("/etc/raddb/certs/dh", $event);
# systemd-specific action mandatory for this package-update event
event_link("systemd-reload", $event, "89");
event_link("systemd-default", $event, "88");
@ -94,3 +96,12 @@ safe_symlink("restart", "root/etc/e-smith/events/ssl-update/services2adjust/radi
safe_symlink("../mods-available/ldap", "root/etc/raddb/mods-enabled/ldap");
safe_symlink("../mods-available/smbpasswd", "root/etc/raddb/mods-enabled/smbpasswd");
$event = "dhparam-update";
templates2events("/etc/raddb/certs/dh", $event);
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/radiusd");
$event = "smeserver-base-update";
templates2events("/etc/raddb/certs/dh", $event);
safe_symlink("try-restart", "root/etc/e-smith/events/$event/services2adjust/radiusd");

View File

@ -0,0 +1,5 @@
TEMPLATE_PATH="/home/e-smith/dh.pem"
OUTPUT_FILENAME="/etc/raddb/certs/dh"
UID="root"
GID="root"
PERMS=0644

View File

@ -1,9 +1,6 @@
#!/bin/sh
# Ensure that PRNG is adequately seeded.
[ -s /etc/raddb/certs/dh ] ||\
/usr/bin/envuidgid stunnel \
/usr/bin/openssl dhparam -out /etc/raddb/certs/dh 2048
[ -s /etc/raddb/certs/random ] ||\
/usr/bin/envuidgid stunnel \
/bin/dd if=/dev/urandom of=/etc/raddb/certs/random bs=1k count=1

View File

@ -5,6 +5,7 @@ After=ldap.service
ExecStartPre=
ExecStartPre=/sbin/e-smith/service-status radiusd
ExecStartPre=/sbin/e-smith/systemd/radiusd-configure
ExecStartPre=/sbin/e-smith/expand-template /etc/raddb/certs/dh
ExecStartPre=/sbin/e-smith/expand-template /etc/raddb/certs/radiusd.pem
ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd
ExecStartPre=/usr/sbin/radiusd -C

View File

@ -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 10
%define release 11
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@ -30,6 +30,9 @@ Provides: e-smith-radiusd
smeserver server and gateway - configure radius server
%changelog
* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme
- handle dhparam via template [SME: 12964]
* Sun Jan 26 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-10.sme
- prestart script requires daemontools bins [SME: 12566]