Changeset 2574 for branches/fc20-dev


Ignore:
Timestamp:
Aug 24, 2014, 9:39:03 PM (8 years ago)
Author:
achernya
Message:
Merge r2551:2573 from trunk into branches/fc20-dev
Location:
branches/fc20-dev
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/fc20-dev

  • branches/fc20-dev/locker

  • branches/fc20-dev/lvs/debian/config/etc/ha.d/ldirectord.cf

    r2522 r2574  
    99        real=18.181.0.53:25  gate 4096 # old-faithful
    1010        real=18.181.0.57:25  gate 4096 # better-mousetrap
    11         real=18.181.0.167:25 gate 4096 # bees-knees
     11        #real=18.181.0.167:25 gate 4096 # bees-knees
    1212        #real=18.181.0.228:25 gate 1024 # cats-whiskers
    1313        #real=18.181.0.234:25 gate 4096 # busy-beaver
    1414        real=18.181.0.235:25 gate 4096 # real-mccoy
    15         real=18.181.0.237:25 gate 4096 # pancake-bunny
     15        #real=18.181.0.237:25 gate 4096 # pancake-bunny
    1616        real=18.181.0.236:25 gate 1024 # whole-enchilada
    1717        #real=18.181.0.135:25 gate 4096 # shining-armor
     
    3535        real=18.181.0.53  gate 4096 # old-faithful
    3636        real=18.181.0.57  gate 4096 # better-mousetrap
    37         real=18.181.0.167 gate 4096 # bees-knees
     37        #real=18.181.0.167 gate 4096 # bees-knees
    3838        #real=18.181.0.228 gate 1024 # cats-whiskers
    3939        #real=18.181.0.234 gate 4096 # busy-beaver
    4040        real=18.181.0.235 gate 4096 # real-mccoy
    41         real=18.181.0.237 gate 4096 # pancake-bunny
     41        #real=18.181.0.237 gate 4096 # pancake-bunny
    4242        real=18.181.0.236 gate 1024 # whole-enchilada
    4343        #real=18.181.0.135 gate 4096 # shining-armor
     
    6060        real=18.181.0.53  gate "heartbeat/services", "1"  # old-faithful
    6161        real=18.181.0.57  gate "heartbeat/services", "2"  # better-mousetrap
    62         real=18.181.0.167 gate "heartbeat/services", "3"  # bees-knees
     62        #real=18.181.0.167 gate "heartbeat/services", "3"  # bees-knees
    6363        #real=18.181.0.228 gate "heartbeat/services", "4"  # cats-whiskers
    6464        #real=18.181.0.234 gate "heartbeat/services", "5"  # busy-beaver
    6565        real=18.181.0.235 gate "heartbeat/services", "6"  # real-mccoy
    66         real=18.181.0.237 gate "heartbeat/services", "7"  # pancake-bunny
     66        #real=18.181.0.237 gate "heartbeat/services", "7"  # pancake-bunny
    6767        real=18.181.0.236 gate "heartbeat/services", "8"  # whole-enchilada
    6868        #real=18.181.0.135 gate "heartbeat/services", "9"  # shining-armor
     
    7676        checkport=80
    7777
    78 # sipb.mit.edu needs an FTP server
    79 virtual=4
    80         real=18.181.2.75 gate 1
    81         service=ftp
    82         scheduler=wlc
    83         protocol=fwm
    84         checktype=ping
    85         checkport=21
    86         persistent=600
    87        
     78## sipb.mit.edu needs an FTP server
     79#virtual=4
     80#       real=18.181.2.75 gate 1
     81#        service=ftp
     82#        scheduler=wlc
     83#        protocol=fwm
     84#        checktype=ping
     85#        checkport=21
     86#       persistent=600
  • branches/fc20-dev/server/fedora/config/etc/httpd/vhosts.d/debathena.conf

    r2541 r2574  
    33<VirtualHost *:80>
    44        ServerName debathena.mit.edu
    5         ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
     5        ServerAlias debathena
    66        DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    77        Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
     
    1414        <VirtualHost *:443>
    1515                ServerName debathena.mit.edu
    16                 ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
     16                ServerAlias debathena
    1717                DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    1818                Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
     
    2525        <VirtualHost *:444>
    2626                ServerName debathena.mit.edu
    27                 ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
     27                ServerAlias debathena
    2828                DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
    2929                Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
Note: See TracChangeset for help on using the changeset viewer.