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 *** 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 --- e-smith-user-webspace-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/50UserDir00 Wed Nov 22 12:44:13 2000 *************** *** 0 **** --- 1,12 ---- + + # UserDir: The name of the directory which is appended onto a user's home + # directory if a ~user request is recieved. + { + my %conf; + tie %conf, 'esmith::config'; + + (defined($conf{'UserPublicWeb'}) && ($conf{'UserPublicWeb'} eq "on")) + ? "UserDir home/public_html" + : "#UserDir home/public_html" + } + 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 *** 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 --- 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 *************** *** 0 **** --- 1,49 ---- + { + my %conf; + tie %conf, 'esmith::config'; + + my %accounts; + tie %accounts, 'esmith::config', '/home/e-smith/accounts'; + + my $key; + my $value; + my $result = ""; + + # Global user dir assignments. Give ~user access + # Turned on/off globally through the var UserPublicWeb + # eg. to turn on run /sbin/e-smith/config set UserPublicWeb on + # to turn off run /sbin/e-smith/config set UserPublicWeb off + if(defined($conf{'UserPublicWeb'}) && ($conf{'UserPublicWeb'} eq "on")) + { + $result .= "#-------------------------------------------------------\n"; + $result .= "# Alias to enable /user aswell as /~user access\n"; + $result .= "#-------------------------------------------------------\n"; + while (($key,$value) = each %accounts) + { + my ($type, %properties) = split (/\|/, $value, -1); + if ($type eq 'user') + { + $result .= "Alias /$key /home/e-smith/files/users/$key/home/public_html\n"; + } + } + + $result .= "\n"; + $result .= "#-------------------------------------------------------\n"; + $result .= "#Generic user dir access directive\n"; + $result .= "#-------------------------------------------------------\n"; + $result .= "\n"; + $result .= " AllowOverride FileInfo AuthConfig Limit\n"; + $result .= " Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec\n"; + $result .= " \n"; + $result .= " Order allow,deny\n"; + $result .= " Allow from all\n"; + $result .= " \n"; + $result .= " \n"; + $result .= " Order deny,allow\n"; + $result .= " Deny from all\n"; + $result .= " \n"; + $result .= "\n"; + } + $result; + } +