Cleanup e-mails from immae.eu domains

[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 ad440578b990edd38d134c90c9f68d1205bcf279..59930fb0122587419fd92d6abfe9fa80e277e9a5 100644 (file)
--- a/nixops/modules/websites/tools/cloud/nextcloud.nix
+++ b/nixops/modules/websites/tools/cloud/nextcloud.nix
@@ -148,9 +148,9 @@ let
         'mail_smtphost' => '127.0.0.1',
         'mail_smtpname' => ''',
         'mail_smtppassword' => ''',
-        'mail_from_address' => 'owncloud',
+        'mail_from_address' => 'nextcloud',
         'mail_smtpauth' => false,
-        'mail_domain' => 'immae.eu',
+        'mail_domain' => 'tools.immae.eu',
         'memcache.local' => '\\OC\\Memcache\\APCu',
         'memcache.locking' => '\\OC\\Memcache\\Redis',
         'filelocking.enabled' => true,
@@ -188,7 +188,7 @@ let
         mkdir -p $out/
         cp -R . $out/
         rm -r $out/config
-        ln -sf ../../../../../${varDir}/config $out/config
+        ln -sf ${varDir}/config $out/config
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/apps/${name}") apps
         )}
@@ -214,13 +214,15 @@ let
         fi
       '';
     };
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_nextcloud";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
         SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-        <Directory ${webRoot}>
+        <Directory ${root}>
           AcceptPathInfo On
           DirectoryIndex index.php
           Options FollowSymlinks
@@ -262,7 +264,8 @@ let
         php_admin_value[output_buffering] = 0
         php_admin_value[max_execution_time] = 1800
         php_admin_value[zend_extension] = "opcache"
-        php_value[opcache.enable] = 1
+        ;already enabled by default?
+        ;php_value[opcache.enable] = 1
         php_value[opcache.enable_cli] = 1
         php_value[opcache.interned_strings_buffer] = 8
         php_value[opcache.max_accelerated_files] = 10000