Move tools websites to stable web directories

[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 241b98251debab4c09b6d6ad9d34bb21c908a3cd..360d52c5ae97396d68fe95c8975ed35ce6e44e07 100644 (file)
--- a/nixops/modules/websites/tools/cloud/default.nix
+++ b/nixops/modules/websites/tools/cloud/default.nix
@@ -18,7 +18,7 @@ in {
     services.myWebsites.tools.vhostConfs.cloud = {
       certName    = "eldiron";
       hosts       = ["cloud.immae.eu" ];
-      root        = nextcloud.webRoot;
+      root        = nextcloud.apache.root;
       extraConfig = [
         nextcloud.apache.vhostConf
       ];
@@ -30,18 +30,31 @@ in {
         cd ${nextcloud.webRoot}
         NEXTCLOUD_CONFIG_DIR="${nextcloud.webRoot}/config" \
           exec \
-          ${pkgs.php}/bin/php \
+          sudo -u wwwrun ${pkgs.php}/bin/php \
           -c ${pkgs.php}/etc/php.ini \
           occ $*
         '';
     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;
       poolConfigs.nextcloud = nextcloud.phpFpm.pool;
     };
 
+    services.cron = {
+      enable = true;
+      systemCronJobs = [
+        ''
+          LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
+          */15 * * * * wwwrun ${pkgs.php}/bin/php -f ${nextcloud.webRoot}/cron.php
+        ''
+      ];
+    };
   };
 }