abilian: added redis instance

software/abilian/extranet_spr/instance-redis.cfg.in

+[buildout]
+
+parts =
+  publish-redis-connection-parameters
+  redis
+
+
+[redis-passwd]
+recipe = slapos.cookbook:generate.password
+storage-path = $${directories:etc}/.redis-passwd
+bytes = 4
+
+[redis]
+recipe = slapos.cookbook:redis.server
+server_bin = ${redis:location}/bin/redis-server
+ipv6 = $${instance-parameters:ipv6-random}
+port = 6379
+use_passwd = $${slap-parameter:use_passwd}
+pid_file = $${directories:run}/redis.pid
+server_dir = $${directories:srv}
+passwd = $${redis-passwd:passwd}
+config_file = $${directories:etc}/redis.conf
+log_file = $${directories:log}/redis.log
+wrapper = $${directories:services}/redis_server
+promise_wrapper = $${directories:promises}/redis
+
+# Send informations to SlapOS Master
+[publish-redis-connection-parameters]
+recipe = slapos.cookbook:publish
+redis_ip = $${redis:ipv6}
+redis_port = $${redis:port}
+redis_passwd = $${redis:passwd}
+redis_uses_password = $${redis:use_passwd}
+  
+[slap-parameter]
+use_passwd = false

software/abilian/extranet_spr/instance.cfg.in

-
 [buildout]
+
+eggs-directory = ${buildout:eggs-directory}
+develop-eggs-directory = ${buildout:develop-eggs-directory}
+offline = true
+
 extends =
     ${instance-postgres:output}
     ${instance-extranet:output}
+    ${instance-redis:output}
     ${instance-environment:output}
 
 parts =
@@ -16,7 +21,9 @@ parts =
     json-configuration
     json-extra-configuration
     request-web-frontend
-    publish-connection-parameter
+    publish-connection-parameters
+    redis
+    publish-redis-connection-parameters
 
 
 
@@ -59,6 +66,8 @@ mode = 0644
 recipe = slapos.cookbook:mkdirectory
 bin = $${buildout:directory}/bin
 etc = $${buildout:directory}/etc
+run = $${directories:var}/run
+scripts = $${directories:etc}/run
 srv = $${buildout:directory}/srv
 services = $${directories:etc}/service
 promises = $${directories:etc}/promise
@@ -66,8 +75,8 @@ var = $${buildout:directory}/var
 extranet_spr-instance = $${:var}/extranet_spr-instance
 cache = $${:extranet_spr-instance}/cache
 data = $${:extranet_spr-instance}/data
-log = $${:extranet_spr-instance}/log
-tmp = $${:extranet_spr-instance}/tmp
+log = $${directories:var}/log
+tmp = $${directories:var}/tmp
 whoosh = $${:data}/whoosh
 
 
@@ -83,7 +92,7 @@ config-url = https://[$${instance-parameters:ipv6}]:5000/
 return = site_url
 
 
-[publish-connection-parameter]
+[publish-connection-parameters]
 recipe = slapos.cookbook:publish
 url = $${request-web-frontend:connection-site_url}
 name = test parameter

software/abilian/extranet_spr/software.cfg

@@ -51,6 +51,7 @@ parts =
     nginx
     instance
     instance-postgres
+    instance-redis
     config-staging-py-template
     abilian-config
 
@@ -217,6 +218,13 @@ output = ${buildout:directory}/instance-postgres.cfg
 #XXX md5sum = 
 mode = 0644
 
+[instance-redis]
+recipe = slapos.recipe.template
+url = ${:_profile_base_location_}/instance-redis.cfg.in
+output = ${buildout:directory}/instance-redis.cfg
+#md5sum = 
+mode = 0644
+
 [instance-extranet]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance-extranet.cfg.in