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

Contents 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.3 - (show annotations) (download)
Sun Jan 4 15:23:19 2015 UTC (9 years, 9 months ago) by stephdl
Branch: MAIN
CVS Tags: e-smith-ibays-2_4_0-14_el6_sme, e-smith-ibays-2_4_0-13_el6_sme, HEAD
Changes since 1.2: +13 -5 lines
corrected typos in e-smith-ibays-2.4.0_addtmpfolder_to_ibays.patch and disabled that patch in the spec file, waiting to do a new tarball cos I want to add the tmp folder in the /etc/e-smith/templates/skell/ibay

1 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 @@ -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 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-04 15:42:23.594891869 +0100
31 +++ e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/events/actions/init-ibays 2015-01-04 15:43:54.275788309 +0100
32 @@ -25,6 +25,7 @@
33 use strict;
34 use Errno;
35 use esmith::util;
36 +use esmith::AccountsDB;
37
38 # Populate pre-defined Primary i-bay
39 # Start with top level owner/permissions
40 @@ -59,5 +60,27 @@
41 "/home/e-smith/files/ibays/Primary/html/index.htm");
42 }
43
44 +#we want to create the folder tmp if enabled in all Ibays(enabled by default)
45 +#introduced by the bug [SME: 7011]
46 +my $accounts = esmith::AccountsDB->open_ro or warn "Could not open account database: $!";
47 +my @ibays = $accounts->ibays;
48 +my $uid = '102'; #or www
49 +my $gid = '102'; #or www
50 +
51 +foreach my $ibay (@ibays)
52 +{
53 + #Then we retrieve the name of the ebay
54 + my $key = $ibay->key;
55 + my $tmpdb = $ibay->prop('PHPTmpDir') || 'enabled';
56 + my $path = (('/home/e-smith/files/ibays/') . $key . '/tmp');
57 +
58 + #we test the condition if /tmp exists or if it is disabled in the Ibay
59 + unless (-d $path || $tmpdb eq "disabled")
60 + {
61 + mkdir $path, 0700 or warn "Could not create dir $path: $!";
62 + chown $uid, $gid, $path or warn "Could not chown dir $path: $!";
63 + }
64 +}
65 +
66 exit (0);
67
68 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
69 --- e-smith-ibays-2.4.0/root/etc/e-smith/skel/ibay/tmp/.cvs_ignore 1970-01-01 01:00:00.000000000 +0100
70 +++ e-smith-ibays-2.4.0.bz7011/root/etc/e-smith/skel/ibay/tmp/.cvs_ignore 2015-01-03 23:58:20.889702229 +0100
71 @@ -0,0 +1 @@
72 +#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