X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fttrss.nix;h=c66b99d2780619b3b1c3fdddb7f08157f49ffaaf;hb=7636abc6bfcdca34d4b90a144365235012275339;hp=76105be615c35f67aff5602700d6c46db16d80fb;hpb=01f21083a897b86bf148f1d2bb9c8edca4d3786a;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 76105be..c66b99d 100644
--- a/nixops/modules/websites/tools/tools/ttrss.nix
+++ b/nixops/modules/websites/tools/tools/ttrss.nix
@@ -66,11 +66,11 @@ let
         define('MYSQL_CHARSET', 'UTF8');
 
         define('DB_TYPE', 'pgsql');
-        define('DB_HOST', 'db-1.immae.eu');
-        define('DB_USER', 'ttrss');
-        define('DB_NAME', 'ttrss');
+        define('DB_HOST', '${env.postgresql.socket}');
+        define('DB_USER', '${env.postgresql.user}');
+        define('DB_NAME', '${env.postgresql.database}');
         define('DB_PASS', '${env.postgresql.password}');
-        define('DB_PORT', '5432');
+        define('DB_PORT', '${env.postgresql.port}');
 
         define('AUTH_AUTO_CREATE', true);
         define('AUTH_AUTO_LOGIN', true);
@@ -97,11 +97,6 @@ let
         define('REG_NOTIFY_ADDRESS', 'outils@immae.eu');
         define('REG_MAX_USERS', 10);
 
-        define('SMTP_SERVER', 'mail.immae.eu:25');
-        define('SMTP_LOGIN', ''');
-        define('SMTP_PASSWORD', ''');
-        define('SMTP_SECURE', 'tls');
-
         define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
         define('SMTP_FROM_ADDRESS', 'outils@immae.eu');
         define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
@@ -133,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"