Move announcement_message to ZooKeeper.

r2/example.ini

@@ -40,8 +40,6 @@ heavy_load_mode = false
 # directory to write cProfile stats dumps to (disabled if not set)
 profile_directory =
 
-# a message placed in the infobar
-announcement_message =
 # the site's tagline, used in the title and description
 short_description = open source is awesome
 
@@ -558,6 +556,8 @@ beaker.session_secret = somesecret
 frontpage_dart = false
 # links that get their own infrastructure (comma-delimited list of id36s)
 fastlane_links =
+# a message placed in the infobar
+announcement_message =
 # spotlight links for subreddit discovery
 sr_discovery_links = 
 # probability of the subreddit suggester showing up in the spotlight box

r2/r2/lib/pages/pages.py

@@ -173,8 +173,8 @@ class Reddit(Templated):
             elif (c.firsttime == 'mobile_suggest' and
                   c.render_style != 'compact'):
                 infotext = strings.iphone_first
-            elif g.announcement_message:
-                infotext = g.announcement_message
+            elif g.live_config.get("announcement_message"):
+                infotext = g.live_config["announcement_message"]
 
         if isinstance(c.site, DomainSR) and c.site.domain.endswith("imgur.com"):
             self.infobar = InfoBar(