Merge remote-tracking branch 'origin/master' into erp5-component

component/apache/buildout.cfg

@@ -120,9 +120,9 @@ make-targets =
 [apache-2.2]
 # inspired on http://old.aclark.net/team/aclark/blog/a-lamp-buildout-for-wordpress-and-other-php-apps/
 recipe = slapos.recipe.cmmi
-version = 2.2.25
+version = 2.2.26
 url = http://mir2.ovh.net/ftp.apache.org/dist/httpd/httpd-${:version}.tar.bz2
-md5sum = 9ebe3070c0bb4311f21a0cd0e34f0045
+md5sum = 254eda547f8d624604e4bf403241e617
 patch-options = -p1
 configure-options = --disable-static
                     --enable-authn-alias

component/screen/buildout.cfg

+[buildout]
+parts =
+  screen
+
+extends =
+  ../ncurses/buildout.cfg
+
+[screen]
+recipe = slapos.recipe.cmmi
+version = 4.0.3
+url = http://ftp.gnu.org/gnu/screen/screen-4.0.3.tar.gz
+md5sum = 8506fd205028a96c741e4037de6e3c42
+environment=
+    CFLAGS=-I${ncurses:location}/include
+    LDFLAGS=-L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
\ No newline at end of file

component/vim/buildout.cfg

+[buildout]
+parts =
+  vim
+  
+extends = 
+  ../ncurses/buildout.cfg
+
+[vim]
+recipe = slapos.recipe.cmmi
+version = 7.4
+url = http://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2
+md5sum = 607e135c559be642f210094ad023dc65
+environment=
+    CFLAGS=-I${ncurses:location}/include
+    LDFLAGS=-L${ncurses:location}/lib/ -Wl,-rpath=${ncurses:location}/lib/
\ No newline at end of file

software/apache-frontend/README.apache_frontend.txt

@@ -120,6 +120,11 @@ plain_http_port
 Port used by apache to serve plain http (only used to redirect to https).
 Optional parameter, defaults to 8080.
 
+ip-read-limit
+~~~~~~~~~~~~~
+Use to set IPReadLimit Parameter for antiloris.
+Optional parameter, defaults to 10.
+
 apache_custom_http (custom-group)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Jinja template for apache virtualhost http configuration. It will be used by all slaves

software/apache-frontend/common.cfg

@@ -51,21 +51,21 @@ command =
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 9c6346c8eaf484748e6be0b62b65cf2e
+md5sum = 5c22b1e0fe601255ebf19adf6093489f
 output = ${buildout:directory}/template.cfg
 mode = 0644
 
 [template-apache-frontend]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-apache-frontend.cfg
-md5sum = 7e7e7599ec41cf1eb6e8e725d855c345
+md5sum = 9f3eec91f43ae0730e9bba93f83572fc
 output = ${buildout:directory}/template-apache-frontend.cfg
 mode = 0644
 
 [template-apache-replicate]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/instance-apache-replicate.cfg.in
-md5sum = 2c96799f1429d0541c04c0875d864777
+md5sum = 02658d39fa429fef7faba9658e4f1474
 mode = 0644
 
 [template-slave-list]
@@ -83,12 +83,13 @@ mode = 640
 [template-replicate-publish-slave-information]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/replicate-publish-slave-information.cfg.in
+md5sum = 61a14dff06718e3d90c346a0a7b20c5a
 mode = 640
 
 [template-apache-frontend-configuration]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/apache.conf.in
-md5sum = c141b9e78c7e80d75bb40493910294e5
+md5sum = b4d7461c29fb6c36f09e48fa5ad59fba
 mode = 640
 
 [template-apache-cached-configuration]
@@ -128,6 +129,12 @@ url = ${:_profile_base_location_}/templates/default-virtualhost.conf.in
 md5sum = ac845c0fa3835832307a0e7323cb339d
 mode = 640
 
