X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fttrss.nix;h=ca049e69b2a77f87a2ff6d98d143a193f17f48cd;hb=981634865c275c1f35e78a27c6d76cd9708fd7ef;hp=9e6f98d4be435f3243dada8138660c710e72893c;hpb=591ebd877b8d5465da95fd7e212da5ef747944ca;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/tools/ttrss.nix b/nixops/modules/websites/tools/tools/ttrss.nix
index 9e6f98d..ca049e6 100644
--- a/nixops/modules/websites/tools/tools/ttrss.nix
+++ b/nixops/modules/websites/tools/tools/ttrss.nix
@@ -94,11 +94,11 @@ let
         define('SPHINX_INDEX', 'ttrss, delta');
 
         define('ENABLE_REGISTRATION', false);
-        define('REG_NOTIFY_ADDRESS', 'outils@immae.eu');
+        define('REG_NOTIFY_ADDRESS', 'ttrss@tools.immae.eu');
         define('REG_MAX_USERS', 10);
 
         define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
-        define('SMTP_FROM_ADDRESS', 'outils@immae.eu');
+        define('SMTP_FROM_ADDRESS', 'ttrss@tools.immae.eu');
         define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
 
         define('LDAP_AUTH_SERVER_URI', 'ldap://ldap.immae.eu:389/');
@@ -118,7 +118,7 @@ let
     webRoot = stdenv.mkDerivation (fetchedGit ./tt-rss.json // rec {
       buildPhase = ''
         rm -rf lock feed-icons cache
-        ln -sf ../../../../../${varDir}/{lock,feed-icons,cache} .
+        ln -sf ${varDir}/{lock,feed-icons,cache} .
       '';
       installPhase = ''
         cp -a . $out
@@ -128,13 +128,15 @@ let
         )}
       '';
     });
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_ttrss";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /ttrss "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /ttrss "${root}"
+        <Directory "${root}">
           DirectoryIndex index.php
           <FilesMatch "\.php$">
             SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"