/[smeserver]/rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0_addtmpfolder_to_ibays.patch
ViewVC logotype

Annotation of /rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0_addtmpfolder_to_ibays.patch

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


Revision 1.2 - (hide annotations) (download)
Sat Jan 3 23:08:30 2015 UTC (9 years, 5 months ago) by stephdl
Branch: MAIN
CVS Tags: e-smith-ibays-2_4_0-12_el6_sme
Changes since 1.1: +39 -8 lines
* Sun Jan 4 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 2.4.0-12.sme
- Add an upload_tmp_folder setting by db command [sme: 7011]
- Thanks to Michael McCarn and Jean-philippe Pialasse
- the folder /tmp is created by the event init-ibays
- the event ibay-modify create/chown/chmod the folder /tmp

1 stephdl 1.2 diff -Nur e-smith-ibays-2.4.0/root/etc/e-smith/events/actions/ibay-modify e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/events/actions/ibay-modify
2     --- e-smith-ibays-2.4.0/root/etc/e-smith/events/actions/ibay-modify 2013-01-31 22:31:37.000000000 +0100
3     +++ e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/events/actions/ibay-modify 2015-01-03 22:24:18.806618131 +0100
4 stephdl 1.1 @@ -158,6 +158,10 @@
5     #--------------------------------------------------
6     # main directory is writeable only by root
7     #--------------------------------------------------
8     +##create the upload_tmp_folder in the ibay if PHPTmpDir is set to 'enabled'
9     +my $tmpdir = $ibay->prop('PHPTmpDir') || 'enabled';
10     +$tmpdir = ('/home/e-smith/files/ibays/' . $ibay->key . '/tmp') if $tmpdir eq 'enabled';
11     +mkdir $tmpdir unless (-d $tmpdir || $tmpdir eq "disabled");
12    
13     chdir "/home/e-smith/files/ibays/$ibayName"
14     or ( $x = 255, warn "Could not chdir to /home/e-smith/files/ibays/$ibayName" );
15     @@ -227,6 +231,13 @@
16     $experm |= $::fileperm;
17     chmod $experm, $_;
18     }
19     + ##chmod 0700 ; chown www:www if upload_tmp_folder exists
20     + my $tmpdirperm = (('/home/e-smith/files/ibays/' . $ibay->key . '/tmp')||'');
21     + if ( -d $tmpdirperm)
22     + {
23     + system ('/bin/chown', '-R', 'www:www' , $tmpdirperm);
24     + system ('/bin/chmod' ,'-R', '0700' , $tmpdirperm );
25     + }
26     }
27     }
28    
29 stephdl 1.2 diff -Nur e-smith-ibays-2.4.0/root/etc/e-smith/events/actions/init-ibays e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/events/actions/init-ibays
30     --- e-smith-ibays-2.4.0/root/etc/e-smith/events/actions/init-ibays 2015-01-03 23:58:49.961908458 +0100
31     +++ e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/events/actions/init-ibays 2015-01-03 23:48:40.862552687 +0100
32     @@ -59,5 +59,27 @@
33     "/home/e-smith/files/ibays/Primary/html/index.htm");
34     }
35    
36     +#we want to create the folder /tmp if enabled in all Ibays(enabled by default)
37     +#introduced by the bug [SME: 7011]
38     +my $accounts = esmith::AccountsDB->open_ro or warn "Could not open account database: $!";
39     +my @ibays = $accounts->ibays;
40     +my $uid = '102'; #or www
41     +my $gid = '102'; #or www
42     +
43     +foreach my $ibay (@ibays)
44     +{
45     + #Then we retrieve the name of the ebay
46     + my $key = $ibay->key;
47     + my $tmpdb = $ibay->prop('PHPTmpDir') || 'enabled';
48     + my $path = (('/home/e-smith/files/ibays/') . $key . '/tmp');
49     +
50     + #we test the condition if /tmp exists or if it is disabled in the Ibay
51     + if (!-d $path || $tmpdb eq "disabled")
52     + {
53     + mkdir $path, 0700 or warn "Could not create dir $path: $!";
54     + chown $uid, $gid, $path or warn "Could not chown dir $path: $!";
55     + }
56     +}
57     +
58     exit (0);
59    
60     diff -Nur e-smith-ibays-2.4.0/root/etc/e-smith/skel/ibay/tmp/.cvs_ignore e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/skel/ibay/tmp/.cvs_ignore
61     --- e-smith-ibays-2.4.0/root/etc/e-smith/skel/ibay/tmp/.cvs_ignore 1970-01-01 01:00:00.000000000 +0100
62     +++ e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/skel/ibay/tmp/.cvs_ignore 2015-01-03 23:58:20.889702229 +0100
63     @@ -0,0 +1 @@
64     +#added to create the /etc/e-smith/skel/ibay/tmp folder

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