1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-28 03:56:48 +03:00

* Got rid of the extraPath field in jobs (use

environment.systemPackages instead).  Also renamed
  services.extraJobs to jobs.

svn path=/nixos/branches/modular-nixos/; revision=16370
This commit is contained in:
Eelco Dolstra 2009-07-15 11:19:11 +00:00
parent def0be732f
commit ca8e00cafa
8 changed files with 544 additions and 554 deletions

View file

@ -1,80 +1,7 @@
{pkgs, config, ...}:
###### interface
let
inherit (pkgs.lib) mkOption mkIf;
options = {
services = {
postgresql = {
enable = mkOption {
default = false;
description = "
Whether to run PostgreSQL.
";
};
port = mkOption {
default = "5432";
description = "
Port for PostgreSQL.
";
};
logDir = mkOption {
default = "/var/log/postgresql";
description = "
Log directory for PostgreSQL.
";
};
dataDir = mkOption {
default = "/var/db/postgresql";
description = "
Data directory for PostgreSQL.
";
};
subServices = mkOption {
default = [];
description = "
Subservices list. As it is already implememnted,
here is an interface...
";
};
authentication = mkOption {
default = ''
# Generated file; do not edit!
local all all ident sameuser
host all all 127.0.0.1/32 md5
host all all ::1/128 md5
'';
description = "
Hosts (except localhost), who you allow to connect.
";
};
allowedHosts = mkOption {
default = [];
description = "
Hosts (except localhost), who you allow to connect.
";
};
authMethod = mkOption {
default = " ident sameuser ";
description = "
How to authorize users.
Note: ident needs absolute trust to all allowed client hosts.";
};
enableTCPIP = mkOption {
default = false;
description = "
Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
";
};
};
};
};
in
###### implementation
let
inherit (pkgs.lib) mkOption mkIf singleton;
cfg = config.services.postgresql;
@ -83,35 +10,111 @@ let
startDependency = if config.services.gw6c.enable then
"gw6c" else "network-interfaces";
run = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh postgres";
run = "${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} postgres";
flags = if cfg.enableTCPIP then ["-i"] else [];
in
mkIf config.services.postgresql.enable {
require = [
options
];
{
###### interface
options = {
services.postgresql = {
enable = mkOption {
default = false;
description = ''
Whether to run PostgreSQL.
'';
};
port = mkOption {
default = "5432";
description = ''
Port for PostgreSQL.
'';
};
logDir = mkOption {
default = "/var/log/postgresql";
description = ''
Log directory for PostgreSQL.
'';
};
dataDir = mkOption {
default = "/var/db/postgresql";
description = ''
Data directory for PostgreSQL.
'';
};
subServices = mkOption {
default = [];
description = ''
Subservices list. As it is already implememnted,
here is an interface...
'';
};
authentication = mkOption {
default = ''
# Generated file; do not edit!
local all all ident sameuser
host all all 127.0.0.1/32 md5
host all all ::1/128 md5
'';
description = ''
Hosts (except localhost), who you allow to connect.
'';
};
allowedHosts = mkOption {
default = [];
description = ''
Hosts (except localhost), who you allow to connect.
'';
};
authMethod = mkOption {
default = " ident sameuser ";
description = ''
How to authorize users.
Note: ident needs absolute trust to all allowed client hosts.
'';
};
enableTCPIP = mkOption {
default = false;
description = ''
Whether to run PostgreSQL with -i flag to enable TCP/IP connections.
'';
};
};
users = {
extraUsers = [
{ name = "postgres";
description = "PostgreSQL server user";
}
];
extraGroups = [
{ name = "postgres"; }
];
};
services = {
extraJobs = [{
name = "postgresql";
extraPath = [postgresql];
###### implementation
config = mkIf config.services.postgresql.enable {
users.extraUsers = singleton
{ name = "postgres";
description = "PostgreSQL server user";
};
users.extraGroups = singleton
{ name = "postgres"; };
environment.systemPackages = [postgresql];
jobs = singleton {
name = "postgresql";
job = ''
description "PostgreSQL server"
@ -130,6 +133,8 @@ mkIf config.services.postgresql.enable {
respawn ${run} -c '${postgresql}/bin/postgres -D ${cfg.dataDir} ${toString flags}'
'';
}];
};
};
}