Merge slapos.recipe.erp5 as slapos.recipebox:erp5.

5be15c89 · Łukasz Nowak · 76759298 · 5be15c89 · 5be15c89 · 5be15c89
Commit 5be15c89 authored 13 years ago by Łukasz Nowak
20 changed files
--- a/setup.py
+++ b/setup.py
@@ -29,6 +29,7 @@ setup(name=name,
      include_package_data=True,
      install_requires=[
        'PyXML', # for full blown python interpreter
+        'Zope2', # some recipes like to play with zope
        'lxml', # for full blown python interpreter
        'netaddr', # to manipulate on IP addresses
        'setuptools', # namespaces
@@ -44,6 +45,7 @@ setup(name=name,
          'build = slapos.recipe.build:Script',
          'buildcmmi = slapos.recipe.build:Cmmi',
          'download = slapos.recipe.download:Recipe',
+          'erp5 = slapos.recipe.erp5:Recipe',
          'erp5testnode = slapos.recipe.erp5testnode:Recipe',
      ]},
    )
--- a/slapos/slapos.recipe.erp5/README.txt
+++ b/slapos/slapos.recipe.erp5/README.txt
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/apache.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/apache.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/catdatefile.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/catdatefile.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/certificate_authority.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/certificate_authority.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/erp5.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/execute.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/execute.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/innobackupex.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/innobackupex.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/killpidfromfile.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/killpidfromfile.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/mysql.py
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/mysql.py
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.location-snippet.conf.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.location-snippet.conf.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.ssl-snippet.conf.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.zope.conf.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.zope.conf.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.zope.conf.path-protected.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.zope.conf.path-protected.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.zope.conf.path.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/apache.zope.conf.path.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/cloudooo.cfg.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/cloudooo.cfg.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/haproxy.cfg.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/haproxy.cfg.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/initmysql.sql.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/initmysql.sql.in
--- a/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/kumo_gateway.in
+++ b/slapos/slapos.recipe.erp5/src/slapos/recipe/erp5/template/kumo_gateway.in