/[smeserver]/rpms/e-smith-radiusd/sme10/e-smith-radiusd-2.6.0-bz11602-ssl-template.patch
ViewVC logotype

Contents of /rpms/e-smith-radiusd/sme10/e-smith-radiusd-2.6.0-bz11602-ssl-template.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.3 - (show annotations) (download)
Mon Aug 23 04:29:31 2021 UTC (2 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: e-smith-radiusd-2_6_0-20_el7_sme, e-smith-radiusd-2_6_0-23_el7_sme, e-smith-radiusd-2_6_0-17_el7_sme, e-smith-radiusd-2_6_0-19_el7_sme, e-smith-radiusd-2_6_0-22_el7_sme, e-smith-radiusd-2_6_0-21_el7_sme, e-smith-radiusd-2_6_0-16_el7_sme, e-smith-radiusd-2_6_0-18_el7_sme, HEAD
Changes since 1.2: +1 -2 lines
* Mon Aug 23 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-16.sme
- fix ssl template metadata patch [SME: 11680]

1 diff -Nur --no-dereference e-smith-radiusd-2.6.0.old/createlinks e-smith-radiusd-2.6.0/createlinks
2 --- e-smith-radiusd-2.6.0.old/createlinks 2021-05-31 00:02:03.557000000 -0400
3 +++ e-smith-radiusd-2.6.0/createlinks 2021-05-31 00:08:47.922000000 -0400
4 @@ -71,6 +71,7 @@
5 user-lock
6 user-modify
7 user-modify-admin
8 +
9 ) )
10 {
11 safe_symlink("sigterm", "root/etc/e-smith/events/$event/services2adjust/radiusd");
12 @@ -82,6 +83,9 @@
13 event_link("systemd-reload", $event, "89");
14 event_link("systemd-default", $event, "88");
15
16 +templates2events("/etc/raddb/certs/radiusd.pem", qw( bootstrap-console-save ssl-update e-smith-radiusd-update) );
17 +safe_symlink("restart", "root/etc/e-smith/events/ssl-update/services2adjust/radiusd");
18 +
19 # activate modules
20 #safe_symlink("../mods-available/realm", "root/etc/raddb/mods-enabled/realm");
21 safe_symlink("../mods-available/ldap", "root/etc/raddb/mods-enabled/ldap");
22 diff -Nur --no-dereference e-smith-radiusd-2.6.0.old/root/etc/e-smith/templates.metadata/etc/raddb/certs/radiusd.pem e-smith-radiusd-2.6.0/root/etc/e-smith/templates.metadata/etc/raddb/certs/radiusd.pem
23 --- e-smith-radiusd-2.6.0.old/root/etc/e-smith/templates.metadata/etc/raddb/certs/radiusd.pem 1969-12-31 19:00:00.000000000 -0500
24 +++ e-smith-radiusd-2.6.0/root/etc/e-smith/templates.metadata/etc/raddb/certs/radiusd.pem 2021-05-31 00:03:48.456000000 -0400
25 @@ -0,0 +1,4 @@
26 +TEMPLATE_PATH="/home/e-smith/ssl.pem"
27 +OUTPUT_FILENAME="/etc/raddb/certs/radiusd.pem"
28 +GID="radiusd"
29 +PERMS=0640
30 diff -Nur --no-dereference e-smith-radiusd-2.6.0.old/root/sbin/e-smith/systemd/radiusd-certificate e-smith-radiusd-2.6.0/root/sbin/e-smith/systemd/radiusd-certificate
31 --- e-smith-radiusd-2.6.0.old/root/sbin/e-smith/systemd/radiusd-certificate 2021-05-31 00:02:03.558000000 -0400
32 +++ e-smith-radiusd-2.6.0/root/sbin/e-smith/systemd/radiusd-certificate 1969-12-31 19:00:00.000000000 -0500
33 @@ -1,40 +0,0 @@
34 -#!/usr/bin/perl -w
35 -
36 -#----------------------------------------------------------------------
37 -# copyright (C) 2005 Mitel Networks Corporation
38 -#
39 -# This program is free software; you can redistribute it and/or modify
40 -# it under the terms of the GNU General Public License as published by
41 -# the Free Software Foundation; either version 2 of the License, or
42 -# (at your option) any later version.
43 -#
44 -# This program is distributed in the hope that it will be useful,
45 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
46 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
47 -# GNU General Public License for more details.
48 -#
49 -# You should have received a copy of the GNU General Public License
50 -# along with this program; if not, write to the Free Software
51 -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
52 -#
53 -# Technical support for this program is available from Mitel Networks
54 -# Please visit our web site www.mitel.com/sme/ for details.
55 -#----------------------------------------------------------------------
56 -
57 -use esmith::tcpsvd;
58 -use esmith::ConfigDB;
59 -use File::Copy;
60 -
61 -my $c = esmith::ConfigDB->open_ro;
62 -my $s = $c->get('SystemName')->value;
63 -my $d = $c->get('DomainName')->value;
64 -
65 -my $pem = "/etc/raddb/certs/radiusd.pem";
66 -# Now copy system pem file into jail used by stunnel/sslio
67 -copy("/home/e-smith/ssl.pem/$s.$d.pem", "$pem.$$")
68 - or die "failed to copy SSL PEM: $!";
69 -chmod 0640, "$pem.$$";
70 -esmith::util::chownFile("root", "radiusd", "$pem.$$");
71 -rename("$pem.$$", "$pem")
72 - or die "failed to rename $pem.$$ to $pem: $!";
73 -
74 diff -Nur --no-dereference e-smith-radiusd-2.6.0.old/root/usr/lib/systemd/system/radiusd.service.d/50-koozali.conf e-smith-radiusd-2.6.0/root/usr/lib/systemd/system/radiusd.service.d/50-koozali.conf
75 --- e-smith-radiusd-2.6.0.old/root/usr/lib/systemd/system/radiusd.service.d/50-koozali.conf 2021-05-31 00:02:03.566000000 -0400
76 +++ e-smith-radiusd-2.6.0/root/usr/lib/systemd/system/radiusd.service.d/50-koozali.conf 2021-05-31 00:09:43.323000000 -0400
77 @@ -5,7 +5,7 @@
78 ExecStartPre=
79 ExecStartPre=/sbin/e-smith/service-status radiusd
80 ExecStartPre=/sbin/e-smith/systemd/radiusd-configure
81 -ExecStartPre=/sbin/e-smith/systemd/radiusd-certificate
82 +ExecStartPre=/sbin/e-smith/expand-template /etc/raddb/certs/radiusd.pem
83 ExecStartPre=-/bin/chown -R radiusd.radiusd /var/run/radiusd
84 ExecStartPre=/usr/sbin/radiusd -C
85 Restart=always

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed