/[smecontribs]/rpms/smeserver-wireguard/contribs10/smeserver-wireguard-1.0-bz11721-init.patch
ViewVC logotype

Diff of /rpms/smeserver-wireguard/contribs10/smeserver-wireguard-1.0-bz11721-init.patch

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

Revision 1.1 by jpp, Wed Oct 27 21:35:02 2021 UTC Revision 1.4 by jpp, Thu Oct 28 02:50:14 2021 UTC
# Line 10  diff -Nur --no-dereference smeserver-wir Line 10  diff -Nur --no-dereference smeserver-wir
10   }   }
11    
12   }   }
13    diff -Nur --no-dereference smeserver-wireguard-1.0.old/createlink smeserver-wireguard-1.0/createlink
14    --- smeserver-wireguard-1.0.old/createlink      2021-10-25 23:38:29.000000000 -0400
15    +++ smeserver-wireguard-1.0/createlink  2021-10-27 21:20:46.985000000 -0400
16    @@ -69,5 +69,5 @@
17     ));
18    
19    
20    -
21    +panel_link("wireguard", "manager");
22    
23    diff -Nur --no-dereference smeserver-wireguard-1.0.old/root/etc/e-smith/db/configuration/migrate/wireguard smeserver-wireguard-1.0/root/etc/e-smith/db/configuration/migrate/wireguard
24    --- smeserver-wireguard-1.0.old/root/etc/e-smith/db/configuration/migrate/wireguard     2021-10-27 21:17:33.367000000 -0400
25    +++ smeserver-wireguard-1.0/root/etc/e-smith/db/configuration/migrate/wireguard 2021-10-27 21:18:24.898000000 -0400
26    @@ -6,7 +6,7 @@
27       $DB->set_prop('wg-quick@wg0', 'private', $value ) ;
28     }
29     # recreate public if empty or not the same
30    -$private=${'wg-quick@wg0'}{'private'};
31    +$private=$DB->get_prop('wg-quick@wg0', 'private') ;
32     $public=`/usr/bin/echo $private | /usr/bin/wg pubkey`;
33     chomp $public;
34     if ( ! defined ${'wg-quick@wg0'}{'public'} ||  ${'wg-quick@wg0'}{'public'} ne $public) {
35    diff -Nur --no-dereference smeserver-wireguard-1.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70wireguard smeserver-wireguard-1.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70wireguard
36    --- smeserver-wireguard-1.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70wireguard      1969-12-31 19:00:00.000000000 -0500
37    +++ smeserver-wireguard-1.0/root/etc/e-smith/templates/etc/systemd/system-preset/49-koozali.preset/70wireguard  2021-06-28 03:17:15.000000000 -0400
38    @@ -0,0 +1,12 @@
39    +# wireguard specific configuration
40    +{
41    +$wg = $wireguard{status} || 'disabled';
42    +$wg0 = ${'wg-quick@wg0'}{status} || 'disabled';
43    +if ($wg0 eq 'enabled') {
44    +        $OUT .= "enable wg-quick\@wg0.service\n";
45    +} else {
46    +        $OUT .= "disable wg-quick\@wg0.service\n";
47    +}
48    +
49    +}
50    +
51    diff -Nur --no-dereference smeserver-wireguard-1.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/70wireguard smeserver-wireguard-1.0/root/etc/e-smith/templates/etc/systemd/system-preset/70wireguard
52    --- smeserver-wireguard-1.0.old/root/etc/e-smith/templates/etc/systemd/system-preset/70wireguard        2021-06-28 03:17:15.000000000 -0400
53    +++ smeserver-wireguard-1.0/root/etc/e-smith/templates/etc/systemd/system-preset/70wireguard    1969-12-31 19:00:00.000000000 -0500
54    @@ -1,12 +0,0 @@
55    -# wireguard specific configuration
56    -{
57    -$wg = $wireguard{status} || 'disabled';
58    -$wg0 = ${'wg-quick@wg0'}{status} || 'disabled';
59    -if ($wg0 eq 'enabled') {
60    -        $OUT .= "enable wg-quick\@wg0.service\n";
61    -} else {
62    -        $OUT .= "disable wg-quick\@wg0.service\n";
63    -}
64    -
65    -}
66    -
67    diff -Nur --no-dereference smeserver-wireguard-1.0.old/createlink smeserver-wireguard-1.0/createlink
68    --- smeserver-wireguard-1.0.old/createlink      2021-10-27 21:37:41.284000000 -0400
69    +++ smeserver-wireguard-1.0/createlink  2021-10-27 21:38:21.164000000 -0400
70    @@ -33,7 +33,7 @@
71           ));
72     event_services($event, qw(
73       masq restart
74    -  'wg-quick@wg0' restart
75    +  wg-quick@wg0 restart
76       ));
77     event_link("wireguard-network", $event, "30");
78    
79    @@ -44,7 +44,7 @@
80       /etc/wireguard/server_public.key
81     ));
82     event_services($event, qw(
83    -  'wg-quick@wg0' restart
84    +  wg-quick@wg0 restart
85     ));
86    
87     #wireguard-user-create
88    @@ -65,7 +65,7 @@
89       /etc/wireguard/server_public.key
90     ));
91     event_services($event, qw(
92    -  'wg-quick@wg0' restart
93    +  wg-quick@wg0 restart
94     ));
95    
96    
97    diff -Nur --no-dereference smeserver-wireguard-1.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wireguard smeserver-wireguard-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wireguard
98    --- smeserver-wireguard-1.0.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wireguard       2021-10-26 23:15:11.000000000 -0400
99    +++ smeserver-wireguard-1.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/wireguard   2021-10-27 21:41:45.296000000 -0400
100    @@ -239,6 +239,10 @@
101        <trans>You can not alter the server ip, mask, private and public key as there are already some clients configured.</trans>
102       </entry>
103    
104    +  <entry>
105    +   <base>NO_CONF</base>
106    +   <trans>No configured client</trans>
107    +  </entry>
108    
109    
110     </lexicon>

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed