From c636c009b6e40a2701e88a56ac248a28b3d9f71d Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 3 Jan 2024 15:58:22 +0100 Subject: [PATCH 1/5] Make sure directories exist for config files --- scripts/upgrade | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index fffdde0..126f1ed 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -135,17 +135,21 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1 # Lemmy configuration mkdir -p "$install_dir/lemmy/" +chown $app:$app "$install_dir/lemmy" ynh_add_config --template="../conf/lemmy.hjson" --destination="$install_dir/config/config.hjson" chmod 400 "$install_dir/config/config.hjson" chown $app:$app "$install_dir/config/config.hjson" # Pict-RS configuration +mkdir -p "$install_dir/pict-rs" +chown $app:$app "$install_dir/pict-rs" ynh_add_config --template="../conf/pict-rs.toml" --destination="$install_dir/pict-rs/pict-rs.toml" chmod 400 "$install_dir/pict-rs/pict-rs.toml" chown $app:$app "$install_dir/pict-rs/pict-rs.toml" # ImageMagick configuration mkdir -p "$install_dir/.config/ImageMagick" +chown $app:$app -R "$install_dir/.config" ynh_add_config --template="../conf/policy.xml" --destination="$install_dir/.config/ImageMagick/policy.xml" chmod 400 "$install_dir/.config/ImageMagick/policy.xml" chown -R $app:$app "$install_dir/.config" From f2406b8acf355b28a38d62f4683a043eaf5f9a8c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 3 Jan 2024 14:58:25 +0000 Subject: [PATCH 2/5] 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 84feb3c..9febd6f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Lemmy is similar to sites like Reddit, Lobste.rs, or Hacker News: you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the Fediverse. -**Shipped version:** 0.18.2~ynh1 +**Shipped version:** 0.18.2~ynh2 **Demo:** https://lemmy.ml/ diff --git a/README_fr.md b/README_fr.md index e12eb12..3839f6a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Lemmy est similaire à des sites comme Reddit, Lobste.rs ou Hacker News : vous vous abonnez aux forums qui vous intéressent, publiez des liens et des discussions, puis votez et commentez-les. Dans les coulisses, c'est très différent ; n'importe qui peut facilement exécuter un serveur, et tous ces serveurs sont fédérés (pensez au courrier électronique) et connectés au même univers, appelé Fediverse. -**Version incluse :** 0.18.2~ynh1 +**Version incluse :** 0.18.2~ynh2 **Démo :** https://lemmy.ml/ From 0e711f8ef061c18a3c9d6b572aa52b4578c118a5 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Wed, 3 Jan 2024 16:00:53 +0100 Subject: [PATCH 3/5] Bump package version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 659ec97..53b9ff6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Lemmy" description.en = "Link aggregator/Reddit clone for the fediverse" description.fr = "Agrégateur de liens/clone Reddit pour le fedivers" -version = "0.18.2~ynh2" +version = "0.18.2~ynh3" maintainers = [] From a07fc103948634293194fc2c0723f217570bebf1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 3 Jan 2024 15:00:58 +0000 Subject: [PATCH 4/5] 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 9febd6f..4e1a3aa 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Lemmy is similar to sites like Reddit, Lobste.rs, or Hacker News: you subscribe to forums you're interested in, post links and discussions, then vote, and comment on them. Behind the scenes, it is very different; anyone can easily run a server, and all these servers are federated (think email), and connected to the same universe, called the Fediverse. -**Shipped version:** 0.18.2~ynh2 +**Shipped version:** 0.18.2~ynh3 **Demo:** https://lemmy.ml/ diff --git a/README_fr.md b/README_fr.md index 3839f6a..aadd641 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Lemmy est similaire à des sites comme Reddit, Lobste.rs ou Hacker News : vous vous abonnez aux forums qui vous intéressent, publiez des liens et des discussions, puis votez et commentez-les. Dans les coulisses, c'est très différent ; n'importe qui peut facilement exécuter un serveur, et tous ces serveurs sont fédérés (pensez au courrier électronique) et connectés au même univers, appelé Fediverse. -**Version incluse :** 0.18.2~ynh2 +**Version incluse :** 0.18.2~ynh3 **Démo :** https://lemmy.ml/ From 76d1641c031f55101959a4f5166eaac5e120b29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 4 Jan 2024 09:37:58 +0100 Subject: [PATCH 5/5] cleaning --- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 3ce967c..8f05ce0 100755 --- a/scripts/install +++ b/scripts/install @@ -101,18 +101,18 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1 # Lemmy configuration mkdir -p "$install_dir/config/" -ynh_add_config --template="../conf/lemmy.hjson" --destination="$install_dir/config/config.hjson" +ynh_add_config --template="lemmy.hjson" --destination="$install_dir/config/config.hjson" chmod 400 "$install_dir/config/config.hjson" chown $app:$app "$install_dir/config/config.hjson" # Pict-RS configuration -ynh_add_config --template="../conf/pict-rs.toml" --destination="$install_dir/pict-rs/pict-rs.toml" +ynh_add_config --template="pict-rs.toml" --destination="$install_dir/pict-rs/pict-rs.toml" chmod 400 "$install_dir/pict-rs/pict-rs.toml" chown $app:$app "$install_dir/pict-rs/pict-rs.toml" # ImageMagick configuration mkdir -p "$install_dir/.config/ImageMagick" -ynh_add_config --template="../conf/policy.xml" --destination="$install_dir/.config/ImageMagick/policy.xml" +ynh_add_config --template="policy.xml" --destination="$install_dir/.config/ImageMagick/policy.xml" chmod 400 "$install_dir/.config/ImageMagick/policy.xml" chown -R $app:$app "$install_dir/.config" diff --git a/scripts/upgrade b/scripts/upgrade index 126f1ed..5db22fe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,21 +136,21 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1 # Lemmy configuration mkdir -p "$install_dir/lemmy/" chown $app:$app "$install_dir/lemmy" -ynh_add_config --template="../conf/lemmy.hjson" --destination="$install_dir/config/config.hjson" +ynh_add_config --template="lemmy.hjson" --destination="$install_dir/config/config.hjson" chmod 400 "$install_dir/config/config.hjson" chown $app:$app "$install_dir/config/config.hjson" # Pict-RS configuration mkdir -p "$install_dir/pict-rs" chown $app:$app "$install_dir/pict-rs" -ynh_add_config --template="../conf/pict-rs.toml" --destination="$install_dir/pict-rs/pict-rs.toml" +ynh_add_config --template="pict-rs.toml" --destination="$install_dir/pict-rs/pict-rs.toml" chmod 400 "$install_dir/pict-rs/pict-rs.toml" chown $app:$app "$install_dir/pict-rs/pict-rs.toml" # ImageMagick configuration mkdir -p "$install_dir/.config/ImageMagick" chown $app:$app -R "$install_dir/.config" -ynh_add_config --template="../conf/policy.xml" --destination="$install_dir/.config/ImageMagick/policy.xml" +ynh_add_config --template="policy.xml" --destination="$install_dir/.config/ImageMagick/policy.xml" chmod 400 "$install_dir/.config/ImageMagick/policy.xml" chown -R $app:$app "$install_dir/.config"