summary refs log tree commit diff
path: root/modules/services/networking/prayer.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-06-10 14:51:43 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-06-10 14:51:43 +0000
commit9b833aafb974b26bde7636a3f827fcade8b4e7ec (patch)
tree25c9132fa36368b227a9e35223682eac19090cc8 /modules/services/networking/prayer.nix
parent78333e5d845cfb71a5fdb329c39e06ba12b85f78 (diff)
downloadnixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.tar
nixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.tar.gz
nixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.tar.bz2
nixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.tar.lz
nixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.tar.xz
nixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.tar.zst
nixpkgs-9b833aafb974b26bde7636a3f827fcade8b4e7ec.zip
Fix prayer so it does not start a server at port 80.
svn path=/nixos/trunk/; revision=34420
Diffstat (limited to 'modules/services/networking/prayer.nix')
-rw-r--r--modules/services/networking/prayer.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/services/networking/prayer.nix b/modules/services/networking/prayer.nix
index 0424a252087..fb541bf101a 100644
--- a/modules/services/networking/prayer.nix
+++ b/modules/services/networking/prayer.nix
@@ -26,7 +26,9 @@ let
   '';
 
   prayerCfg = pkgs.runCommand "prayer.cf" { } ''
-    cat ${prayer}/etc/prayer.cf ${prayerExtraCfg} > $out
+    # We have to remove the http_port 80, or it will start a server there
+    cat ${prayer}/etc/prayer.cf | grep -v http_port > $out
+    cat ${prayerExtraCfg} >> $out
   '';
 
 in