Merge branch 'fix-nginx-and-generate' into 'master'

Fix nginx templator for ssl and change the quiet option for pull

Whoops the nginx template was not updated in the repository and the quiet option for git pull was in the wrong place.

/cc @axil

See merge request !41

generate.rb

@@ -32,7 +32,7 @@ def main
     unless 'no-clone' == ARGV[0]
       if File.exist?("#{tmp_dir}/.git/config")
-        system("git -C #{tmp_dir} #{ENV['PROGRESS'] ? nil : '--quiet'} pull")
+        system("git -C #{tmp_dir} pull #{ENV['PROGRESS'] ? nil : '--quiet'}")
       else
         system("rm -rf #{tmp_dir}")
         system("git clone #{ENV['PROGRESS'] ? nil : '--quiet'} -- #{clone_url} #{tmp_dir}")
@@ -141,4 +141,4 @@ else
   $progress = StringIO.new
 end
-main
+main
\ No newline at end of file

nginx

 # Nginx config file
 server {
-    listen 80;
-    server_name doc.gitlab.com;
-    return 301 $scheme://docs.gitlab.com$request_uri;
+  listen 80;
+  server_tokens off;
+  return 301 https://docs.gitlab.com$request_uri;
 }
 server {
-	listen   80; ## listen for ipv4; this line is default and implied
-	root /srv/doc-gitlab-com;
-	index README.html index.html index.htm;
-	server_name docs.gitlab.com;
-	location / {
-		try_files $uri $uri/ =404;
-	}
-	rewrite ^/ci/(.*)$ /ce/ci/$1 permanent;
-
-	error_page 404 /404.html;
+  listen 443;
+  server_name docs.gitlab.com;
+  server_name_in_redirect off;
+  add_header Strict-Transport-Security "max-age=31536000; includeSubdomains";
+  ssl on;
+  ssl_certificate /etc/ssl/docs.gitlab.com.crt;
+  ssl_certificate_key /etc/ssl/docs.gitlab.com.key;
+  ssl_protocols  TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers "ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+  root /srv/doc-gitlab-com;
+  index README.html index.html index.htm;
+  location / {
+    try_files $uri $uri/ =404;
+  }
+  rewrite ^/ci/(.*)$ /ce/ci/$1 permanent;
+  error_page 404 /404.html;
 }