gitlab module: update documentation

This commit is contained in:
Franz Pletz 2016-08-04 02:23:08 +02:00
parent d8fd06641a
commit 8a8971788c

View File

@ -14,29 +14,22 @@
<literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a <literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a
webserver to proxy HTTP requests to the socket.</para> webserver to proxy HTTP requests to the socket.</para>
<para>For instance, this could be used for Nginx: <para>For instance, the following configuration could be used to use nginx as
frontend proxy:
<programlisting> <programlisting>
services.nginx.httpConfig = '' services.nginx = {
server { enable = true;
server_name git.example.com; recommendedGzipSettings = true;
listen 443 ssl spdy; recommendedOptimisation = true;
listen [::]:443 ssl spdy; recommendedProxySettings = true;
recommendedTlsSettings = true;
ssl_certificate /var/lib/acme/git.example.com/fullchain.pem; virtualHosts."git.example.com" = {
ssl_certificate_key /var/lib/acme/git.example.com/key.pem; enableACME = true;
forceSSL = true;
location / { locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
proxy_http_version 1.1; };
proxy_set_header Host $http_host; };
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-Ssl on;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_pass http://unix:/run/gitlab/gitlab-workhorse.socket;
}
}
''; '';
</programlisting> </programlisting>
</para> </para>
@ -49,10 +42,10 @@ services.nginx.httpConfig = ''
both services. In the case of PostgreSQL, a database and a role will be created. both services. In the case of PostgreSQL, a database and a role will be created.
</para> </para>
<para>The default state dir is /var/gitlab/state. This is where all data like <para>The default state dir is <literal>/var/gitlab/state</literal>. This is where
the repositories and uploads will be stored.</para> all data like the repositories and uploads will be stored.</para>
<para>A basic configuration could look like this: <para>A basic configuration with some custom settings could look like this:
<programlisting> <programlisting>
services.gitlab = { services.gitlab = {
@ -64,8 +57,16 @@ services.gitlab = {
port = 443; port = 443;
user = "git"; user = "git";
group = "git"; group = "git";
smtp = {
enable = true;
address = "localhost";
port = 25;
};
extraConfig = { extraConfig = {
gitlab = { gitlab = {
email_from = "gitlab-no-reply@example.com";
email_display_name = "Example GitLab";
email_reply_to = "gitlab-no-reply@example.com";
default_projects_features = { builds = false; }; default_projects_features = { builds = false; };
}; };
}; };