diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index e15c700017c4..8fde0dc7e611 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -24,6 +24,9 @@ effect after you run nixos-rebuild.
+
+
+
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index f5cc33919b8f..47e01437ccc4 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -41,6 +41,8 @@ let
copySources =
''
cp -prd $sources/* . # */
+ chmod -R u+w .
+ cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
ln -s ${optionsDocBook} options-db.xml
echo "${version}" > version
'';
@@ -74,7 +76,7 @@ in rec {
--param toc.section.depth 3 \
--stringparam admon.style "" \
--stringparam callout.graphics.extension .gif \
- --param chunk.section.depth 1 \
+ --param chunk.section.depth 0 \
--param chunk.first.sections 1 \
--param use.id.as.filename 1 \
--stringparam generate.toc "book toc chapter toc appendix toc" \
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
new file mode 100644
index 000000000000..e98b431bd60a
--- /dev/null
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -0,0 +1,77 @@
+
+
+PostgreSQL
+
+
+
+
+Source: modules/services/databases/postgresql.nix
+
+Upstream documentation:
+
+
+
+PostgreSQL is an advanced, free relational database.
+
+Configuring
+
+To enable PostgreSQL, add the following to your
+configuration.nix:
+
+
+services.postgresql.enable = true;
+services.postgresql.package = pkgs.postgresql93;
+
+
+Note that you are required to specify the desired version of
+PostgreSQL (e.g. pkgs.postgresql93). Since
+upgrading your PostgreSQL version requires a database dump and reload
+(see below), NixOS cannot provide a default value for
+ such as the most recent
+release of PostgreSQL.
+
+
+
+By default, PostgreSQL stores its databases in
+/var/db/postgresql. You can override this using
+, e.g.
+
+
+services.postgresql.dataDir = "/data/postgresql";
+
+
+
+
+
+
+
+Upgrading
+
+FIXME: document dump/upgrade/load cycle.
+
+
+
+
+Options
+
+FIXME: auto-generated list of module options.
+
+
+
+
+