1 |
diff -c -r -N e-smith-user-webspace-0.1.vanilla/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/50UserDir00 e-smith-user-webspace-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/50UserDir00 |
2 |
*** e-smith-user-webspace-0.1.vanilla/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/50UserDir00 Thu Jan 1 10:00:00 1970 |
3 |
--- e-smith-user-webspace-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/50UserDir00 Wed Nov 22 12:44:13 2000 |
4 |
*************** |
5 |
*** 0 **** |
6 |
--- 1,12 ---- |
7 |
+ |
8 |
+ # UserDir: The name of the directory which is appended onto a user's home |
9 |
+ # directory if a ~user request is recieved. |
10 |
+ { |
11 |
+ my %conf; |
12 |
+ tie %conf, 'esmith::config'; |
13 |
+ |
14 |
+ (defined($conf{'UserPublicWeb'}) && ($conf{'UserPublicWeb'} eq "on")) |
15 |
+ ? "UserDir home/public_html" |
16 |
+ : "#UserDir home/public_html" |
17 |
+ } |
18 |
+ |
19 |
diff -c -r -N e-smith-user-webspace-0.1.vanilla/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50userdir e-smith-user-webspace-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50userdir |
20 |
*** e-smith-user-webspace-0.1.vanilla/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50userdir Thu Jan 1 10:00:00 1970 |
21 |
--- e-smith-user-webspace-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50userdir Wed Nov 22 12:53:31 2000 |
22 |
*************** |
23 |
*** 0 **** |
24 |
--- 1,49 ---- |
25 |
+ { |
26 |
+ my %conf; |
27 |
+ tie %conf, 'esmith::config'; |
28 |
+ |
29 |
+ my %accounts; |
30 |
+ tie %accounts, 'esmith::config', '/home/e-smith/accounts'; |
31 |
+ |
32 |
+ my $key; |
33 |
+ my $value; |
34 |
+ my $result = ""; |
35 |
+ |
36 |
+ # Global user dir assignments. Give ~user access |
37 |
+ # Turned on/off globally through the var UserPublicWeb |
38 |
+ # eg. to turn on run /sbin/e-smith/config set UserPublicWeb on |
39 |
+ # to turn off run /sbin/e-smith/config set UserPublicWeb off |
40 |
+ if(defined($conf{'UserPublicWeb'}) && ($conf{'UserPublicWeb'} eq "on")) |
41 |
+ { |
42 |
+ $result .= "#-------------------------------------------------------\n"; |
43 |
+ $result .= "# Alias to enable /user aswell as /~user access\n"; |
44 |
+ $result .= "#-------------------------------------------------------\n"; |
45 |
+ while (($key,$value) = each %accounts) |
46 |
+ { |
47 |
+ my ($type, %properties) = split (/\|/, $value, -1); |
48 |
+ if ($type eq 'user') |
49 |
+ { |
50 |
+ $result .= "Alias /$key /home/e-smith/files/users/$key/home/public_html\n"; |
51 |
+ } |
52 |
+ } |
53 |
+ |
54 |
+ $result .= "\n"; |
55 |
+ $result .= "#-------------------------------------------------------\n"; |
56 |
+ $result .= "#Generic user dir access directive\n"; |
57 |
+ $result .= "#-------------------------------------------------------\n"; |
58 |
+ $result .= "<Directory /home/e-smith/files/users/*/home/public_html>\n"; |
59 |
+ $result .= " AllowOverride FileInfo AuthConfig Limit\n"; |
60 |
+ $result .= " Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec\n"; |
61 |
+ $result .= " <Limit GET POST OPTIONS PROPFIND>\n"; |
62 |
+ $result .= " Order allow,deny\n"; |
63 |
+ $result .= " Allow from all\n"; |
64 |
+ $result .= " </Limit>\n"; |
65 |
+ $result .= " <Limit PUT DELETE PATCH PROPPATCH MKCOL COPY MOVE LOCK UNLOCK>\n"; |
66 |
+ $result .= " Order deny,allow\n"; |
67 |
+ $result .= " Deny from all\n"; |
68 |
+ $result .= " </Limit>\n"; |
69 |
+ $result .= "</Directory>\n"; |
70 |
+ } |
71 |
+ $result; |
72 |
+ } |
73 |
+ |