Changeset 2195 for branches/fc17-dev/lvs/debian

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

• . (modified) (1 prop)
• lvs/debian/config/etc/ha.d/ldirectord.cf (modified) (6 diffs)
• lvs/debian/config/etc/lighttpd/scripts-maint/index.html (modified) (1 diff)

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

@@ -8 +8 @@
 virtual=3
         #real=18.181.0.53:25  gate 4096 # old-faithful
-        #real=18.181.0.57:25  gate 4096 # better-mousetrap
+        real=18.181.0.57:25  gate 4096 # better-mousetrap
         real=18.181.0.167:25 gate 4096 # bees-knees
         real=18.181.0.228:25 gate 1024 # cats-whiskers
@@ -15 +15 @@
         #real=18.181.0.237:25 gate 4096 # pancake-bunny
         #real=18.181.0.236:25 gate 4096 # whole-enchilada
-        #real=18.181.0.135:25 gate 1024 # shining-armor
+        real=18.181.0.135:25 gate 4096 # shining-armor
         real=18.181.0.141:25 gate 4096 # golden-egg
         service=smtp
@@ -27 +27 @@
 virtual=2
         #real=18.181.0.53  gate 4096 # old-faithful
-        #real=18.181.0.57  gate 4096 # better-mousetrap
+        real=18.181.0.57  gate 4096 # better-mousetrap
         real=18.181.0.167 gate 4096 # bees-knees
         real=18.181.0.228 gate 1024 # cats-whiskers
@@ -34 +34 @@
         #real=18.181.0.237 gate 4096 # pancake-bunny
         #real=18.181.0.236 gate 4096 # whole-enchilada
-        #real=18.181.0.135 gate 1024 # shining-armor
+        real=18.181.0.135 gate 4096 # shining-armor
         real=18.181.0.141 gate 4096 # golden-egg 
         fallback=127.0.0.1 gate
@@ -50 +50 @@
 virtual=1
         #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.57  gate "heartbeat/services", "2"  # better-mousetrap
         real=18.181.0.167 gate "heartbeat/services", "3"  # bees-knees
         real=18.181.0.228 gate "heartbeat/services", "4"  # cats-whiskers
@@ -57 +57 @@
         #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
+        real=18.181.0.135 gate "heartbeat/services", "9"  # shining-armor
         real=18.181.0.141 gate "heartbeat/services", "10" # golden-egg
         service=http

branches/fc17-dev/lvs/debian/config/etc/lighttpd/scripts-maint/index.html

@@ -5 +5 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <link rel="stylesheet" href="/__scripts/maint/style.css" type="text/css" />
-<link rel="alternate" type="application/rss+xml" title="scripts.mit.edu:
-Service unavailable" href="http://scripts.mit.edu/rss/" />
 <title>scripts.mit.edu: Service unavailable</title>
 </head>