From d9356e9a35aa9d2f055170878c3ab07c6488b620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 9 Nov 2011 21:08:50 +0000
Subject: [PATCH] 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
---
 modules/services/networking/prayer.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/services/networking/prayer.nix b/modules/services/networking/prayer.nix
index 10130c240490..adfce5a50302 100644
--- a/modules/services/networking/prayer.nix
+++ b/modules/services/networking/prayer.nix
@@ -6,6 +6,8 @@ let
 
   inherit (pkgs) prayer;
 
+  cfg = config.services.prayer;
+
   stateDir = "/var/lib/prayer";
 
   prayerUser = "prayer";
@@ -18,7 +20,9 @@ let
     prayer_group = "${prayerGroup}"
     sendmail_path = "/var/setuid-wrappers/sendmail"
 
-    ${config.services.prayer.extraConfig}
+    use_http_port ${cfg.port}
+
+    ${cfg.extraConfig}
   '';
 
   prayerCfg = pkgs.runCommand "prayer.cf" { } ''
@@ -38,21 +42,14 @@ in
       enable = mkOption {
         default = false;
         description = ''
-          Whether to run the machine as a HTTP proxy server.
+          Whether to run the prayer webmail http server.
         '';
       };
 
-      listenAddress = mkOption {
-        default = "127.0.0.1:8118";
+      port = mkOption {
+        default = "2080";
         description = ''
-          Address the proxy server is listening to.
-        '';
-      };
-
-      logDir = mkOption {
-        default = "/var/log/prayer" ;
-        description = ''
-          Location for prayer log files.
+          Port the prayer http server is listening to.
         '';
       };