/[smecontribs]/rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0.bz11086-add-missing-conf-details.patch
ViewVC logotype

Contents of /rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud-1.2.0.bz11086-add-missing-conf-details.patch

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


Revision 1.1 - (show annotations) (download)
Thu Nov 12 11:13:45 2020 UTC (3 years, 5 months ago) by jcrisp
Branch: MAIN
CVS Tags: smeserver-nextcloud-1_2_0-7_el7_sme, smeserver-nextcloud-1_2_0-6_el7_sme, smeserver-nextcloud-1_2_0-26_el7_sme, smeserver-nextcloud-1_2_0-27_el7_sme, smeserver-nextcloud-1_2_0-22_el7_sme, smeserver-nextcloud-1_2_0-25_el7_sme, smeserver-nextcloud-1_2_0-13_el7_sme, smeserver-nextcloud-1_2_0-21_el7_sme, smeserver-nextcloud-1_2_0-12_el7_sme, smeserver-nextcloud-1_2_0-28_el7_sme, smeserver-nextcloud-1_2_0-10_el7_sme, smeserver-nextcloud-1_2_0-23_el7_sme, smeserver-nextcloud-1_2_0-20_el7_sme, smeserver-nextcloud-1_2_0-8_el7_sme, smeserver-nextcloud-1_2_0-4_el7_sme, smeserver-nextcloud-1_2_0-5_el7_sme, smeserver-nextcloud-1_2_0-16_el7_sme, smeserver-nextcloud-1_2_0-18_el7_sme, smeserver-nextcloud-1_2_0-15_el7_sme, smeserver-nextcloud-1_2_0-14_el7_sme, smeserver-nextcloud-1_2_0-11_el7_sme, smeserver-nextcloud-1_2_0-29_el7_sme, smeserver-nextcloud-1_2_0-9_el7_sme, smeserver-nextcloud-1_2_0-24_el7_sme, smeserver-nextcloud-1_2_0-30_el7_sme, smeserver-nextcloud-1_2_0-17_el7_sme, smeserver-nextcloud-1_2_0-19_el7_sme, HEAD
* Thu Nov 12 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-4.sme
- Add missing SMB configuration details including domain/workgroup

1 diff -ruN smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf
2 --- smeserver-nextcloud-1.2.0.old/root/etc/e-smith/events/actions/nextcloud-occ-conf 2020-11-12 11:31:32.372096063 +0100
3 +++ smeserver-nextcloud-1.2.0/root/etc/e-smith/events/actions/nextcloud-occ-conf 2020-11-12 11:34:44.206085546 +0100
4 @@ -85,6 +85,7 @@
5 my $local = $cdb->get_value('LocalIP');
6 my $remote = $cdb->get_value('ExternalIP') || "";
7 my $comp1 = Array::Compare->new;
8 +my $workgroup = $cdb->get_prop('smb','Workgroup');
9
10 # update trusted domains
11 OCC "config:system:set trusted_domains 0 --value=$fqdn";
12 @@ -176,7 +177,7 @@
13 if (scalar(@matching_keys) == 0) {
14 #if none create
15 if ($storage eq "smb") {
16 - $id = OCCr "files_external:create -c share=$key -c host=localhost 'ibays/$key' smb password::logincredentials --output json";
17 + $id = OCCr "files_external:create -c share=$key -c host=localhost -c domain=$workgroup -c root='' -c show_hidden=false -c check_acl=false -c timeout='' 'ibays/$key' smb password::logincredentials --output json";
18 } else {
19 $id = OCCr "files_external:create -c datadir=/home/e-smith/files/$typ/$key 'ibays/$key' local null::null --output json";
20 }
21 @@ -264,7 +265,7 @@
22 # if none create
23 if (scalar(@matching_keys) == 0) {
24 #if none create
25 - $id = OCCr "files_external:create -c share=$key -c host=localhost '$key' smb password::logincredentials --output json";
26 + $id = OCCr "files_external:create -c share=$key -c host=localhost -c domain=$workgroup -c root='' -c show_hidden=false -c check_acl=false -c timeout='' '$key' smb password::logincredentials --output json";
27 OCC "files_external:applicable --add-user $user $id";
28 push @idOK,$id;
29 print "created home dir for $key $user\n";

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