X redis should hopefully work

software/gitlab/instance-gitlab.cfg.in

@@ -68,11 +68,8 @@ recipe  = slapos.cookbook:request
 # TODO name = $(gitlab-name)/pgsql
 name    = g-redis
 software-url = {{ urlparse.urljoin(software_release_url, '../redis-server/software.cfg') }}
-return  = url
+return  = redis_ip redis_port
 
-[redis-urlparse]
-recipe  = slapos.cookbook:urlparse
-url     = ${request-redis:connection-url}
 
 
 # create gitlab dirs structure
@@ -117,8 +114,14 @@ aaa     = ${request-postgresql:connection-url}
 recipe  = slapos.recipe.template
 url     = {{ gitlab_yml_in }}
 output  = ${gitlab:etc}/gitlab.yml
+
+
+[resque.yml]
+recipe  = slapos.recipe.template
+url     = {{ resque_yml_in }}
+output  = ${gitlab:etc}/resque.yml
 # FIXME aaa should not be here
-aaa     = ${request-redis:connection-url}
+aaa     = ${request-redis:connection-redis_ip}
 
 
 # TODO log: logrotate
@@ -210,7 +213,7 @@ command =
     ln -s ${gitlab:etc}/unicorn.rb .    &&
     ln -s ${gitlab.yml:output} gitlab.yml   &&
     ln -s ${gitlab-database.yml:output} database.yml    &&
-    ln -s ${gitlab:etc}/resque.yml .    &&
+    ln -s ${resque.yml:output} resque.yml   &&
 # config/initializers/
     cd initializers     &&
     ln -s ${gitlab:etc}/rack_attack.rb .    &&

software/gitlab/instance.cfg.in

@@ -25,6 +25,7 @@ context =
 
     raw database_yml_in             ${database.yml.in:target}
     raw gitlab_yml_in               ${gitlab.yml.in:target}
+    raw resque_yml_in               ${resque.yml.in:target}
 
 
 [switch-softwaretype] 

software/gitlab/software.cfg

@@ -193,6 +193,10 @@ url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 <= download-template
 # TODO md5sum
 
+[resque.yml.in]
+<= download-template
+# TODO md5sum
+
 
 
 # [buildout]

software/gitlab/template/resque.yml.in

+# @autogenerated XXX
+# see:
+# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/resque.yml.example
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/resque.yml.erb
+
+production: redis://[${request-redis:connection-redis_ip}]:${request-redis:connection-redis_port}