diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-26 08:31:58 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-26 08:56:39 +0100 |
| commit | cd0f14f23e9dd4eb36465c341cdc856457ac5bf0 (patch) | |
| tree | 8360552ac1a3224562bf98d28c984cb5008d3c98 /nixos/doc | |
| parent | e9393bd42607d1a6c7c10a835398437b906c008a (diff) | |
| download | nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.tar nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.tar.gz nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.tar.bz2 nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.tar.lz nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.tar.xz nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.tar.zst nixpkgs-cd0f14f23e9dd4eb36465c341cdc856457ac5bf0.zip | |
gitlab: Add documentation
Fixes #13303.
Diffstat (limited to 'nixos/doc')
| -rw-r--r-- | nixos/doc/manual/configuration/configuration.xml | 1 | ||||
| -rw-r--r-- | nixos/doc/manual/default.nix | 1 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-unstable.xml | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index 1e488b59343..ff00c4feb31 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -26,6 +26,7 @@ effect after you run <command>nixos-rebuild</command>.</para> <!-- FIXME: auto-include NixOS module docs --> <xi:include href="postgresql.xml" /> +<xi:include href="gitlab.xml" /> <xi:include href="acme.xml" /> <xi:include href="nixos.xml" /> diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index b4eb3cde81b..4eda7f94ab4 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -56,6 +56,7 @@ let cp -prd $sources/* . # */ chmod -R u+w . cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml + cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml cp ${../../modules/security/acme.xml} configuration/acme.xml cp ${../../modules/misc/nixos.xml} configuration/nixos.xml ln -s ${optionsDocBook} options-db.xml diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml index 22e605718e3..5bad7f63b61 100644 --- a/nixos/doc/manual/release-notes/rl-unstable.xml +++ b/nixos/doc/manual/release-notes/rl-unstable.xml @@ -231,6 +231,14 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ]; overriden by anything else.</para> </listitem> + <listitem> + <para>Large parts of the <literal>services.gitlab</literal> module has been + been rewritten. There are new configuration options available. The + <literal>stateDir</literal> option was renamned to + <literal>statePath</literal> and the <literal>satellitesDir</literal> option + was removed. Please review the currently available options.</para> + </listitem> + </itemizedlist> |