[Erp5-report] r44097 luke - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: luke
Date: Thu Mar 10 09:58:09 2011
New Revision: 44097

URL: http://svn.erp5.org?rev=44097&view=rev
Log:
 - revert 44085, recipe requries more work to disable it safely

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

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py?rev=44097&r1=44096&r2=44097&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] Thu Mar 10 09:58:09 2011
@@ -101,6 +101,7 @@ class Recipe(BaseSlapRecipe):
       )
     for k, v in default_parameter_dict.iteritems():
       self.parameter_dict.setdefault(k, v)
+    self.installTestCertificateAuthority()
     self.installCertificateAuthority()
     self.installMemcached()
     self.installKumo()
@@ -490,6 +491,7 @@ class Recipe(BaseSlapRecipe):
     self.path_list.append(wrapper)
 
     self.installLoginApache(index)
+    self.installKeyAuthorisationApache(index)
 
   def _getApacheConfigurationDict(self, prefix, ip, port):
     apache_conf = dict()