From 34a7f64fce2d4bb15d050cdfb0e6f573acf8eef1 Mon Sep 17 00:00:00 2001 From: Limezy Date: Wed, 24 Aug 2022 11:11:15 +0700 Subject: [PATCH 1/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 12ccc53..d2784aa 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "name": "Thovi98" }, "requirements": { - "yunohost": ">= 11.0.7" + "yunohost": ">= 4.3.6.2" }, "multi_instance": true, "services": [ From 25c5c10d55227ffa59b428b84fb9a9418d8349d3 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 30 Aug 2022 08:40:05 +0700 Subject: [PATCH 2/6] Update systemd.service --- conf/systemd.service | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index c9face9..79fdf31 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,8 +7,8 @@ Type=simple User=__APP__ Group=__APP__ EnvironmentFile=__FINALPATH__/.env -WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/live/bin/photoprism --trace start +WorkingDirectory=__FINALPATH__/live/bin +ExecStart=photoprism --trace start StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit TimeoutSec=900 From af3916458411b41c32da8e1e0fd498a3f2b0d028 Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 30 Aug 2022 10:37:31 +0700 Subject: [PATCH 3/6] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 79fdf31..98825c1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -8,7 +8,7 @@ User=__APP__ Group=__APP__ EnvironmentFile=__FINALPATH__/.env WorkingDirectory=__FINALPATH__/live/bin -ExecStart=photoprism --trace start +ExecStart=__FINALPATH__/live/bin/photoprism --trace start StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit TimeoutSec=900 From f7b81fac248b89d2f91809366ef5af47d6fa095b Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 30 Aug 2022 11:45:03 +0700 Subject: [PATCH 4/6] First step fix --- conf/systemd.service | 11 +++++++++++ manifest.json | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 98825c1..5449833 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -6,6 +6,17 @@ After=network.target Type=simple User=__APP__ Group=__APP__ + +# Have all filesystem look like invisible for the service +TemporaryFileSystem=/:ro + +# Manually mount what is needed for the service to run +# Ref: https://www.sherbers.de/use-temporaryfilesystem-to-hide-files-or-directories-from-systemd-services/ + +BindReadOnlyPaths=/lib/ /lib64/ /usr/lib/ /usr/lib64/ /etc/ld.so.cache /etc/ld.so.conf /etc/ld.so.conf.d/ /etc/bindresvport.blacklist /usr/share/zoneinfo/ /usr/share/locale/ /etc/localtime /usr/share/common-licenses/ /etc/ssl/certs/ /etc/alternatives/ +BindReadOnlyPaths=/dev/log /run/systemd/journal/socket /run/systemd/journal/stdout /run/systemd/notify +BindPaths=/var/www/photoprism /var/www/photoprism/live/bin /home/yunohost.app/photoprism /usr /etc /var /home /dev /etc /usr /media /mnt /opt /proc /run /srv /sys /tmp + EnvironmentFile=__FINALPATH__/.env WorkingDirectory=__FINALPATH__/live/bin ExecStart=__FINALPATH__/live/bin/photoprism --trace start diff --git a/manifest.json b/manifest.json index d2784aa..83d9ddc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "AI-Powered Photos App for the Decentralized Web", "fr": "Gestion de photos en ligne" }, - "version": "2022.07.30~ynh2", + "version": "2022.07.30~ynh3", "url": "photoprism.app", "upstream": { "license": "AGPL-3.0-only", @@ -21,7 +21,7 @@ "name": "Thovi98" }, "requirements": { - "yunohost": ">= 4.3.6.2" + "yunohost": ">= 11.0.9.12" }, "multi_instance": true, "services": [ From 14e86933f7ceb469ba02a8dc471b1a78defdc63c Mon Sep 17 00:00:00 2001 From: Limezy Date: Tue, 30 Aug 2022 12:52:10 +0700 Subject: [PATCH 5/6] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 83d9ddc..36aa3f7 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,7 @@ "name": "Thovi98" }, "requirements": { - "yunohost": ">= 11.0.9.12" + "yunohost": ">= 11.0.9.11" }, "multi_instance": true, "services": [ From 3f8eccf9dd1b80faa88dc1e6382e6f101097ff78 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Aug 2022 08:58:12 +0000 Subject: [PATCH 6/6] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 84fdb7c..462d4a7 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ PhotoPrism® is an AI-Powered Photos App for the Decentralized Web. It makes use - Automatic classification of pictures based on their content and location -**Shipped version:** 2022.07.30~ynh2 +**Shipped version:** 2022.07.30~ynh3 **Demo:** https://demo-fr.photoprism.app diff --git a/README_fr.md b/README_fr.md index 03b780e..226f291 100644 --- a/README_fr.md +++ b/README_fr.md @@ -27,7 +27,7 @@ PhotoPrism® est une application de photos alimentée par l'IA pour le Web déce - Classification automatique des photos en fonction de leur contenu et de leur emplacement -**Version incluse :** 2022.07.30~ynh2 +**Version incluse :** 2022.07.30~ynh3 **Démo :** https://demo-fr.photoprism.app