Move tools to new secrets location

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / cloud / nextcloud.nix

diff --git a/nixops/modules/websites/tools/cloud/nextcloud.nix b/nixops/modules/websites/tools/cloud/nextcloud.nix
index b339038b1496bfc766130f2b493bda7756aab117..b62606f10d6e2c7111627ebe8c64b573cd8bae9d 100644 (file)
--- a/nixops/modules/websites/tools/cloud/nextcloud.nix
+++ b/nixops/modules/websites/tools/cloud/nextcloud.nix
@@ -113,8 +113,8 @@ let
     };
   in rec {
     varDir = "/var/lib/nextcloud";
-    keys.tools-nextcloud = {
-      destDir = "/run/keys/webapps";
+    keys = [{
+      dest = "webapps/tools-nextcloud";
       user = apache.user;
       group = apache.group;
       permissions = "0600";
@@ -170,7 +170,7 @@ let
           'ldapProviderFactory' => '\\OCA\\User_LDAP\\LDAPProviderFactory',
         );
       '';
-    };
+    }];
     webRoot = stdenv.mkDerivation rec {
       name = "nextcloud-${version}";
       version = "15.0.4";
@@ -204,7 +204,7 @@ let
         install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir}
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
         install -D -m 0644 -o ${apache.user} -g ${apache.group} ${./nextcloud-config}/* -t ${varDir}/config
-        install -D -m 0600 -o ${apache.user} -g ${apache.group} -T /run/keys/webapps/tools-nextcloud ${varDir}/config/config.php
+        install -D -m 0600 -o ${apache.user} -g ${apache.group} -T /var/secrets/webapps/tools-nextcloud ${varDir}/config/config.php
       '';
     };
     apache = rec {