/[smecontribs]/rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager-2.0.4-bz11506-noCustomTemplates.patch
ViewVC logotype

Annotation of /rpms/smeserver-dhcpmanager/contribs10/smeserver-dhcpmanager-2.0.4-bz11506-noCustomTemplates.patch

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

Revision 1.1 - (hide annotations) (download)
Wed Mar 31 01:59:48 2021 UTC (3 years, 8 months ago) by jpp
Branch: MAIN 
* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.0.4-11.sme
- removing tmeplate custom, merged with core [SME: 11506]
1 jpp 1.1 diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers
2     --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers 2015-08-13 08:43:24.000000000 -0400
3     +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25DomainNameServers 1969-12-31 19:00:00.000000000 -0500
4     @@ -1,22 +0,0 @@
5     -{
6     -
7     - my $dhcpdnscustom = $DB->get_prop('dhcpd', 'dnscustom');
8     - my $dhcpdns1server = $DB->get_prop('dhcpd', 'dns1server');
9     - my $dhcpdns2server = $DB->get_prop('dhcpd', 'dns2server');
10     -
11     - if ($dhcpdnscustom eq 'enabled')
12     - {
13     - if ($dhcpdns2server eq "" )
14     - {
15     - $OUT .= " option domain-name-servers $dhcpdns1server;";
16     - }
17     - else
18     - {
19     - $OUT .= " option domain-name-servers $dhcpdns1server, $dhcpdns2server;";
20     - }
21     - }
22     - else
23     - {
24     - $OUT .= " option domain-name-servers $LocalIP;";
25     - }
26     -}
27     diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault
28     --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault 2015-08-13 08:43:24.000000000 -0400
29     +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeDefault 1969-12-31 19:00:00.000000000 -0500
30     @@ -1,4 +0,0 @@
31     -{
32     - my $dhcpleasetime = $DB->get_prop('dhcpd', 'leasetime') || 86400;
33     - $OUT .= " default-lease-time $dhcpleasetime;";
34     -}
35     diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax
36     --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax 2015-08-13 08:43:24.000000000 -0400
37     +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25LeaseTimeMax 1969-12-31 19:00:00.000000000 -0500
38     @@ -1,6 +0,0 @@
39     -{
40     -
41     - my $leasetime = $DB->get_prop('dhcpd', 'leasetime') || 86400;
42     - my $maxleasetime = 7 * $leasetime;
43     - $OUT .= " max-lease-time $maxleasetime;";
44     -}
45     diff -Nur --no-dereference smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers
46     --- smeserver-dhcpmanager-2.0.4.old/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers 2015-08-13 08:43:24.000000000 -0400
47     +++ smeserver-dhcpmanager-2.0.4/root/etc/e-smith/templates-custom/etc/dhcpd.conf/25Routers 1969-12-31 19:00:00.000000000 -0500
48     @@ -1,21 +0,0 @@
49     -{
50     -
51     - my $dhcpgatewaycustom = $DB->get_prop('dhcpd', 'gatewaycustom');
52     - my $dhcpgateway= $DB->get_prop('dhcpd', 'gateway');
53     - if ($dhcpgatewaycustom eq 'enabled')
54     - {
55     - $OUT .= " option routers $dhcpgateway;";
56     - }
57     - else
58     - {
59     - my $router = (defined $SystemMode && $SystemMode =~ /servergateway/)
60     - ? $LocalIP :
61     - defined $GatewayIP ? $GatewayIP : undef;
62     -
63     - $OUT = "";
64     - if ($router)
65     - {
66     - $OUT .= " option routers $router;";
67     - }
68     - }
69     -}
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed