aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-06 14:07:03 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-06 14:07:03 +0200
commitf61d1c7cb908ab83cffe962cc73f1a86e692b6e5 (patch)
tree2b054346dc4aa7a1c0fa6b8edb6396cd7f9b1c9a
parent2630a5e928cda673e8e5ed56e5ceb2e95d29dd0b (diff)
downloadNix-f61d1c7cb908ab83cffe962cc73f1a86e692b6e5.tar.gz
Nix-f61d1c7cb908ab83cffe962cc73f1a86e692b6e5.tar.zst
Nix-f61d1c7cb908ab83cffe962cc73f1a86e692b6e5.zip
Rename davical config field to avoid clash
-rw-r--r--nixops/modules/websites/tools/dav/davical.nix2
-rw-r--r--pkgs/webapps/davical/default.nix4
2 files changed, 3 insertions, 3 deletions
diff --git a/nixops/modules/websites/tools/dav/davical.nix b/nixops/modules/websites/tools/dav/davical.nix
index 6b37f11..634359d 100644
--- a/nixops/modules/websites/tools/dav/davical.nix
+++ b/nixops/modules/websites/tools/dav/davical.nix
@@ -59,7 +59,7 @@ rec {
59 include('drivers_ldap.php'); 59 include('drivers_ldap.php');
60 ''; 60 '';
61 }]; 61 }];
62 webapp = davical.override { config = "/var/secrets/webapps/dav-davical"; }; 62 webapp = davical.override { davical_config = "/var/secrets/webapps/dav-davical"; };
63 webRoot = "${webapp}/htdocs"; 63 webRoot = "${webapp}/htdocs";
64 apache = rec { 64 apache = rec {
65 user = "wwwrun"; 65 user = "wwwrun";
diff --git a/pkgs/webapps/davical/default.nix b/pkgs/webapps/davical/default.nix
index fefc00f..52d8736 100644
--- a/pkgs/webapps/davical/default.nix
+++ b/pkgs/webapps/davical/default.nix
@@ -1,4 +1,4 @@
1{ config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }: 1{ davical_config ? "/etc/davical/config.php", stdenv, fetchurl, gettext }:
2stdenv.mkDerivation rec { 2stdenv.mkDerivation rec {
3 version = "1.1.7"; 3 version = "1.1.7";
4 name = "davical-${version}"; 4 name = "davical-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
14 installPhase = '' 14 installPhase = ''
15 mkdir -p $out 15 mkdir -p $out
16 cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out 16 cp -ra config dba docs htdocs inc locale po scripts testing zonedb $out
17 ln -s ${config} $out/config/config.php 17 ln -s ${davical_config} $out/config/config.php
18 ''; 18 '';
19 buildInputs = [ gettext ]; 19 buildInputs = [ gettext ];
20} 20}