X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Ftools%2Ftools%2Fshaarli.nix;h=56658fd482dc5fe07837fcc8ede9b4849312de42;hb=85f5ed68104de9edd8f8e532dc0c2de931e3ca1b;hp=9f3779f56e68c2aaa5e76601adf138f37146e401;hpb=95b20e17b97de1f05392d0c394a5efdc590311a9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/modules/websites/tools/tools/shaarli.nix b/nixops/modules/websites/tools/tools/shaarli.nix
index 9f3779f..56658fd 100644
--- a/nixops/modules/websites/tools/tools/shaarli.nix
+++ b/nixops/modules/websites/tools/tools/shaarli.nix
@@ -17,7 +17,7 @@ let
 
     installPhase = ''
       rm -r {cache,pagecache,tmp,data}/
-      ln -sf ../../../..${varDir}/{cache,pagecache,tmp,data} .
+      ln -sf ${varDir}/{cache,pagecache,tmp,data} .
       mkdir -p $doc/share/doc
       mv doc/ $doc/share/doc/shaarli
       mkdir $out/
@@ -40,20 +40,17 @@ in rec {
       ${varDir}/phpSessions
     '';
   webRoot = shaarli;
-  apache = {
+  apache = rec {
     user = "wwwrun";
     group = "wwwrun";
     modules =  [ "proxy_fcgi" "rewrite" "env" ];
+    webappName = "tools_shaarli";
+    root = "/run/current-system/webapps/${webappName}";
     vhostConf = ''
-      Alias /Shaarli "${webRoot}"
-
-      <Directory "${webRoot}">
-        SetEnv SHAARLI_LDAP_PASSWORD "${env.ldap.password}"
-        SetEnv SHAARLI_LDAP_DN       "${env.ldap.dn}"
-        SetEnv SHAARLI_LDAP_HOST     "ldaps://${env.ldap.host}"
-        SetEnv SHAARLI_LDAP_BASE     "${env.ldap.base}"
-        SetEnv SHAARLI_LDAP_FILTER   "${env.ldap.search}"
+      Alias /Shaarli "${root}"
 
+      Include /run/keys/webapps/tools-shaarli
+      <Directory "${root}">
         DirectoryIndex index.php index.htm index.html
         Options Indexes FollowSymLinks MultiViews Includes
         AllowOverride All
@@ -64,7 +61,21 @@ in rec {
       </Directory>
       '';
   };
+  keys.tools-shaarli = {
+    destDir = "/run/keys/webapps";
+    user = apache.user;
+    group = apache.group;
+    permissions = "0400";
+    text = ''
+      SetEnv SHAARLI_LDAP_PASSWORD "${env.ldap.password}"
+      SetEnv SHAARLI_LDAP_DN       "${env.ldap.dn}"
+      SetEnv SHAARLI_LDAP_HOST     "ldaps://${env.ldap.host}"
+      SetEnv SHAARLI_LDAP_BASE     "${env.ldap.base}"
+      SetEnv SHAARLI_LDAP_FILTER   "${env.ldap.search}"
+      '';
+  };
   phpFpm = rec {
+    serviceDeps = [ "openldap.service" ];
     basedir = builtins.concatStringsSep ":" [ webRoot varDir ];
     socket = "/var/run/phpfpm/shaarli.sock";
     pool = ''