diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-26 14:08:53 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-26 15:03:19 +0200 |
| commit | d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937 (patch) | |
| tree | bd0d5ab1dffd3978d52598b06f87fd64dac747dc /nixos/modules/services/misc/gitlab.xml | |
| parent | 693be25cc36504c248be98632bdfe73ae78e00fa (diff) | |
| download | nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.tar nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.tar.gz nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.tar.bz2 nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.tar.lz nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.tar.xz nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.tar.zst nixpkgs-d70f83e7e95cdac4eb7bdedf80f0a9e8ba3d3937.zip | |
gitlab: 8.10.6 -> 8.11.2
Diffstat (limited to 'nixos/modules/services/misc/gitlab.xml')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.xml | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml index 83f715a50b4..43836ef5fce 100644 --- a/nixos/modules/services/misc/gitlab.xml +++ b/nixos/modules/services/misc/gitlab.xml @@ -62,7 +62,11 @@ services.gitlab = { address = "localhost"; port = 25; }; - secrets.db_key_base = "ei3eeP1ohsh0uu3ad4YeeMeeheengah3AiZee2ohl4Ooj5mie4Ohl0vishoghaes"; + secrets = { + db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6"; + secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3"; + otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI"; + }; extraConfig = { gitlab = { email_from = "gitlab-no-reply@example.com"; @@ -75,11 +79,12 @@ services.gitlab = { </programlisting> </para> -<para>If you're setting up a new Gitlab instance, generate a new -<literal>db_key_base</literal> secret to encrypt sensible data in the -database. If you're restoring an existing Gitlab instance, you must -specify the <literal>db_key_base</literal> secret from -<literal>config/secrets.yml</literal> in your Gitlab state folder.</para> +<para>If you're setting up a new Gitlab instance, generate new secrets. You +for instance use <literal>tr -dc A-Za-z0-9 < /dev/urandom | head -c 128</literal> +to generate a new secret. Gitlab encrypts sensitive data stored in the database. +If you're restoring an existing Gitlab instance, you must specify the secrets +secret from <literal>config/secrets.yml</literal> located in your Gitlab state +folder.</para> <para>Refer to <xref linkend="ch-options" /> for all available configuration options for the <literal>services.gitlab</literal> module.</para> |