+[template-squid-configuration]
+recipe = slapos.recipe.build:download
+url = ${:_profile_base_location_}/templates/squid.conf.jinja2
+md5sum = 9f70474181372d34c8cd203f24ab546e
+mode = 640
+
 [template-empty]
 recipe = slapos.recipe.build:download
 url = ${:_profile_base_location_}/templates/empty.in

software/apache-frontend/instance-apache-frontend.cfg

@@ -7,7 +7,6 @@ parts =
   cron-entry-logrotate
   ca-frontend
   certificate-authority
-  squid-cache
   logrotate-entry-apache
   logrotate-entry-apache-cached
   logrotate-entry-squid
@@ -16,7 +15,10 @@ parts =
   switch-apache-softwaretype
   frontend-apache-graceful
   cached-apache-graceful
+  squid-service
+  squid-prepare
   squid-reload
+  promise-squid
   dynamic-template-default-vh
   not-found-html
   promise-apache-frontend-v4-https
@@ -24,7 +26,6 @@ parts =
   promise-apache-frontend-v6-https
   promise-apache-frontend-v6-http
   promise-apache-cached
-  promise-squid
 
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
@@ -55,13 +56,11 @@ crontabs = $${:etc}/crontabs
 cronstamps = $${:etc}/cronstamps
 ca-dir = $${:srv}/ssl
 
