/[smecontribs]/rpms/smeserver-openvpn-bridge/contribs10/smeserver-openvpn-bridge-2.1-bz1224-bz6155-logging.patch
ViewVC logotype

Annotation of /rpms/smeserver-openvpn-bridge/contribs10/smeserver-openvpn-bridge-2.1-bz1224-bz6155-logging.patch

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


Revision 1.2 - (hide annotations) (download)
Thu Nov 24 04:45:13 2022 UTC (23 months, 1 week ago) by jpp
Branch: MAIN
CVS Tags: smeserver-openvpn-bridge-2_1-23_el7_sme, smeserver-openvpn-bridge-2_1-22_el7_sme, HEAD
Changes since 1.1: +1 -1 lines
* Wed Nov 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 2.1-22.sme
- log to dedicated file [SME: 12242]
- use locale timezone for logging [SME: 6155]

1 jpp 1.1 diff -Nur --no-dereference smeserver-openvpn-bridge-2.1.old/createlinks smeserver-openvpn-bridge-2.1/createlinks
2     --- smeserver-openvpn-bridge-2.1.old/createlinks 2022-11-23 22:27:13.876000000 -0500
3     +++ smeserver-openvpn-bridge-2.1/createlinks 2022-11-23 23:21:09.586000000 -0500
4     @@ -20,6 +20,9 @@
5     event_link("openvpn-bridge-reload-ccd", "openvpn-bridge-reload-ccd", "20");
6     event_link("openvpn-bridge-update-crl", "openvpn-bridge-reload-ccd", "30");
7    
8     +event_link("openvpn-bridge-jail", "openvpn-bridge-update" , "03");
9     +event_link("openvpn-bridge-jail", "bootstrap-console-save" , "03");
10     +
11     # our event specific for updating with yum without reboot
12     $event = "smeserver-openvpn-bridge-update";
13     #add here the path to your templates needed to expand
14     @@ -39,7 +42,7 @@
15     #action needed in case we have a systemd unit
16     event_link("systemd-default", $event, "88");
17     event_link("systemd-reload", $event, "89");
18     -
19     +event_link("openvpn-bridge-jail", $event, "03");
20     #action specific to this package
21     event_link("openvpn-bridge-update", $event, "60");
22     #services we need to restart
23     diff -Nur --no-dereference smeserver-openvpn-bridge-2.1.old/root/etc/e-smith/events/actions/openvpn-bridge-jail smeserver-openvpn-bridge-2.1/root/etc/e-smith/events/actions/openvpn-bridge-jail
24     --- smeserver-openvpn-bridge-2.1.old/root/etc/e-smith/events/actions/openvpn-bridge-jail 1969-12-31 19:00:00.000000000 -0500
25     +++ smeserver-openvpn-bridge-2.1/root/etc/e-smith/events/actions/openvpn-bridge-jail 2022-11-23 23:18:28.103000000 -0500
26     @@ -0,0 +1,6 @@
27     +#!/bin/bash
28     +
29     +#copy any files needed for the jail
30     +
31     +#be sure we have the needed timezone
32 jpp 1.2 +/bin/cp -L /etc/localtime /etc/openvpn/bridge/etc
33 jpp 1.1 diff -Nur --no-dereference smeserver-openvpn-bridge-2.1.old/root/etc/e-smith/templates/etc/openvpn/bridge/openvpn.conf/90log smeserver-openvpn-bridge-2.1/root/etc/e-smith/templates/etc/openvpn/bridge/openvpn.conf/90log
34     --- smeserver-openvpn-bridge-2.1.old/root/etc/e-smith/templates/etc/openvpn/bridge/openvpn.conf/90log 2013-11-11 12:27:02.000000000 -0500
35     +++ smeserver-openvpn-bridge-2.1/root/etc/e-smith/templates/etc/openvpn/bridge/openvpn.conf/90log 2022-11-23 23:15:38.957000000 -0500
36     @@ -1,9 +1,9 @@
37     # Log
38     status-version 2
39     status bridge-status.txt
40     -suppress-timestamps
41     {
42     my $OUT = '';
43     my $verb = ${'openvpn-bridge'}{verbose} || '3';
44     $OUT .= "verb $verb\n";
45     }
46     +log-append /var/log/openvpn-bridge/openvpn-bridge.log
47     diff -Nur --no-dereference smeserver-openvpn-bridge-2.1.old/root/etc/logrotate.d/openvpn-bridge smeserver-openvpn-bridge-2.1/root/etc/logrotate.d/openvpn-bridge
48     --- smeserver-openvpn-bridge-2.1.old/root/etc/logrotate.d/openvpn-bridge 1969-12-31 19:00:00.000000000 -0500
49     +++ smeserver-openvpn-bridge-2.1/root/etc/logrotate.d/openvpn-bridge 2022-11-23 23:14:42.836000000 -0500
50     @@ -0,0 +1,8 @@
51     +/var/log/openvpn-bridge/*.log{
52     + monthly
53     + rotate 6
54     + compress
55     + copytruncate
56     + missingok
57     +}
58     +

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