Rename davical config field to avoid clash

diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix
index 6b37f11b3505d206b9101e1210842b31cab3459a..634359dabe0b0afa2a62133a5acaaba596885152 100644 (file)
--- a/nixops/modules/websites/tools/dav/davical.nix
+++ b/nixops/modules/websites/tools/dav/davical.nix
@@ -59,7 +59,7 @@ rec {
       include('drivers_ldap.php');
     '';
   }];
-  webapp = davical.override { config = "/var/secrets/webapps/dav-davical"; };
+  webapp = davical.override { davical_config = "/var/secrets/webapps/dav-davical"; };
   webRoot = "${webapp}/htdocs";
   apache = rec {
     user = "wwwrun";

diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix
index fefc00fe46585f9967864fb2150efa137658798c..52d873664f722f4aead70a8d10b4f104c2e615af 100644 (file)
--- a/pkgs/webapps/davical/default.nix
+++ b/pkgs/webapps/davical/default.nix
@@ -1,4 +1,4 @@
-{ config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
+{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
 stdenv.mkDerivation rec {
   version = "1.1.7";
   name = "davical-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
-    ln -s ${config} $out/config/config.php
+    ln -s ${davical_config} $out/config/config.php
   '';
   buildInputs = [ gettext ];
 }