/[smecontribs]/rpms/smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s-0.1-remove_useless_samba_template.patch
ViewVC logotype

Contents of /rpms/smeserver-openvpn-s2s/contribs7/smeserver-openvpn-s2s-0.1-remove_useless_samba_template.patch

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


Revision 1.1 - (show annotations) (download)
Tue Dec 7 19:35:25 2010 UTC (13 years, 4 months ago) by vip-ire
Branch: MAIN
CVS Tags: smeserver-openvpn-s2s-0_1-15_el4_sme, smeserver-openvpn-s2s-0_1-19_el4_sme, smeserver-openvpn-s2s-0_1-18_el4_sme, smeserver-openvpn-s2s-0_1-16_el4_sme, smeserver-openvpn-s2s-0_1-20_el4_sme, smeserver-openvpn-s2s-0_1-21_el4_sme, HEAD
* Tue Dec 7 2010 Daniel Berteaud <daniel@firewall-services.com> 0.1-15.sme
- Remove useless smb.conf template

1 diff -Nur smeserver-openvpn-s2s-0.1/createlinks smeserver-openvpn-s2s-0.1_mod/createlinks
2 --- smeserver-openvpn-s2s-0.1/createlinks 2010-12-07 20:30:52.000000000 +0100
3 +++ smeserver-openvpn-s2s-0.1_mod/createlinks 2010-12-07 20:31:45.000000000 +0100
4 @@ -4,8 +4,6 @@
5
6 safe_symlink("restart", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/openvpn-s2s");
7 safe_symlink("adjust", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/masq");
8 -safe_symlink("restart", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/smbd");
9 -safe_symlink("restart", "root/etc/e-smith/events/openvpn-s2s-update/services2adjust/nmbd");
10
11 service_link_enhanced("openvpn-s2s", "S80", "7");
12 service_link_enhanced("openvpn-s2s", "K25", "6");
13 @@ -18,7 +16,6 @@
14
15 templates2events("/etc/rc.d/init.d/masq", qw/openvpn-s2s-update/);
16 templates2events("/etc/crontab", qw/openvpn-s2s-update/);
17 -templates2events("/etc/samba/smb.conf", qw/openvpn-s2s-update/);
18
19
20 panel_link("openvpns2s", 'manager');
21 diff -Nur smeserver-openvpn-s2s-0.1/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn smeserver-openvpn-s2s-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn
22 --- smeserver-openvpn-s2s-0.1/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn 2010-10-16 17:56:47.000000000 +0200
23 +++ smeserver-openvpn-s2s-0.1_mod/root/etc/e-smith/templates/etc/smb.conf/11interfaces_vpn 1970-01-01 01:00:00.000000000 +0100
24 @@ -1,18 +0,0 @@
25 -{
26 -# Configure Samba to use multiple interfaces
27 -# If you have multiple network interfaces then you must list them
28 -# here. See the man page for details.
29 -}
30 -interfaces = 127.0.0.1 {
31 - $OUT .= (defined $LocalIP ?
32 - "$LocalIP/$LocalNetmask" :
33 - "");
34 - my $vpndb = esmith::ConfigDB->open_ro('openvpn-s2s') || die "Couldn't open openvpn-s2s DB\n";
35 - my @vpns = ($vpndb->get_all_by_prop(type=>'client'), $vpndb->get_all_by_prop(type=>'server'));
36 - foreach my $vpn (@vpns){
37 - if ($vpn->prop('status') eq 'enabled'){
38 - $OUT .= " " . $vpn->prop('LocalIP') . "/32";
39 - }
40 - }
41 -}
42 -

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