aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-06-13 15:55:53 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-06-13 15:55:53 +0200
commit46c99b575ab45c79e195bc9e9ed75759e814aad1 (patch)
treef3cf02c9b2b8fd4f73bf22c7c2f9ae4d147d55cb
parent8f1d6cb579ec203ce86f8af30bea729dbb0a9f7f (diff)
downloadNix-46c99b575ab45c79e195bc9e9ed75759e814aad1.tar.gz
Nix-46c99b575ab45c79e195bc9e9ed75759e814aad1.tar.zst
Nix-46c99b575ab45c79e195bc9e9ed75759e814aad1.zip
Upgrade Wallabag
-rw-r--r--modules/private/websites/immae/history/_data/categories.yml3
-rw-r--r--modules/private/websites/immae/history/_posts/2020-06-06-new-moteur-de-commentaires.md (renamed from modules/private/websites/immae/history/_posts/2020-06-06-Moteur-de-commentaires.md)0
-rw-r--r--modules/private/websites/immae/history/_posts/2020-06-07-new-historique.md (renamed from modules/private/websites/immae/history/_posts/2020-06-07-historique.md)0
-rw-r--r--modules/private/websites/immae/history/_posts/2020-06-13-maj-wallabag.md10
-rw-r--r--modules/private/websites/immae/production.nix2
-rw-r--r--modules/private/websites/tools/tools/default.nix8
-rw-r--r--pkgs/webapps/wallabag/default.nix4
-rw-r--r--pkgs/webapps/wallabag/ldap.patch58
8 files changed, 34 insertions, 51 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 @@
2- name: Nouveautés 2- name: Nouveautés
3 color: green 3 color: green
4 4
5- name: Mises à jour
6 color: green
7
5- name: Pannes 8- name: Pannes
6 color: red 9 color: red
7 10
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 @@
1---
2title: "Mise à jour de Wallabag à 2.3.8"
3category: Mises à jour
4tags: [Wallabag]
5date: 2020-06-13
6---
7Wallabag n’était plus en mesure d’ajouter de nouveaux articles depuis
8une mise à jour (de php probablement : cf [cette issue sur
9github](https://github.com/wallabag/wallabag/issues/3926)). La dernière
10version 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 {
22 extraConfig = [ 22 extraConfig = [
23 '' 23 ''
24 Use Stats www.immae.eu 24 Use Stats www.immae.eu
25 Header always set Strict-Transport-Security "max-age=31536000"
25 26
26 <LocationMatch /.well-known/(webfinger|host-meta)> 27 <LocationMatch /.well-known/(webfinger|host-meta)>
27 Header always set Referrer-Policy "strict-origin-when-cross-origin" 28 Header always set Referrer-Policy "strict-origin-when-cross-origin"
28 Header always set Strict-Transport-Security "max-age=31536000"
29 RequestHeader set X-Forwarded-Proto "https" 29 RequestHeader set X-Forwarded-Proto "https"
30 30
31 RewriteRule ^(.*)$ https://mastodon.immae.eu%{REQUEST_URI} [QSA,L] 31 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
15 env = config.myEnv.tools.kanboard; 15 env = config.myEnv.tools.kanboard;
16 }; 16 };
17 wallabag = pkgs.callPackage ./wallabag.nix { 17 wallabag = pkgs.callPackage ./wallabag.nix {
18 wallabag = pkgs.webapps.wallabag.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; }; 18 wallabag = pkgs.webapps.wallabag.override {
19 composerEnv = pkgs.composerEnv.override {
20 php = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]);
21 };
22 };
19 env = config.myEnv.tools.wallabag; 23 env = config.myEnv.tools.wallabag;
20 }; 24 };
21 yourls = pkgs.callPackage ./yourls.nix { 25 yourls = pkgs.callPackage ./yourls.nix {
@@ -330,7 +334,7 @@ in {
330 user = "wwwrun"; 334 user = "wwwrun";
331 group = "wwwrun"; 335 group = "wwwrun";
332 settings = wallabag.phpFpm.pool; 336 settings = wallabag.phpFpm.pool;
333 phpPackage = pkgs.php72; 337 phpPackage = pkgs.php73.withExtensions(e: pkgs.php73.enabledExtensions ++ [e.tidy]);
334 }; 338 };
335 yourls = { 339 yourls = {
336 user = "wwwrun"; 340 user = "wwwrun";
diff --git a/pkgs/webapps/wallabag/default.nix b/pkgs/webapps/wallabag/default.nix
index a437a31..bd420d4 100644
--- a/pkgs/webapps/wallabag/default.nix
+++ b/pkgs/webapps/wallabag/default.nix
@@ -29,11 +29,11 @@ composerEnv.buildPackage rec {
29 doRemoveVendor = false; 29 doRemoveVendor = false;
30 # Beware when upgrading, I probably messed up with the migrations table 30 # Beware when upgrading, I probably messed up with the migrations table
31 # (due to a psql bug in wallabag) 31 # (due to a psql bug in wallabag)
32 version = "2.3.6"; 32 version = "2.3.8";
33 name = "wallabag-${version}"; 33 name = "wallabag-${version}";
34 src = fetchurl { 34 src = fetchurl {
35 url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; 35 url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
36 sha256 = "0m0dy3r94ks5pfxyb9vbgrsm0vrwdl3jd5wqwg4f5vd107lq90q1"; 36 sha256 = "1sr62hfk2f2rl5by48dg8yd1gchngjnc850as17wr3w287p1kwsq";
37 }; 37 };
38 unpackPhase = '' 38 unpackPhase = ''
39 unpackFile "$src" 39 unpackFile "$src"
diff --git a/pkgs/webapps/wallabag/ldap.patch b/pkgs/webapps/wallabag/ldap.patch
index 9caf7da..e04dae1 100644
--- a/pkgs/webapps/wallabag/ldap.patch
+++ b/pkgs/webapps/wallabag/ldap.patch
@@ -134,15 +134,15 @@ index 02afc9ea..48fbb553 100644
134 pattern: ^/ 134 pattern: ^/
135 form_login: 135 form_login:
136diff --git a/composer.json b/composer.json 136diff --git a/composer.json b/composer.json
137index 68cfad05..32a3d1a4 100644 137index 0483da1d..e3e47bdc 100644
138--- a/composer.json 138--- a/composer.json
139+++ b/composer.json 139+++ b/composer.json
140@@ -85,7 +85,11 @@ 140@@ -87,7 +87,11 @@
141 "friendsofsymfony/jsrouting-bundle": "^1.6.3",
142 "bdunogier/guzzle-site-authenticator": "^1.0.0", 141 "bdunogier/guzzle-site-authenticator": "^1.0.0",
143 "defuse/php-encryption": "^2.1", 142 "defuse/php-encryption": "^2.1",
144- "html2text/html2text": "^4.1" 143 "html2text/html2text": "^4.1",
145+ "html2text/html2text": "^4.1", 144- "sulu/symfony-intl-fix": "^1.0"
145+ "sulu/symfony-intl-fix": "^1.0",
146+ "fr3d/ldap-bundle": "^3.0" 146+ "fr3d/ldap-bundle": "^3.0"
147+ }, 147+ },
148+ "suggest": { 148+ "suggest": {
@@ -151,21 +151,12 @@ index 68cfad05..32a3d1a4 100644
151 "require-dev": { 151 "require-dev": {
152 "doctrine/doctrine-fixtures-bundle": "~2.2", 152 "doctrine/doctrine-fixtures-bundle": "~2.2",
153diff --git a/composer.lock b/composer.lock 153diff --git a/composer.lock b/composer.lock
154index 251ee081..37795e0b 100644 154index b3b0a4c6..8c8a87ee 100644
155--- a/composer.lock 155--- a/composer.lock
156+++ b/composer.lock 156+++ b/composer.lock
157@@ -4,7 +4,7 @@
158 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
159 "This file is @generated automatically"
160 ],
161- "content-hash": "d2a0bd8408dccdeb7a7455996519829b",
162+ "content-hash": "4699d166d03a8e5f70d802d0bc3e6a20",
163 "packages": [
164 {
165 "name": "bdunogier/guzzle-site-authenticator",
166@@ -1346,6 +1346,65 @@ 157@@ -1346,6 +1346,65 @@
167 ], 158 ],
168 "time": "2018-12-14T19:44:53+00:00" 159 "time": "2019-05-09T11:53:40+00:00"
169 }, 160 },
170+ { 161+ {
171+ "name": "fr3d/ldap-bundle", 162+ "name": "fr3d/ldap-bundle",
@@ -229,7 +220,7 @@ index 251ee081..37795e0b 100644
229 { 220 {
230 "name": "friendsofsymfony/jsrouting-bundle", 221 "name": "friendsofsymfony/jsrouting-bundle",
231 "version": "1.6.3", 222 "version": "1.6.3",
232@@ -7027,6 +7086,59 @@ 223@@ -7069,6 +7128,59 @@
233 "zf2" 224 "zf2"
234 ], 225 ],
235 "time": "2018-04-25T15:33:34+00:00" 226 "time": "2018-04-25T15:33:34+00:00"
@@ -289,36 +280,11 @@ index 251ee081..37795e0b 100644
289 } 280 }
290 ], 281 ],
291 "packages-dev": [ 282 "packages-dev": [
292@@ -7561,12 +7673,12 @@
293 "source": {
294 "type": "git",
295 "url": "https://github.com/symfony/phpunit-bridge.git",
296- "reference": "5dab0d4b2ac99ab22b447b615fdfdc10ec4af3d5"
297+ "reference": "d61ec438634e0f234c6bda1c6ee97016bbb0e7a1"
298 },
299 "dist": {
300 "type": "zip",
301- "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/5dab0d4b2ac99ab22b447b615fdfdc10ec4af3d5",
302- "reference": "5dab0d4b2ac99ab22b447b615fdfdc10ec4af3d5",
303+ "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d61ec438634e0f234c6bda1c6ee97016bbb0e7a1",
304+ "reference": "d61ec438634e0f234c6bda1c6ee97016bbb0e7a1",
305 "shasum": ""
306 },
307 "require": {
308@@ -7619,7 +7731,7 @@
309 ],
310 "description": "Symfony PHPUnit Bridge",
311 "homepage": "https://symfony.com",
312- "time": "2019-01-01T13:45:19+00:00"
313+ "time": "2019-01-16T13:27:11+00:00"
314 },
315 {
316 "name": "symfony/polyfill-php72",
317diff --git a/scripts/install.sh b/scripts/install.sh 283diff --git a/scripts/install.sh b/scripts/install.sh
318index 8b7ea03f..3a4a33ab 100755 284index affa715f..45254212 100755
319--- a/scripts/install.sh 285--- a/scripts/install.sh
320+++ b/scripts/install.sh 286+++ b/scripts/install.sh
321@@ -26,5 +26,8 @@ ENV=$1 287@@ -37,5 +37,8 @@ fi
322 TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) 288 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
323 289
324 git checkout $TAG 290 git checkout $TAG
@@ -328,10 +294,10 @@ index 8b7ea03f..3a4a33ab 100755
328 SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist 294 SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist
329 php bin/console wallabag:install --env=$ENV 295 php bin/console wallabag:install --env=$ENV
330diff --git a/scripts/update.sh b/scripts/update.sh 296diff --git a/scripts/update.sh b/scripts/update.sh
331index c62d104a..6259a431 100755 297index 3ef10439..eeee28d6 100755
332--- a/scripts/update.sh 298--- a/scripts/update.sh
333+++ b/scripts/update.sh 299+++ b/scripts/update.sh
334@@ -32,6 +32,9 @@ git fetch origin 300@@ -42,6 +42,9 @@ git fetch origin
335 git fetch --tags 301 git fetch --tags
336 TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) 302 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
337 git checkout $TAG --force 303 git checkout $TAG --force