Changeset 2574 for branches

Timestamp:

Aug 24, 2014, 9:39:03 PM (10 years ago)

Author:

achernya

Message:

Merge r2551:2573 from trunk into branches/fc20-dev

Location:

branches/fc20-dev

Files:

• . (modified) (1 prop)
• locker (modified) (1 prop)
• lvs/debian/config/etc/ha.d/ldirectord.cf (modified) (4 diffs)
• server/fedora/config/etc/httpd/vhosts.d/debathena.conf (modified) (3 diffs)

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

@@ -9 +9 @@
         real=18.181.0.53:25  gate 4096 # old-faithful
         real=18.181.0.57:25  gate 4096 # better-mousetrap
-        real=18.181.0.167:25 gate 4096 # bees-knees
+        #real=18.181.0.167:25 gate 4096 # bees-knees
         #real=18.181.0.228:25 gate 1024 # cats-whiskers
         #real=18.181.0.234:25 gate 4096 # busy-beaver
         real=18.181.0.235:25 gate 4096 # real-mccoy
-        real=18.181.0.237:25 gate 4096 # pancake-bunny
+        #real=18.181.0.237:25 gate 4096 # pancake-bunny
         real=18.181.0.236:25 gate 1024 # whole-enchilada
         #real=18.181.0.135:25 gate 4096 # shining-armor
@@ -35 +35 @@
         real=18.181.0.53  gate 4096 # old-faithful
         real=18.181.0.57  gate 4096 # better-mousetrap
-        real=18.181.0.167 gate 4096 # bees-knees
+        #real=18.181.0.167 gate 4096 # bees-knees
         #real=18.181.0.228 gate 1024 # cats-whiskers
         #real=18.181.0.234 gate 4096 # busy-beaver
         real=18.181.0.235 gate 4096 # real-mccoy
-        real=18.181.0.237 gate 4096 # pancake-bunny
+        #real=18.181.0.237 gate 4096 # pancake-bunny
         real=18.181.0.236 gate 1024 # whole-enchilada
         #real=18.181.0.135 gate 4096 # shining-armor
@@ -60 +60 @@
         real=18.181.0.53  gate "heartbeat/services", "1"  # old-faithful
         real=18.181.0.57  gate "heartbeat/services", "2"  # better-mousetrap
-        real=18.181.0.167 gate "heartbeat/services", "3"  # bees-knees
+        #real=18.181.0.167 gate "heartbeat/services", "3"  # bees-knees
         #real=18.181.0.228 gate "heartbeat/services", "4"  # cats-whiskers
         #real=18.181.0.234 gate "heartbeat/services", "5"  # busy-beaver
         real=18.181.0.235 gate "heartbeat/services", "6"  # real-mccoy
-        real=18.181.0.237 gate "heartbeat/services", "7"  # pancake-bunny
+        #real=18.181.0.237 gate "heartbeat/services", "7"  # pancake-bunny
         real=18.181.0.236 gate "heartbeat/services", "8"  # whole-enchilada
         #real=18.181.0.135 gate "heartbeat/services", "9"  # shining-armor
@@ -76 +76 @@
         checkport=80
 
-# sipb.mit.edu needs an FTP server
-virtual=4
-        real=18.181.2.75 gate 1
-        service=ftp
-        scheduler=wlc
-        protocol=fwm
-        checktype=ping
-        checkport=21
-        persistent=600
-        
+## sipb.mit.edu needs an FTP server
+#virtual=4
+#       real=18.181.2.75 gate 1
+#        service=ftp
+#        scheduler=wlc
+#        protocol=fwm
+#        checktype=ping
+#        checkport=21
+#       persistent=600

branches/fc20-dev/server/fedora/config/etc/httpd/vhosts.d/debathena.conf

@@ -3 +3 @@
 <VirtualHost *:80>
         ServerName debathena.mit.edu
-        ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
+        ServerAlias debathena
         DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
         Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
@@ -14 +14 @@
         <VirtualHost *:443>
                 ServerName debathena.mit.edu
-                ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
+                ServerAlias debathena
                 DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
                 Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts
@@ -25 +25 @@
         <VirtualHost *:444>
                 ServerName debathena.mit.edu
-                ServerAlias *.debathena.com *.debathena.net *.debathena.org debathena debathena.com debathena.net debathena.org
+                ServerAlias debathena
                 DocumentRoot /afs/sipb.mit.edu/project/debathena/web_scripts
                 Alias /~debathena /afs/sipb.mit.edu/project/debathena/web_scripts