.

software/gitlab/instance-gitlab.cfg.in

@@ -22,6 +22,9 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 
+##################################
+#   GitLab instance parameters   #
+##################################
 
 [instance-parameter]
 # std stuff to fetch slapos instance parameters
@@ -33,7 +36,7 @@ key     = ${slap-connection:key-file}
 cert    = ${slap-connection:cert-file}
 
 # gitlab instance parameters
-# ( parameter names and advanced default taken from omnibus-gitlab
+# ( parameter names and advanced defaults taken from omnibus-gitlab
 #   files/gitlab-config-template/gitlab.rb.template.
 #
 #   last updated for omnibus-gitlab 8.1.0+rc1.ce.0-24-g3021ed9
@@ -107,9 +110,11 @@ configuration.nginx_keepalive_timeout   = 65
 
 
 # for convenience
+# XXX place ok? naming?
 [gitlab-backend]
 host    = ${instance-parameter:ipv6-random}
 port    = 7777
+# TODO http -? https
 url     = http://[${:host}]:${:port}
 
 # current slapuserX
@@ -125,7 +130,9 @@ recipe  = slapos.cookbook:publish
 url     = ${gitlab-backend:url}
 
 
-# PostgreSQL instance
+#################################
+#   need: PostgreSQL instance   #
+#################################
 [request-postgresql]
 <= slap-connection
 recipe  = slapos.cookbook:request
@@ -139,7 +146,9 @@ recipe  = slapos.cookbook:urlparse
 url     = ${request-postgresql:connection-url}
 
 
-# Redis instance
+############################
+#   need: Redis instance   #
+############################
 [request-redis]
 <= slap-connection
 recipe  = slapos.cookbook:request
@@ -149,6 +158,12 @@ software-url = {{ urlparse.urljoin(software_release_url, '../redis-server/softwa
 return  = redis_ip redis_port
 
 
+# TODO need: Nginx instance
+
+
+#############################
+#   GitLab instance setup   #
+#############################
 
 # create gitlab dirs structure
 [directory]
@@ -165,6 +180,8 @@ service = ${:etc}/service
 promise = ${:etc}/promise
 
 # gitlab: etc/ log/ ...
+# TODO var/run/ (for *.pid .lock)
+# XXX do we need gitlab/ subdir for all that? (services are already separated into different slappartX)
 [gitlab]
 recipe  = slapos.cookbook:mkdirectory
 etc     = ${directory:etc}/gitlab
@@ -173,7 +190,7 @@ var     = ${directory:var}/gitlab
 tmp     = ${:var}/tmp
 uploads = ${:var}/uploads
 repositories    = ${directory:srv}/repositories
-satellites      = ${directory:srv}/satellites
+# XXX goes away (?) satellites      = ${directory:srv}/satellites
 backup  = ${directory:srv}/backup
 
 

software/gitlab/instance.cfg.in

@@ -2,16 +2,22 @@
 [buildout]
 parts = switch-softwaretype
 
-
 # std stuff for slapos instance
 eggs-directory = ${buildout:eggs-directory}
 develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
 
+[switch-softwaretype]
+recipe = slapos.cookbook:softwaretype
+default = $${instance-gitlab.cfg:rendered}
+#single-default = $${dynamic-template-powerdns:rendered}
+
+
 [instance-gitlab.cfg]
 #<= jinja2-template-base
 recipe  = slapos.recipe.template:jinja2
+mode    = 0640
 template= ${instance-gitlab.cfg.in:target}
 rendered= $${buildout:directory}/instance-gitlab.cfg
 context =
@@ -32,9 +38,3 @@ context =
 
 # XXX hack - better use ${gitlab-shell-repository:location} directly
     raw gitlab_shell                ${gitlab-shell-repository:location}
-
-
-[switch-softwaretype]
-recipe = slapos.cookbook:softwaretype
-default = $${instance-gitlab.cfg:rendered}
-#single-default = $${dynamic-template-powerdns:rendered}