smeserver-shared-folders/contribs9/smeserver-shared-folders-0.1-enhance_recylce_bin.patch

diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify
--- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify   2010-11-26 10:38:39.000000000 +0100
+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2010-11-26 10:38:09.000000000 +0100
@@ -57,6 +57,16 @@
 
 }
 
+#------------------------------------------------------------
+# Create the recylce bin directory if needed
+#------------------------------------------------------------
+if (($share->prop('RecycleBin') || 'disabled' eq 'enabled') ||
+   ($share->prop('RecycleBin') || 'disabled' eq 'keep-versions')){
+    my $recycle = $share->prop('RecycleBinDir') || "Recycle Bin";
+    system("/bin/mkdir", "-p",
+        "/home/e-smith/files/shares/$shareName/files/$recycle") == 0
+            or die "Error creating recycle bin directory";
+}
 
 #------------------------------------------------------------
 # Fix permissions on share files.
@@ -106,10 +116,17 @@
            foreach my $group (@read){
                 $acl .= 'g:'.$group.':rx,';
             }
+           # Set the effective ACLs
            system($setfacl,
                        '-m',
                        $acl,
                        $_);
+            # Set the defaults ACLs
+           system($setfacl,
+                       '-d',
+                       '-m',
+                       $acl,
+                       $_);
        }
        elsif (-f)
        {
diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin
--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin    2010-11-26 10:38:39.000000000 +0100
+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin  2010-11-26 10:37:00.000000000 +0100
@@ -3,7 +3,7 @@
     return if (($share->prop('RecycleBin') || 'disabled') eq 'disabled');
 
     $share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') || 'disabled') eq 'keep-versions' ?  "True" : "False";
-    $share_vfs->{recycle}->{repository} = "Recycle Bin";
+    $share_vfs->{recycle}->{repository} = ($share->prop('RecycleBinDir') || "Recycle Bin");
     $share_vfs->{recycle}->{keeptree} = "True";
     $share_vfs->{recycle}->{touch} = "True";
     $share_vfs->{recycle}->{exclude} = "*.tmp,*.temp,*.o,*.obj,~\$*,.~lock.*";
1	vip-ire	1.1	diff -Nur -x '.orig' -x '.rej' smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify
2			--- smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2010-11-26 10:38:39.000000000 +0100
3			+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/events/actions/share-modify 2010-11-26 10:38:09.000000000 +0100
4			@@ -57,6 +57,16 @@
5
6			}
7
8			+#------------------------------------------------------------
9			+# Create the recylce bin directory if needed
10			+#------------------------------------------------------------
11			+if (($share->prop('RecycleBin') \|\| 'disabled' eq 'enabled') \|\|
12			+ ($share->prop('RecycleBin') \|\| 'disabled' eq 'keep-versions')){
13			+ my $recycle = $share->prop('RecycleBinDir') \|\| "Recycle Bin";
14			+ system("/bin/mkdir", "-p",
15			+ "/home/e-smith/files/shares/$shareName/files/$recycle") == 0
16			+ or die "Error creating recycle bin directory";
17			+}
18
19			#------------------------------------------------------------
20			# Fix permissions on share files.
21			@@ -106,10 +116,17 @@
22			foreach my $group (@read){
23			$acl .= 'g:'.$group.':rx,';
24			}
25			+ # Set the effective ACLs
26			system($setfacl,
27			'-m',
28			$acl,
29			$_);
30			+ # Set the defaults ACLs
31			+ system($setfacl,
32			+ '-d',
33			+ '-m',
34			+ $acl,
35			+ $_);
36			}
37			elsif (-f)
38			{
39			diff -Nur -x '.orig' -x '.rej' smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin
40			--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2010-11-26 10:38:39.000000000 +0100
41			+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/smb.conf/shares/10recyclebin 2010-11-26 10:37:00.000000000 +0100
42			@@ -3,7 +3,7 @@
43			return if (($share->prop('RecycleBin') \|\| 'disabled') eq 'disabled');
44
45			$share_vfs->{recycle}->{versions} = ($share->prop('RecycleBin') \|\| 'disabled') eq 'keep-versions' ? "True" : "False";
46			- $share_vfs->{recycle}->{repository} = "Recycle Bin";
47			+ $share_vfs->{recycle}->{repository} = ($share->prop('RecycleBinDir') \|\| "Recycle Bin");
48			$share_vfs->{recycle}->{keeptree} = "True";
49			$share_vfs->{recycle}->{touch} = "True";
50			$share_vfs->{recycle}->{exclude} = ".tmp,.temp,.o,.obj,~\$,.~lock.";