Compare commits
9 Commits
11_0_0-7_e
...
master
Author | SHA1 | Date | |
---|---|---|---|
b4d575a11f | |||
3986d4512c | |||
314c58d529 | |||
d885c00b41 | |||
1f59e29ceb | |||
2d0ba107e6 | |||
8f8eb4e89a | |||
73bb05aae6 | |||
f4d73266b4 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
*.log
|
||||
*spec-20*
|
||||
*.tar.xz
|
||||
*.bak
|
||||
|
@@ -6,7 +6,14 @@ SMEServer Koozali developed git repo for smeserver-radiusd smeserver
|
||||
<br />https://wiki.koozali.org/
|
||||
|
||||
## Bugzilla
|
||||
Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-radiusd&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)\
|
||||
Show list of outstanding bugs:
|
||||
[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-radiusd&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-radiusd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-radiusd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-radiusd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-radiusd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-radiusd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-radiusd&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
|
||||
And a list of outstanding Legacy bugs: (e-smith-radiusd) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-radiusd&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
|
||||
|
||||
## Description
|
||||
|
@@ -1 +0,0 @@
|
||||
sme10
|
11
createlinks
11
createlinks
@@ -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");
|
||||
|
||||
|
@@ -1 +1 @@
|
||||
freeradius*:any:/sbin/e-smith/signal-event smeserver-radius-update
|
||||
freeradius*:any:/sbin/e-smith/signal-event smeserver-radiusd-update
|
||||
|
5
root/etc/e-smith/templates.metadata/etc/raddb/certs/dh
Normal file
5
root/etc/e-smith/templates.metadata/etc/raddb/certs/dh
Normal file
@@ -0,0 +1,5 @@
|
||||
TEMPLATE_PATH="/home/e-smith/dh.pem"
|
||||
OUTPUT_FILENAME="/etc/raddb/certs/dh"
|
||||
UID="root"
|
||||
GID="root"
|
||||
PERMS=0644
|
@@ -7,7 +7,7 @@
|
||||
delaycompress
|
||||
sharedscripts
|
||||
postrotate
|
||||
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
|
||||
/usr/bin/systemctl -s HUP kill rsyslog.service >/dev/null 2>&1 || true
|
||||
endscript
|
||||
}
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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
|
||||
|
@@ -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 7
|
||||
%define release 11
|
||||
Version: %{version}
|
||||
Release: %{release}%{?dist}
|
||||
License: GPL
|
||||
@@ -17,6 +17,8 @@ Requires: smeserver-lib >= 1.15.1-16
|
||||
Requires: freeradius >= 2.1.12
|
||||
Requires: freeradius-ldap >= 2.1.12
|
||||
Requires: freeradius-client
|
||||
# daemontools bins in use
|
||||
Requires: /usr/bin/envuidgid
|
||||
Obsoletes: radiusclient-ng <= 0.5.6
|
||||
Obsoletes: radiusclient <= 0.3.2
|
||||
BuildRequires: smeserver-devtools >= 1.13.1-03
|
||||
@@ -28,6 +30,15 @@ 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]
|
||||
|
||||
* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
|
||||
- fix new log does not fill after log rotate [SME: 12691]
|
||||
|
||||
* Mon Apr 15 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
|
||||
- rewrite radiusd-configure [SME: 12624]
|
||||
- move forgotten templates [SME: 12623]
|
||||
@@ -280,13 +291,6 @@ echo "%doc COPYING" >> %{name}-%{version}-%{release}-filelist
|
||||
%pre
|
||||
/sbin/e-smith/create-system-user stunnel %{stunnelid} \
|
||||
'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
|
||||
|
Reference in New Issue
Block a user