X nginx stub

software/gitlab/instance-nginx.cfg.in

+# TODO nginx instance

software/gitlab/software.cfg

@@ -8,6 +8,7 @@ extends =
     ../../component/icu/buildout.cfg
     ../../component/pkgconfig/buildout.cfg
     ../../component/nodejs/buildout.cfg
+    ../../component/nginx/buildout.cfg
 
 
 parts =
@@ -36,6 +37,10 @@ parts =
 
     gems
 
+# nginx
+    nginx-output
+    nginx.conf.in
+
     instance.cfg
 #   instance-gitlab.cfg
 
@@ -44,8 +49,7 @@ parts =
     slapos-cookbook
     eggs
 
-#extends = https://lab.nexedi.cn/kirr/slapos/raw/master/software/helloworld/software.cfg
-#extends = /home/kirr/src/wendelin/slapos/slapos/software/helloworld/software.cfg
+#extends = https://lab.nexedi.com/kirr/slapos/raw/master/software/helloworld/software.cfg
 
 
 # eggs for instance.cfg
@@ -173,28 +177,33 @@ output  = ${buildout:directory}/instance.cfg
 # TODO md5
 
 
-# [instance-gitlab.cfg]
-# recipe  = slapos.recipe.template
-# url     = ${:_profile_base_location_}/instance-gitlab.cfg.in
-# output  = ${buildout:directory}/instance-gitlab.cfg
-# # TODO md5
+# macro: download a file named as section name
+#
+#   [filename]
+#   <= download-file
+#   md5sum = ...
+[download-file]
+recipe  = slapos.recipe.build:download
+url     = ${:_profile_base_location_}/${:_buildout_section_name_}
+destination = ${buildout:directory}/${:_buildout_section_name_}
+
+# like download-file, but download from template/<filename>
+[download-template]
+<= download-file
+url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
+
+
 
 [instance-gitlab.cfg.in]
-recipe  = slapos.recipe.build:download
-url     = ${:_profile_base_location_}/instance-gitlab.cfg.in
-destination = ${buildout:directory}/instance-gitlab.cfg.in
-#output  = ${buildout:directory}/instance-gitlab.cfg
+<= download-file
 # TODO md5
 
+# XXX is it a good idea to split nginx into separate instance?
+[instance-nginx.cfg.in]
+<= download-file
+# TODO md5
 
 
-# TODO parts/database.yml.in/database.yml.in -> parts/database.yml.in
-# XXX -> slapos.recipe.build:download (with destination) ?
-[download-template]
-recipe  = slapos.recipe.download
-download-only = true
-url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
-
 [database.yml.in]
 <= download-template
 # md5sum = TODO
@@ -212,6 +221,12 @@ url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 # md5sum = TODO
 
 
+[nginx.conf.in]
+<= download-template
+# TODO md5
+
+
+
 
 # [buildout]
 # gems-directory  = gemsAAA   # XXX = good idea?

software/gitlab/template/nginx.conf.in

+# @autogenerated XXX
+# see:
+# https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab-ssl
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
+# (last updated for TODO)