Fixing documentation about the prayer module, and adding a port setting,
defaulting to something other than 80 at least. svn path=/nixos/trunk/; revision=30363
This commit is contained in:
parent
de5eedb612
commit
d9356e9a35
1 changed files with 9 additions and 12 deletions
|
@ -6,6 +6,8 @@ let
|
||||||
|
|
||||||
inherit (pkgs) prayer;
|
inherit (pkgs) prayer;
|
||||||
|
|
||||||
|
cfg = config.services.prayer;
|
||||||
|
|
||||||
stateDir = "/var/lib/prayer";
|
stateDir = "/var/lib/prayer";
|
||||||
|
|
||||||
prayerUser = "prayer";
|
prayerUser = "prayer";
|
||||||
|
@ -18,7 +20,9 @@ let
|
||||||
prayer_group = "${prayerGroup}"
|
prayer_group = "${prayerGroup}"
|
||||||
sendmail_path = "/var/setuid-wrappers/sendmail"
|
sendmail_path = "/var/setuid-wrappers/sendmail"
|
||||||
|
|
||||||
${config.services.prayer.extraConfig}
|
use_http_port ${cfg.port}
|
||||||
|
|
||||||
|
${cfg.extraConfig}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
prayerCfg = pkgs.runCommand "prayer.cf" { } ''
|
prayerCfg = pkgs.runCommand "prayer.cf" { } ''
|
||||||
|
@ -38,21 +42,14 @@ in
|
||||||
enable = mkOption {
|
enable = mkOption {
|
||||||
default = false;
|
default = false;
|
||||||
description = ''
|
description = ''
|
||||||
Whether to run the machine as a HTTP proxy server.
|
Whether to run the prayer webmail http server.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
listenAddress = mkOption {
|
port = mkOption {
|
||||||
default = "127.0.0.1:8118";
|
default = "2080";
|
||||||
description = ''
|
description = ''
|
||||||
Address the proxy server is listening to.
|
Port the prayer http server is listening to.
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
logDir = mkOption {
|
|
||||||
default = "/var/log/prayer" ;
|
|
||||||
description = ''
|
|
||||||
Location for prayer log files.
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue