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/ 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 = [] 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 fffdde0..5db22fe 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -135,18 +135,22 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1 # Lemmy configuration mkdir -p "$install_dir/lemmy/" -ynh_add_config --template="../conf/lemmy.hjson" --destination="$install_dir/config/config.hjson" +chown $app:$app "$install_dir/lemmy" +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" +mkdir -p "$install_dir/pict-rs" +chown $app:$app "$install_dir/pict-rs" +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" +chown $app:$app -R "$install_dir/.config" +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"