Ignore:
Timestamp:
Nov 22, 2011, 12:45:17 AM (13 years ago)
Author:
achernya
Message:
Merge branches/fc15-dev to trunk
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-special.conf

    r1483 r2066  
    11Alias /__scripts/heartbeat /afs/athena.mit.edu/contrib/scripts/web_scripts/heartbeat
    2 Alias /__scripts/django/media /usr/lib/python2.6/site-packages/django/contrib/admin/media
     2Alias /__scripts/django/media /usr/lib/python2.7/site-packages/django/contrib/admin/media
    33Alias /__scripts /afs/athena.mit.edu/contrib/scripts/www
    44
    … …  
    99</Directory>
    1010
    11 <Directory /usr/lib/python2.6/site-packages/django/contrib/admin/media>
     11<Directory /usr/lib/python2.7/site-packages/django/contrib/admin/media>
    1212    <Files *>
    1313        SetHandler none

  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost-names.conf

    r1700 r2066  
    11ServerName scripts.mit.edu
    2 ServerAlias scripts 18.181.0.43 scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 scripts-test.mit.edu scripts-test 18.181.0.229 better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 whole-enchilada.mit.edu whole-enchilada w-e.mit.edu w-e scripts5.mit.edu scripts5 18.181.0.236 pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 localhost 127.0.0.1 ::1
     2ServerAlias \
     3    scripts 18.181.0.43 \
     4    scripts-vhosts.mit.edu scripts-vhosts 18.181.0.46 \
     5    scripts-test.mit.edu scripts-test 18.181.0.229 \
     6    better-mousetrap.mit.edu better-mousetrap b-m.mit.edu b-m scripts1.mit.edu scripts1 18.181.0.57 \
     7    old-faithful.mit.edu old-faithful o-f.mit.edu o-f scripts2.mit.edu scripts2 18.181.0.53 \
     8    bees-knees.mit.edu bees-knees b-k.mit.edu b-k sx-blade-4.mit.edu sx-blade-4 scripts3.mit.edu scripts3 18.181.0.167 \
     9    cats-whiskers.mit.edu cats-whiskers c-w.mit.edu c-w scripts4.mit.edu scripts4 18.181.0.228 \
     10    whole-enchilada.mit.edu whole-enchilada w-e.mit.edu w-e scripts5.mit.edu scripts5 18.181.0.236 \
     11    pancake-bunny.mit.edu pancake-bunny p-b.mit.edu p-b scripts6.mit.edu scripts6 18.181.0.237 \
     12    busy-beaver.mit.edu busy-beaver b-b.mit.edu b-b scripts7.mit.edu scripts7 18.181.0.234 \
     13    real-mccoy.mit.edu real-mccoy r-m.mit.edu r-m scripts8.mit.edu scripts8 18.181.0.235 \
     14    shining-armor.mit.edu shining-armor s-a.mit.edu s-a scripts9.mit.edu scripts9 18.181.0.135 \
     15    golden-egg.mit.edu golden-egg g-e.mit.edu g-e scripts10.mit.edu scripts10 18.181.0.141 \
     16    localhost 127.0.0.1 ::1

  • trunk/server/fedora/config/etc/httpd/conf.d/scripts-vhost.conf

    r811 r2066  
    11DocumentRoot /afs/athena.mit.edu/contrib/scripts/web_scripts/home
    22SuExecUserGroup scripts users
     3UserDir enabled
    34UserDir web_scripts
    45# Comment the following line out to take the machine out of the LVS pool
Note: See TracChangeset for help on using the changeset viewer.