From 3ed3977166344f0fcada575234f2939f925e34f1 Mon Sep 17 00:00:00 2001 From: Matej Cotman Date: Wed, 21 Jan 2015 22:47:28 +0100 Subject: [PATCH] owncloud: make .htaccess available --- nixos/modules/services/web-servers/apache-httpd/owncloud.nix | 4 ++++ pkgs/servers/owncloud/default.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 0856f322f77..3bea3c3ee1d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -352,6 +352,10 @@ rec { RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + + + ${builtins.readFile "${pkgs.owncloud}/.htaccess"} + ''; globalEnvVars = [ diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index a1389a1e3d3..ef01a3976bc 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r * $out + find . -maxdepth 1 -execdir cp -r '{}' $out \; substituteInPlace $out/lib/base.php \ --replace 'OC_Config::$object = new \OC\Config(self::$configDir);' \