r7338 - dumbhippo/trunk/super

[commits mugshot org]

Author: walters
Date: 2008-02-22 15:23:11 -0600 (Fri, 22 Feb 2008)
New Revision: 7338

Modified:
   dumbhippo/trunk/super/base.conf
Log:
Have global default values for firehose bits; now swarmpoller depends on empty value to signify no AWS firehose.


Modified: dumbhippo/trunk/super/base.conf
===================================================================
--- dumbhippo/trunk/super/base.conf	2008-02-22 21:11:32 UTC (rev 7337)
+++ dumbhippo/trunk/super/base.conf	2008-02-22 21:23:11 UTC (rev 7338)
@@ -486,6 +486,13 @@
 		<parameter name="statusCommand">$targetdir/scripts/imbot-running.sh</parameter>
 	</service>
 	
+    <parameter name="firehoseAwsAccessKeyId"></parameter>
+    <parameter name="firehoseAwsSecretKey"></parameter>
+    <parameter name="firehoseAwsS3Bucket"></parameter> 
+    <parameter name="firehoseAwsS3Key"></parameter>
+    <parameter name="firehoseAwsSqsIncomingName"></parameter>
+    <parameter name="firehoseAwsSqsOutgoingName"></parameter>
+            	
     <service name="firehose">
         <parameter name="targetdir">$basedir/firehose</parameter>
         <parameter name="firehosedir">$svndir/firehose</parameter>
@@ -501,15 +508,7 @@
         <targetAttributes pattern="/run/*"   ignore="yes"/>
         <targetAttributes pattern="/data/*"  ignore="yes" preserve="yes"/>        
         
-        <parameter name="firehoseLocalSlavePort">$((baseport+81))</parameter>
-        <!-- Uncomment this if you're using Firehose on Amazon Web Services platform
-        <parameter name="firehoseAwsAccessKeyId"></parameter>
-        <parameter name="firehoseAwsSecretKey"></parameter>
-        <parameter name="firehoseAwsS3Bucket"></parameter> 
-        <parameter name="firehoseAwsS3Key"></parameter>
-        <parameter name="firehoseAwsSqsIncomingName"></parameter>
-        <parameter name="firehoseAwsSqsOutgoingName"></parameter>
-        -->            
+        <parameter name="firehoseLocalSlavePort">$((baseport+81))</parameter>    
 
         <parameter name="startCommand">$targetdir/scripts/firehose-start.sh</parameter>
         <parameter name="stopCommand">$targetdir/scripts/firehose-stop.sh</parameter>