Upgrade Wallabag

6 files changed, 20 insertions, 3 deletions

diff --git a/modules/private/websites/immae/history/_data/categories.yml b/modules/private/websites/immae/history/_data/categories.yml
index 56ea22f..5c8637f 100644
--- a/modules/private/websites/immae/history/_data/categories.yml
+++ b/modules/private/websites/immae/history/_data/categories.yml
@@ -2,6 +2,9 @@
 - name: Nouveautés
   color: green
 
+- name: Mises à jour
+  color: green
+
 - name: Pannes
   color: red
 
diff --git a/modules/private/websites/immae/history/_posts/2020-06-06-Moteur-de-commentaires.md b/modules/private/websites/immae/history/_posts/2020-06-06-new-moteur-de-commentaires.md
index 7371d1a..7371d1a 100644
--- a/modules/private/websites/immae/history/_posts/2020-06-06-Moteur-de-commentaires.md
+++ b/modules/private/websites/immae/history/_posts/2020-06-06-new-moteur-de-commentaires.md
diff --git a/modules/private/websites/immae/history/_posts/2020-06-07-historique.md b/modules/private/websites/immae/history/_posts/2020-06-07-new-historique.md
index ff3eb6a..ff3eb6a 100644
--- a/modules/private/websites/immae/history/_posts/2020-06-07-historique.md
+++ b/modules/private/websites/immae/history/_posts/2020-06-07-new-historique.md
diff --git a/modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md b/modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md
new file mode 100644
index 0000000..da95010
--- /dev/null
+++ b/modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md
@@ -0,0 +1,10 @@
+---
+title: "Mise à jour de Wallabag à 2.3.8"
+category: Mises à jour
+tags: [Wallabag]
+date: 2020-06-13
+---
+Wallabag n’était plus en mesure d’ajouter de nouveaux articles depuis
+une mise à jour (de php probablement : cf [cette issue sur
+github](https://github.com/wallabag/wallabag/issues/3926)). La dernière
+version de Wallabag corrige ce problème.
diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index ae4abe0..046246d 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -22,10 +22,10 @@ in {
       extraConfig  = [
         ''
         Use Stats www.immae.eu
+        Header always set Strict-Transport-Security "max-age=31536000"
 
         <LocationMatch /.well-known/(webfinger|host-meta)>
           Header always set Referrer-Policy "strict-origin-when-cross-origin"
-          Header always set Strict-Transport-Security "max-age=31536000"
           RequestHeader set X-Forwarded-Proto "https"
 
           RewriteRule ^(.*)$ https://mastodon.immae.eu%{REQUEST_URI} [QSA,L]
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index bffcf84..cdfc7eb 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -15,7 +15,11 @@ let
     env = config.myEnv.tools.kanboard;
   };
   wallabag = pkgs.callPackage ./wallabag.nix {
-    wallabag = pkgs.webapps.wallabag.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
+    wallabag = pkgs.webapps.wallabag.override {
+      composerEnv = pkgs.composerEnv.override {
+        php = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]);
+      };
+    };
     env = config.myEnv.tools.wallabag;
   };
   yourls = pkgs.callPackage ./yourls.nix {
@@ -330,7 +334,7 @@ in {
         user = "wwwrun";
         group = "wwwrun";
         settings = wallabag.phpFpm.pool;
-        phpPackage = pkgs.php72;
+        phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]);
       };
       yourls = {
         user = "wwwrun";