[Erp5-report] r41445 luke - /erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/

[nobody at svn.erp5.org]

Author: luke
Date: Wed Dec 15 10:47:54 2010
New Revision: 41445

URL: http://svn.erp5.org?rev=41445&view=rev
Log:
 - make httpd_binary optional and default to httpd

Modified:
    erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/__init__.py?rev=41445&r1=41444&r2=41445&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.apache/src/erp5/recipe/apache/__init__.py [utf8] Wed Dec 15 10:47:54 2010
@@ -60,6 +60,8 @@ class Apache:
       os.path.join(self.buildout['buildout']['parts-directory'], name)
         ).strip()
 
+    self.options['httpd_binary'] = self.options.get('httpd_binary', 'httpd'\
+      ).strip()
     self.options['conf_directory'] = self.options.get('conf_directory',
       os.path.join(self.options['location'], 'etc')).strip()
     self.options['config_file'] = os.path.join(self.options['conf_directory'],