Move tools to new secrets location

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

diff --git a/nixops/modules/websites/tools/cloud/default.nix b/nixops/modules/websites/tools/cloud/default.nix
index f014776c88efaa32d083ed6b7a0b3610e5a33074..5c3e9a8e7cb8cf2b7ce7c2c06c039235af6582f7 100644 (file)
--- a/nixops/modules/websites/tools/cloud/default.nix
+++ b/nixops/modules/websites/tools/cloud/default.nix
@@ -18,13 +18,14 @@ in {
     services.myWebsites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
       hosts       = ["cloud.immae.eu" ];
-      root        = nextcloud.webRoot;
+      root        = nextcloud.apache.root;
       extraConfig = [
         nextcloud.apache.vhostConf
       ];
     };
 
-    environment.systemPackages = let
+    mySecrets.keys = nextcloud.keys;
+    users.users.root.packages = let
       occ = pkgs.writeScriptBin "nextcloud-occ" ''
         #! ${pkgs.stdenv.shell}
         cd ${nextcloud.webRoot}
@@ -37,6 +38,10 @@ in {
     in [ occ ];
 
     system.activationScripts.nextcloud = nextcloud.activationScript;
+    system.extraSystemBuilderCmds = ''
+      mkdir -p $out/webapps
+      ln -s ${nextcloud.webRoot} $out/webapps/${nextcloud.apache.webappName}
+      '';
 
     services.myPhpfpm = {
       poolPhpConfigs.nextcloud = nextcloud.phpFpm.phpConfig;