X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Fgit%2Fmantisbt%2Fmantisbt.nix;h=0cd98a1901f4afa2522d6a1295782f45a79403b5;hb=0f466f6d5aec0d3fcf406fe2bb71effa5a1a1386;hp=b1837eb49e2f09a4c587b1fe55a3a24acd538076;hpb=591ebd877b8d5465da95fd7e212da5ef747944ca;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
index b1837eb..0cd98a1 100644
--- a/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
+++ b/nixops/modules/websites/tools/git/mantisbt/mantisbt.nix
@@ -34,10 +34,10 @@ let
       $g_smtp_host		= 'localhost';
       $g_smtp_username		= ''';
       $g_smtp_password		= ''';
-      $g_webmaster_email	= 'webmaster@immae.eu';
-      $g_from_email		= 'noreply@immae.eu';
-      $g_return_path_email	= 'webmaster@immae.eu';
-      $g_from_name		= 'Mantis Bug Tracker at immae.eu';
+      $g_webmaster_email	= 'mantisbt@tools.immae.eu';
+      $g_from_email		= 'mantisbt@tools.immae.eu';
+      $g_return_path_email	= 'mantisbt@tools.immae.eu';
+      $g_from_name		= 'Mantis Bug Tracker at git.immae.eu';
       $g_email_receive_own	= OFF;
       # --- LDAP ---
       $g_login_method = LDAP;
@@ -72,13 +72,15 @@ let
         ln -s ${plugins.source-integration}/Source* $out/plugins/
       '';
     };
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_mantisbt";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /mantisbt "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /mantisbt "${root}"
+        <Directory "${root}">
           DirectoryIndex index.php
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
@@ -88,7 +90,7 @@ let
           Options FollowSymlinks
           Require all granted
         </Directory>
-        <Directory "${webRoot}/admin">
+        <Directory "${root}/admin">
           #Reenable during upgrade
           Require all denied
         </Directory>