-squid-cache = $${:srv}/squid_cache
-
 [switch-apache-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = $${dynamic-default-template-slave-list:rendered}
-custom-personal = $${dynamic-custom-personal-template-slave-list:rendered}
-custom-group = $${dynamic-custom-group-template-slave-list:rendered}
+single-default = $${dynamic-default-template-slave-list:rendered}
+single-custom-personal = $${dynamic-custom-personal-template-slave-list:rendered}
+single-custom-group = $${dynamic-custom-group-template-slave-list:rendered}
 
 [instance-parameter]
 # Fetches parameters defined in SlapOS Master for this instance.
@@ -129,7 +128,7 @@ extra-context =
     raw empty_template ${template-empty:target}
     raw template_slave_configuration ${template-slave-configuration:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type custom-personal
+    raw software_type single-custom-personal
 
 [dynamic-custom-group-template-slave-list]
 < = jinja2-template-base
@@ -152,7 +151,7 @@ extra-context =
     key cache_port apache-configuration:cache-port
     raw empty_template ${template-empty:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type custom-group
+    raw software_type single-custom-group
 
 [dynamic-default-template-slave-list]
 < = jinja2-template-base
@@ -175,7 +174,7 @@ extra-context =
     raw template_slave_configuration ${template-default-slave-virtualhost:target}
     raw empty_template ${template-empty:target}
     raw template_rewrite_cached ${template-rewrite-cached:target}
-    raw software_type default-RootSoftwareInstance
+    raw software_type single-default
 # XXXX Hack to allow two software types
 
 [dynamic-virtualhost-template-slave]
@@ -399,13 +398,19 @@ sharedscripts = true
 notifempty = true
 create = true
 
+######################
+#  Squid deployment
+######################
+[squid-directory]
+recipe = slapos.cookbook:mkdirectory
+squid-cache = $${directory:srv}/squid_cache
+
 [squid-cache]
-recipe = slapos.cookbook:squid
 prepare-path = $${directory:etc-run}/squid-prepare
 wrapper-path = $${directory:service}/squid
 binary-path = ${squid:location}/sbin/squid
-conf-path = $${directory:etc}/squid.cfg
-cache-path = $${directory:squid-cache}
+configuration-path = $${directory:etc}/squid.cfg
+cache-path = $${squid-directory:squid-cache}
 ip = $${instance-parameter:ipv4-random}
 port = $${apache-configuration:cache-port}
 backend-ip = $${instance-parameter:ipv4-random}
@@ -415,11 +420,44 @@ access-log-path = $${directory:log}/squid-access.log
 cache-log-path = $${directory:log}/squid-cache.log
 pid-filename-path = $${directory:run}/squid.pid
 
+[squid-configuration]
+< = jinja2-template-base
+template = ${template-squid-configuration:target}
+rendered = $${squid-cache:configuration-path}
+extra-context =
+      key ip squid-cache:ip 
+      key port squid-cache:port
+      key backend_ip squid-cache:backend-ip
+      key backend_port squid-cache:backend-port
+      key cache_path squid-cache:cache-path
+      key access_log_path squid-cache:access-log-path
+      key cache_log_path squid-cache:cache-log-path
+      key pid_filename_path squid-cache:pid-filename-path
+      key open_port squid-cache:open-port
+
+[squid-service]
+recipe = slapos.cookbook:wrapper
+command-line = $${squid-cache:binary-path} -N -f $${squid-configuration:rendered}
+wrapper-path = $${squid-cache:wrapper-path}
+
+[squid-prepare]
+recipe = slapos.cookbook:wrapper
+command-line = $${squid-cache:binary-path} -z -f $${squid-configuration:rendered}
+wrapper-path = $${squid-cache:prepare-path}
+
 [squid-reload]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/killpidfromfile $${squid-cache:pid-filename-path} SIGHUP
 wrapper-path = $${directory:etc-run}/squid-reload
 
+[promise-squid]
+recipe = slapos.cookbook:check_port_listening
+path = $${directory:promise}/squid
+hostname = $${instance-parameter:ipv4-random}
+port = $${apache-configuration:cache-port}
+
+# End of Squid part
+
 [frontend-apache-graceful]
 recipe = slapos.cookbook:wrapper
 command-line = ${buildout:bin-directory}/killpidfromfile $${apache-configuration:pid-file} SIGUSR1
@@ -460,12 +498,6 @@ path = $${directory:promise}/apache_cached
 hostname = $${instance-parameter:ipv4-random}
 port = $${apache-configuration:cache-through-port}
 
-[promise-squid]
-recipe = slapos.cookbook:check_port_listening
-path = $${directory:promise}/squid
-hostname = $${instance-parameter:ipv4-random}
-port = $${apache-configuration:cache-port}
-
 [slap_connection]
 # Kept for backward compatiblity
 computer_id = $${slap-connection:computer-id}

software/apache-frontend/instance-apache-replicate.cfg.in

-{% if slap_software_type.startswith(software_type) -%}
+{% if slap_software_type in software_type -%}
 
 [jinja2-template-base]
 recipe = slapos.recipe.template:jinja2
@@ -13,18 +13,22 @@ context =
     ${:extra-context}
 
 {% set part_list = [] -%}
-{% set type_key = 'replicate-' %}
-{% set type_key_length = type_key | length %}
-{% if slap_software_type.startswith(type_key) %}
-{%   set frontend_type = slap_software_type[type_key_length:] -%}
+{% set single_type_key = 'single-' %}
+{% if slap_software_type in ("replicate", "RootSoftwareInstance") %}
+{%   set frontend_type = slapparameter_dict.pop('-frontend-type', 'single-default') -%}
 {% else -%}
-{%   set frontend_type = slapparameter_dict.pop('-frontend-type', 'default') -%}
+{%   set frontend_type = "%s%s" % (single_type_key, slap_software_type) -%}
 {% endif -%}
-{% set frontend_quantity = slapparameter_dict.pop('-frontend-quantity', '2') | int -%}
+{% set frontend_quantity = slapparameter_dict.pop('-frontend-quantity', '1') | int -%}
 {% set slave_list_name = 'extra_slave_instance_list' -%}
 {% set frontend_list = [] %}
 {% set frontend_section_list = [] %}
 {% set namebase = 'apache-frontend' -%}
+# XXX Dirty hack, not possible to define default value before
+{% set sla_computer_apache_1_key = '-sla-1-computer_guid' -%}
+{% if not sla_computer_apache_1_key in slapparameter_dict -%}
+{%   do slapparameter_dict.__setitem__(sla_computer_apache_1_key, '${slap-connection:computer-id}') -%}
+{% endif -%}
 
 # Here we request individualy each frontend.
 # The presence of sla parameters is checked and added if found
@@ -81,6 +85,8 @@ slave-amount = {{ slave_instance_list | length }}
 recipe = slapos.cookbook:softwaretype
 default = ${dynamic-publish-slave-information:rendered}
 replicate = ${dynamic-publish-slave-information:rendered}
+custom-personal = ${dynamic-publish-slave-information:rendered}
+custom-group = ${dynamic-publish-slave-information:rendered}
 
 [slave-information]
 {% for frontend_section in frontend_section_list -%}
@@ -120,7 +126,6 @@ cert_file = ${slap-connection:cert-file}
 
 [slap-parameter]
 slave_instance_list =
--frontend-quantity = 2
--frontend-type = default
-
+-frontend-quantity = 1
+-frontend-type = single-default
 {%- endif %}

software/apache-frontend/instance.cfg

@@ -30,12 +30,12 @@ context =
 
 [switch-softwaretype]
 recipe = slapos.cookbook:softwaretype
-default = ${template-apache-frontend:output}
-custom-personal = ${template-apache-frontend:output}
-custom-group = ${template-apache-frontend:output}
-replicate-default = $${dynamic-template-apache-replicate:rendered}
-replicate-custom-personal = $${dynamic-template-apache-replicate:rendered}
-replicate-custom-group = $${dynamic-template-apache-replicate:rendered}
+default = $${dynamic-template-apache-replicate:rendered}
+custom-personal = $${dynamic-template-apache-replicate:rendered}
+custom-group = $${dynamic-template-apache-replicate:rendered}
+single-default = ${template-apache-frontend:output}
+single-custom-personal = ${template-apache-frontend:output}
+single-custom-group = ${template-apache-frontend:output}
 replicate = $${dynamic-template-apache-replicate:rendered}
 
 [dynamic-template-apache-replicate]
@@ -46,4 +46,4 @@ extensions = jinja2.ext.do
 extra-context =
     raw template_publish_slave_information ${template-replicate-publish-slave-information:target}
 # Must match the key id in [switch-softwaretype] which uses this section.
-    raw software_type replicate
+    raw software_type RootSoftwareInstance-default-custom-personal-custom-group-replicate

software/apache-frontend/templates/apache.conf.in

@@ -86,6 +86,12 @@ BrowserMatch "^gnome-vfs" redirect-carefully
 BrowserMatch "^XML Spy" redirect-carefully
 BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
 
+# Increase IPReadLimit to 10
+<IfModule antiloris_module>
+   # IPReadLimit - Maximum simultaneous connections in READ state per IP address 
+   IPReadLimit {{ slapparameter_dict.get('ip-read-limit', '10') }}
+</IfModule>
+
 # Cache directives
 CacheEnable mem /
 CacheDefaultExpire 3600

software/apache-frontend/templates/squid.conf.jinja2

+refresh_pattern .   0 20% 4320 max-stale=604800
+
+# Dissallow cachemgr access
+http_access deny manager
+
+# Squid service configuration
+http_port {{ ip }}:{{ port }} accel defaultsite={{ ip }}
+
+cache_peer {{ backend_ip }} parent {{ backend_port }} 0 no-query originserver name=backend
+
+acl our_sites port {{ open_port }}
+http_access allow our_sites
+cache_peer_access backend allow our_sites
+cache_peer_access backend deny all
+
+# Drop squid headers
+# via off
+# reply_header_access X-Cache-Lookup deny all
+# reply_header_access X-Squid-Error deny all
+# reply_header_access X-Cache deny all
+
+header_replace X-Forwarded-For
+follow_x_forwarded_for allow all
+forwarded_for on
+
+# Use 1Go of RAM
+cache_mem 1024 MB
+# But do not keep big object in RAM
+maximum_object_size_in_memory 2048 KB
+
+# Log
+access_log {{ access_log_path }}
+cache_log {{ cache_log_path }}
+pid_filename {{ pid_filename_path }}

software/slaprunner/common.cfg

 [buildout]
 extends =
   ../../component/bash/buildout.cfg
+  ../../component/busybox/buildout.cfg
   ../../component/cloud9/buildout.cfg
   ../../component/curl/buildout.cfg
   ../../component/dash/buildout.cfg
   ../../component/dropbear/buildout.cfg
   ../../component/git/buildout.cfg
   ../../component/lxml-python/buildout.cfg
+  ../../component/nano/buildout.cfg
   ../../component/nginx/buildout.cfg
   ../../component/rsync/buildout.cfg
   ../../component/python-2.7/buildout.cfg
+  ../../component/screen/buildout.cfg
   ../../component/shellinabox/buildout.cfg
-  ../../component/busybox/buildout.cfg
+  ../../component/vim/buildout.cfg
   ../../stack/flask.cfg
   ../../stack/shacache-client.cfg
   ../../stack/resilient/buildout.cfg
@@ -86,7 +89,7 @@ mode = 0644
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-runner.cfg
 output = ${buildout:directory}/template-runner.cfg.in
-md5sum = e1f7b39241c1c211410ad5ef75845c68
+md5sum = 098ec22334dc6d0cd8fe747e733c86d8
 mode = 0644
 
 [instance-runner-import]
@@ -106,7 +109,7 @@ mode = 0644
 [template-resilient]
 recipe = slapos.recipe.download
 url = ${:_profile_base_location_}/instance-resilient.cfg.jinja2
-md5sum = c23e8eb84b4e8375543e104e0993a019
+md5sum = 932c506779cef5b20576a57d97877742
 filename = instance-resilient.cfg.jinja2
 mode = 0644
 

software/slaprunner/instance-resilient.cfg.jinja2

@@ -17,11 +17,11 @@ parts +=
 
 # Bubble up the parameters
 [request-runner]
-return = url ssh-public-key ssh-url notification-id ip backend_url url cloud9_url ssh_command password_recovery_code cloud9_backend_url shell_password access_url
+return = url ssh-public-key ssh-url notification-id ip backend_url url cloud9_url ssh_command password_recovery_code cloud9_backend_url shell_password access_url 1_info
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-1_info = Set your passord in slaprunner in order to access cloud9
+1_info = ${request-runner:connection-1_info}
 backend_url = ${request-runner:connection-backend_url}
 access_url = ${request-runner:connection-access_url}
 url = ${request-runner:connection-url}

software/slaprunner/instance-runner.cfg

@@ -410,9 +410,9 @@ return = site_url domain
 
 [publish-connection-informations]
 recipe = slapos.cookbook:publish
-1_info = Set your passord in slaprunner in order to access cloud9
+1_info = On your first run, Use "access_url" to setup you account.Then you can use both "url" or "access_url". Or "backend_url" if you want to use ipv6. Moreover, you have to setup your account in slaprunner in order to access cloud9.
 backend_url = $${slaprunner:access-url}
-access_url = $${slaprunner:access-url}/login
+access_url = $${:url}/login
 url =  https://$${request-frontend:connection-domain}
 cloud9_backend_url = $${node-frontend:access-url}
 cloud9_url = https://$${request-cloud9-frontend:connection-domain}
@@ -552,7 +552,7 @@ recipe = slapos.cookbook:shell
 wrapper = $${directory:bin}/sh
 shell = ${bash:location}/bin/bash
 home = $${runnerdirectory:home}
-path = $${environ:PATH}
+path = $${environ:PATH}:${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin
 ps1 = "\\w> "
 
 [environ]

software/slaprunner/software.cfg

@@ -212,7 +212,7 @@ slapos.recipe.build = 0.11.5
 slapos.recipe.cmmi = 0.2
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.38
+slapos.toolbox = 0.38.1
 smmap = 0.8.2
 xml-marshaller = 0.9.7
 z3c.recipe.scripts = 1.0.1