Rename apache to apache-frontend

5818f2da · Cédric de Saint Martin · dc05f387 · 5818f2da · 5818f2da · 5818f2da
Commit 5818f2da authored Feb 29, 2012 by Cédric de Saint Martin
15 changed files
--- a/setup.py
+++ b/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',

--- a/slapos/recipe/apache/__init__.py
+++ b/slapos/recipe/apache/__init__.py
--- a/slapos/recipe/apache/certificate_authority.py
+++ b/slapos/recipe/apache/certificate_authority.py
--- a/slapos/recipe/apache/template/apache.conf.in
+++ b/slapos/recipe/apache/template/apache.conf.in
--- a/slapos/recipe/apache/template/apache.conf.path-protected.in
+++ b/slapos/recipe/apache/template/apache.conf.path-protected.in
--- a/slapos/recipe/apache/template/apache.location-snippet.conf.in
+++ b/slapos/recipe/apache/template/apache.location-snippet.conf.in
--- a/slapos/recipe/apache/template/apache.ssl-snippet.conf.in
+++ b/slapos/recipe/apache/template/apache.ssl-snippet.conf.in
--- a/slapos/recipe/apache/template/logrotate_entry.in
+++ b/slapos/recipe/apache/template/logrotate_entry.in
--- a/slapos/recipe/apache/template/notfound.html
+++ b/slapos/recipe/apache/template/notfound.html
--- a/slapos/recipe/apache/template/openssl.cnf.ca.in
+++ b/slapos/recipe/apache/template/openssl.cnf.ca.in
--- a/slapos/recipe/apache/template/stunnel.conf.entry.in
+++ b/slapos/recipe/apache/template/stunnel.conf.entry.in
--- a/slapos/recipe/apache/template/stunnel.conf.in
+++ b/slapos/recipe/apache/template/stunnel.conf.in
--- a/slapos/recipe/apache/template/varnish.vcl.in
+++ b/slapos/recipe/apache/template/varnish.vcl.in
--- a/software/apache/instance.cfg
+++ b/software/apache/instance.cfg
--- a/software/apache/software.cfg
+++ b/software/apache/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