X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fttrss.nix;h=0fe94f9840cc7f71aeb1e12a2026a64313226814;hb=85f5ed68104de9edd8f8e532dc0c2de931e3ca1b;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..0fe94f9 100644
--- a/nixops/modules/websites/tools/tools/ttrss.nix
+++ b/nixops/modules/websites/tools/tools/ttrss.nix
@@ -52,89 +52,97 @@ let
         install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
       '';
     };
-    config = writeText "config.php" ''
-      <?php
+    keys.tools-ttrss = {
+      destDir = "/run/keys/webapps";
+      user = apache.user;
+      group = apache.group;
+      permissions = "0400";
+      text = ''
+        <?php
 
-        define('PHP_EXECUTABLE', '${php}/bin/php');
+          define('PHP_EXECUTABLE', '${php}/bin/php');
 
-        define('LOCK_DIRECTORY', 'lock');
-        define('CACHE_DIR', 'cache');
-        define('ICONS_DIR', 'feed-icons');
-        define('ICONS_URL', 'feed-icons');
-        define('SELF_URL_PATH', 'https://tools.immae.eu/ttrss/');
+          define('LOCK_DIRECTORY', 'lock');
+          define('CACHE_DIR', 'cache');
+          define('ICONS_DIR', 'feed-icons');
+          define('ICONS_URL', 'feed-icons');
+          define('SELF_URL_PATH', 'https://tools.immae.eu/ttrss/');
 
-        define('MYSQL_CHARSET', 'UTF8');
+          define('MYSQL_CHARSET', 'UTF8');
 
-        define('DB_TYPE', 'pgsql');
-        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', '${env.postgresql.port}');
+          define('DB_TYPE', 'pgsql');
+          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', '${env.postgresql.port}');
 
-        define('AUTH_AUTO_CREATE', true);
-        define('AUTH_AUTO_LOGIN', true);
+          define('AUTH_AUTO_CREATE', true);
+          define('AUTH_AUTO_LOGIN', true);
 
-        define('SINGLE_USER_MODE', false);
+          define('SINGLE_USER_MODE', false);
 
-        define('SIMPLE_UPDATE_MODE', false);
-        define('CHECK_FOR_UPDATES', true);
+          define('SIMPLE_UPDATE_MODE', false);
+          define('CHECK_FOR_UPDATES', true);
 
-        define('FORCE_ARTICLE_PURGE', 0);
-        define('SESSION_COOKIE_LIFETIME', 60*60*24*120);
-        define('ENABLE_GZIP_OUTPUT', false);
+          define('FORCE_ARTICLE_PURGE', 0);
+          define('SESSION_COOKIE_LIFETIME', 60*60*24*120);
+          define('ENABLE_GZIP_OUTPUT', false);
 
-        define('PLUGINS', 'auth_ldap, note, instances');
+          define('PLUGINS', 'auth_ldap, note, instances');
 
-        define('LOG_DESTINATION', ''');
-        define('CONFIG_VERSION', 26);
+          define('LOG_DESTINATION', ''');
+          define('CONFIG_VERSION', 26);
 
 
-        define('SPHINX_SERVER', 'localhost:9312');
-        define('SPHINX_INDEX', 'ttrss, delta');
+          define('SPHINX_SERVER', 'localhost:9312');
+          define('SPHINX_INDEX', 'ttrss, delta');
 
-        define('ENABLE_REGISTRATION', false);
-        define('REG_NOTIFY_ADDRESS', 'outils@immae.eu');
-        define('REG_MAX_USERS', 10);
+          define('ENABLE_REGISTRATION', false);
+          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('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
+          define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
+          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/');
-        define('LDAP_AUTH_USETLS', TRUE);
-        define('LDAP_AUTH_ALLOW_UNTRUSTED_CERT', TRUE);
-        define('LDAP_AUTH_BASEDN', 'dc=immae,dc=eu');
-        define('LDAP_AUTH_ANONYMOUSBEFOREBIND', FALSE);
-        define('LDAP_AUTH_SEARCHFILTER', '(&(memberOf=cn=users,cn=ttrss,ou=services,dc=immae,dc=eu)(|(cn=???)(uid=???)(&(uid:dn:=???)(ou=ttrss))))');
+          define('LDAP_AUTH_SERVER_URI', 'ldap://ldap.immae.eu:389/');
+          define('LDAP_AUTH_USETLS', TRUE);
+          define('LDAP_AUTH_ALLOW_UNTRUSTED_CERT', TRUE);
+          define('LDAP_AUTH_BASEDN', 'dc=immae,dc=eu');
+          define('LDAP_AUTH_ANONYMOUSBEFOREBIND', FALSE);
+          define('LDAP_AUTH_SEARCHFILTER', '(&(memberOf=cn=users,cn=ttrss,ou=services,dc=immae,dc=eu)(|(cn=???)(uid=???)(&(uid:dn:=???)(ou=ttrss))))');
 
-        define('LDAP_AUTH_BINDDN', 'cn=ttrss,ou=services,dc=immae,dc=eu');
-        define('LDAP_AUTH_BINDPW', '${env.ldap.password}');
-        define('LDAP_AUTH_LOGIN_ATTRIB', 'immaeTtrssLogin');
+          define('LDAP_AUTH_BINDDN', 'cn=ttrss,ou=services,dc=immae,dc=eu');
+          define('LDAP_AUTH_BINDPW', '${env.ldap.password}');
+          define('LDAP_AUTH_LOGIN_ATTRIB', 'immaeTtrssLogin');
 
-        define('LDAP_AUTH_LOG_ATTEMPTS', FALSE);
-        define('LDAP_AUTH_DEBUG', FALSE);
-      '';
+          define('LDAP_AUTH_LOG_ATTEMPTS', FALSE);
+          define('LDAP_AUTH_DEBUG', FALSE);
+        '';
+    };
     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
-        ln -s ${config} $out/config.php
+        ln -s /run/keys/webapps/tools-ttrss $out/config.php
         ${builtins.concatStringsSep "\n" (
           lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/plugins/${name}") plugins
         )}
       '';
     });
-    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"
@@ -147,8 +155,9 @@ let
         '';
     };
     phpFpm = rec {
+      serviceDeps = [ "postgresql.service" "openldap.service" "tools-ttrss-key.service" ];
       basedir = builtins.concatStringsSep ":" (
-        [ webRoot config varDir ]
+        [ webRoot "/run/keys/webapps/tools-ttrss" varDir ]
         ++ lib.attrsets.mapAttrsToList (name: value: value) plugins);
       socket = "/var/run/phpfpm/ttrss.sock";
       pool = ''