Rename apache to apache-frontend

setup.py

@@ -40,6 +40,7 @@ setup(name=name,
       zip_safe=True,
       entry_points={
         'zc.buildout': [
+          'apache.frontend = slapos.recipe.apache_frontend:Recipe',
           'apachephp = slapos.recipe.apachephp:Recipe',
           'apacheproxy = slapos.recipe.apacheproxy:Recipe',
           'apache.zope.backend = slapos.recipe.apache_zope_backend:Recipe',
@@ -107,7 +108,6 @@ setup(name=name,
           'vifib = slapos.recipe.vifib:Recipe',
           'waitfor = slapos.recipe.waitfor:Recipe',
           'xwiki = slapos.recipe.xwiki:Recipe',
-          'apache = slapos.recipe.apache:Recipe', 
           'zabbixagent = slapos.recipe.zabbixagent:Recipe',
           'generic.zope = slapos.recipe.generic_zope:Recipe',
           'generic.zope.zeo.client = slapos.recipe.generic_zope_zeo_client:Recipe',

software/apache/software.cfg → software/apache-frontend/software.cfg

@@ -35,7 +35,7 @@ parts =
 # Note: In case if specific instantiation recipe is used this is the place to
 # put its name
 egg = slapos.cookbook
-module = apache
+module = apache.frontend
 
 [instance-recipe-egg]
 recipe = zc.recipe.egg