gitlab: Hook nginx configuration files into SR system

Like with Rails configuration files, hook nginx configuration files into
SR / instance build process; rename *.erb -> *.in and add our header.

The templates are still not valid - a lot of erb code is left there -
we'll slapos'ify it incrementally in the following patches.

/cc @kazuhiko, @jerome

software/gitlab/instance-gitlab.cfg.in

@@ -163,6 +163,10 @@ context-extra =
 <= etc-template
 rendered= ${gitlab:etc}/${:_buildout_section_name_}
 
+[nginx-etc-template]
+<= etc-template
+rendered= ${nginx:etc}/${:_buildout_section_name_}
+
 
 [config.ru]
 <= gitlab-etc-template
@@ -200,6 +204,14 @@ context-extra =
     section gitlab_shell            gitlab-shell
     section gitlab_shell_work       gitlab-shell-work
 
+[nginx.conf]
+<= nginx-etc-template
+template= {{ nginx_conf_in }}
+
+[nginx-gitlab-http.conf]
+<= nginx-etc-template
+template= {{ nginx_gitlab_http_conf_in }}
+
 [rack_attack.rb]
 <= gitlab-etc-template
 template = {{ rack_attack_rb_in }}

software/gitlab/instance.cfg.in

@@ -54,6 +54,8 @@ context =
     raw gitlab_unicorn_startup_in   ${gitlab-unicorn-startup.in:target}
     raw gitlab_yml_in               ${gitlab.yml.in:target}
     raw macrolib_cfg_in             ${macrolib.cfg.in:target}
+    raw nginx_conf_in               ${nginx.conf.in:target}
+    raw nginx_gitlab_http_conf_in   ${nginx-gitlab-http.conf.in:target}
     raw rack_attack_rb_in           ${rack_attack.rb.in:target}
     raw resque_yml_in               ${resque.yml.in:target}
     raw smtp_settings_rb_in         ${smtp_settings.rb.in:target}

software/gitlab/software.cfg

@@ -235,6 +235,14 @@ url     = ${:_profile_base_location_}/template/${:_buildout_section_name_}
 <= download-file
 # md5sum = TODO
 
+[nginx-gitlab-http.conf.in]
+<= download-template
+# md5sum = TODO
+
+[nginx.conf.in]
+<= download-template
+# md5sum = TODO
+
 [rack_attack.rb.in]
 <= download-template
 # md5sum = TODO

software/gitlab/template/nginx-gitlab-http.conf.erb → software/gitlab/template/nginx-gitlab-http.conf.in

-# This file is managed by gitlab-ctl. Manual changes will be
-# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
-# and run `sudo gitlab-ctl reconfigure`.
+{{ autogenerated }}
+# see:
+# https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
+# (last updated for omnibus-gitlab 8.2.3+ce.0-0-g8eda093)
 
 ## GitLab
 ## Modified from https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab-ssl & https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/support/nginx/gitlab

software/gitlab/template/nginx.conf.erb → software/gitlab/template/nginx.conf.in

-# This file is managed by gitlab-ctl. Manual changes will be
-# erased! To change the contents below, edit /etc/gitlab/gitlab.rb
-# and run `sudo gitlab-ctl reconfigure`.
+{{ autogenerated }}
+# 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.conf.erb
+# (last updated for omnibus-gitlab 8.2.3+ce.0-0-g8eda093)
 
 user <%= node['gitlab']['web-server']['username'] %> <%= node['gitlab']['web-server']['group']%>;
 worker_processes <%= @worker_processes %>;