Fix wallabag activation script

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / tools / wallabag.nix

diff --git a/nixops/modules/websites/tools/tools/wallabag.nix b/nixops/modules/websites/tools/tools/wallabag.nix
index 1c08bbf63baabfafc74a0ef7279e896b0bbffffd..0b28ccb9d3a046f7bc64b5cefede9dffe7ec17e4 100644 (file)
--- a/nixops/modules/websites/tools/tools/wallabag.nix
+++ b/nixops/modules/websites/tools/tools/wallabag.nix
@@ -24,10 +24,10 @@ let
           locale: fr
           secret: ${env.secret}
           twofactor_auth: true
-          twofactor_sender: wallabag@immae.eu
+          twofactor_sender: wallabag@tools.immae.eu
           fosuser_registration: false
           fosuser_confirmation: true
-          from_email: wallabag@immae.eu
+          from_email: wallabag@tools.immae.eu
           rss_limit: 50
           rabbitmq_host: localhost
           rabbitmq_port: 5672
@@ -105,9 +105,9 @@ let
       postInstall = ''
         rm -rf web/assets var/{cache,logs,sessions} app/config/parameters.yml data
         ln -sf ${parameters} app/config/parameters.yml
-        ln -sf ../../../../../../${varDir}/var/{cache,logs,sessions} var
-        ln -sf ../../../../../${varDir}/data data
-        ln -sf ../../../../../../${varDir}/assets web/assets
+        ln -sf ${varDir}/var/{cache,logs,sessions} var
+        ln -sf ${varDir}/data data
+        ln -sf ${varDir}/assets web/assets
       '';
     };
     activationScript = ''
@@ -117,6 +117,7 @@ let
           "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ]; then
         pushd ${webappDir} > /dev/null
         $wrapperDir/sudo -u wwwrun ./bin/console --env=prod cache:clear
+        rm -rf /var/lib/wallabag/var/cache/pro_
         $wrapperDir/sudo -u wwwrun ./bin/console --env=prod doctrine:migrations:migrate --no-interaction
         popd > /dev/null
         echo -n "${webappDir}" > ${varDir}/currentWebappDir
@@ -125,13 +126,15 @@ let
     webRoot = "${webappDir}/web";
     # Domain migration: Table wallabag_entry contains whole
     # https://tools.immae.eu/wallabag domain name in preview_picture
-    apache = {
+    apache = rec {
       user = "wwwrun";
       group = "wwwrun";
       modules = [ "proxy_fcgi" ];
+      webappName = "tools_wallabag";
+      root = "/run/current-system/webapps/${webappName}";
       vhostConf = ''
-        Alias /wallabag "${webRoot}"
-        <Directory "${webRoot}">
+        Alias /wallabag "${root}"
+        <Directory "${root}">
           AllowOverride None
           Require all granted
           # For OAuth (apps)
@@ -148,7 +151,7 @@ let
             RewriteRule ^(.*)$ app.php [QSA,L]
           </IfModule>
         </Directory>
-        <Directory "${webRoot}/bundles">
+        <Directory "${root}/bundles">
           <IfModule mod_rewrite.c>
             RewriteEngine Off
           </IfModule>