Merge branch 'scalability-testnode-roque'

Conflicts:
	component/embulk/buildout.cfg

component/embulk/buildout.cfg

@@ -5,4 +5,5 @@ parts = embulk
 recipe = slapos.recipe.build:download 
 url = https://dl.bintray.com/embulk/maven/embulk-0.9.7.jar
 md5sum = 05f41d3750ec359fc10c1dc3e30f238e
-filename = embulk.jar
+destination = ${buildout:directory}/bin/embulk
+mode = 777

slapos/recipe/erp5testnode/template/httpd.conf.in

@@ -37,6 +37,14 @@ LoadModule dir_module modules/mod_dir.so
 LoadModule alias_module modules/mod_alias.so
 LoadModule ssl_module modules/mod_ssl.so
 LoadModule autoindex_module modules/mod_autoindex.so
+# for password access
+LoadModule authn_file_module modules/mod_authn_file.so
+LoadModule authn_core_module modules/mod_authn_core.so
+LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
+LoadModule authz_user_module modules/mod_authz_user.so
+LoadModule access_compat_module modules/mod_access_compat.so
+LoadModule auth_basic_module modules/mod_auth_basic.so
+LoadModule auth_digest_module modules/mod_auth_digest.so
 
 # SSL Configuration
 SSLEngine on
@@ -76,12 +84,12 @@ SSLProxyEngine On
 # some code, it would be needed to explicitely add a .htaccess file.
 Listen [%(ip)s]:%(software_access_port)s
 <VirtualHost *:%(software_access_port)s>
-    SSLEngine on
+    SSLEngine off
     DocumentRoot "%(testnode_srv_directory)s"
     <Directory />
-        AllowOverride FileInfo AuthConfig
+        AllowOverride AuthConfig
         Options FollowSymLinks
         IndexOptions FancyIndexing
-        Require all denied
+        Require all granted
    </Directory>
 </VirtualHost>

software/erp5testnode/software-merged.cfg

+[buildout]
+extends =
+  buildout.hash.cfg
+  ../../stack/slapos.cfg
+  ../../component/git/buildout.cfg
+  ../../component/lxml-python/buildout.cfg
+  ../../component/zip/buildout.cfg
+  ../../component/busybox/buildout.cfg
+  ../../component/shellinabox/buildout.cfg
+  ../../component/pwgen/buildout.cfg
+  ../../component/apache/buildout.cfg
+  ../../component/userhosts/buildout.cfg
+  ../../stack/monitor/buildout.cfg
+
+parts =
+  slapos-cookbook
+  slapos-cookbook-develop
+  template
+  lxml-python
+  eggs
+  zip
+  git
+  apache
+  userhosts
+
+[eggs]
+recipe = zc.recipe.egg
+eggs =
+  ${lxml-python:egg}
+  zc.buildout
+  z3c.etestbrowser
+  slapos.libnetworkcache
+  slapos.core
+  supervisor
+  jsonschema
+  hexagonit.recipe.download
+  lock_file
+  pytz
+  erp5.util
+  PyXML
+
+[testnode]
+
+scripts =
+  testnode = erp5.util.testnode:main
+  slapgrid-cp = slapos.grid.slapgrid:runComputerPartition
+  slapgrid-sr = slapos.grid.slapgrid:runSoftwareRelease
+  slapproxy = slapos.proxy:main
+
+
+[template]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance.cfg
+output = ${buildout:directory}/template.cfg
+mode = 0644
+
+[template-default]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-default.cfg
+output = ${buildout:directory}/template-default.cfg
+mode = 0644
+
+[versions]
+PyXML = 0.8.5
+erp5.util = 0.4.50
+slapos.recipe.template = 4.3
+ipython = 5.3.0
+apache-libcloud = 2.1.0
+gitdb2 = 2.0.2
+pyasn1 = 0.3.2
+smmap2 = 2.0.3
+zope.testbrowser = 5.2.1
+
+# Required by:
+# slapos.toolbox==0.70
+GitPython = 2.1.5
+
+# Required by:
+# slapos.toolbox==0.70
+atomize = 0.2.0
+
+# Required by:
+# slapos.toolbox==0.70
+dnspython = 1.15.0
+
+# Required by:
+# slapos.toolbox==0.70
+feedparser = 5.2.1
+
+# Required by:
+# slapos.toolbox==0.70
+lockfile = 0.12.2
+
+# Required by:
+# slapos.toolbox==0.70
+passlib = 1.7.1

software/erp5testnode/software.cfg

@@ -9,22 +9,29 @@ extends =
   ../../component/shellinabox/buildout.cfg
   ../../component/pwgen/buildout.cfg
   ../../component/apache/buildout.cfg
+  ../../component/userhosts/buildout.cfg
   ../../stack/monitor/buildout.cfg
 
 parts =
   slapos-cookbook
+  slapos-cookbook-develop
   template
   lxml-python
   eggs
   zip
   git
   apache
+  userhosts
+
+[slapos.cookbook-repository]
+revision = 9d1048222ee06e120ca8977a0a54332804caa8ca
 
 [eggs]
 recipe = zc.recipe.egg
 eggs =
   ${lxml-python:egg}
   zc.buildout
+  z3c.etestbrowser
   slapos.libnetworkcache
   slapos.core
   supervisor
@@ -59,12 +66,13 @@ mode = 0644
 [versions]
 PyXML = 0.8.5
 erp5.util = 0.4.50
-slapos.recipe.template = 4.3
+slapos.recipe.template = 4.1
 ipython = 5.3.0
 apache-libcloud = 2.1.0
 gitdb2 = 2.0.2
 pyasn1 = 0.3.2
 smmap2 = 2.0.3
+zope.testbrowser = 5.2.1
 
 # Required by:
 # slapos.toolbox==0.70

stack/erp5/instance-erp5.cfg.in

@@ -354,4 +354,3 @@ password = ${monitor-htpasswd:passwd}
 {% for key, value in monitor_base_url_dict.items() -%}
 {{ key }} = {{ value }}
 {% endfor %}
-