Merge pull request #45 from YunoHost-Apps/manifestv2

Manifestv2
YunoHost-Apps · Mar 3, 2024 · 3d18010 · 3d18010
2 parents 3d48e89 + efb4832
commit 3d18010
Show file tree

Hide file tree

Showing 22 changed files with 374 additions and 826 deletions.
diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -18,19 +18,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Distributed social networking service
 
-**Shipped version:** 0.7.18.1~ynh1
+**Shipped version:** 0.7.18.2~ynh2
 
 ## Screenshots
 
 ![Screenshot of Diaspora](./doc/screenshots/Diaspora_latest.png)
 
-## Disclaimers / important information
-
-- There is currently no LDAP integration
-- the installation is very long, especially the frontend building step
-- As upstream doesn't support it, there is no possibility to change the endpoint/url of diaspora\*. Please choose it carefully!
-- The main permission should be granted to "visitors". In other term, diaspora is intented to be a public application. Only deviate from that if you know what you are doing!
-
 ## Documentation and resources
 
 * Official app website: <https://diasporafoundation.org/>
@@ -52,4 +45,4 @@ or
 sudo yunohost app upgrade diaspora -u https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>
diff --git a/README_fr.md b/README_fr.md
@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
 It shall NOT be edited by hand.
 -->
 
@@ -18,19 +18,12 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Service de réseau social distribué
 
-**Version incluse :** 0.7.18.1~ynh1
+**Version incluse :** 0.7.18.2~ynh2
 
 ## Captures d’écran
 
 ![Capture d’écran de Diaspora](./doc/screenshots/Diaspora_latest.png)
 
-## Avertissements / informations importantes
-
-- Il n'y a pas d'intégration LDAP pour le moment.
-- L'installation est très longue, en particulier l'étape de build du frontend.
-- le projet amont ne supporte pas les changements d'url, ainsi l'application yunohost ne supporte pas non plus cette action.
-- Le groupe visiteur doit avoir la permission "diaspora.main". En d'autres termes, diaspora est supposé être une application publique. Ne changez cela que si vous savez ce que vous faîtes ! 
-
 ## Documentations et ressources
 
 * Site officiel de l’app : <https://diasporafoundation.org/>

diff --git a/check_process b/check_process
diff --git a/conf/app.src b/conf/app.src
diff --git a/conf/diaspora_sidekiq.service b/conf/diaspora_sidekiq.service
@@ -5,15 +5,15 @@ PartOf=__APP__.target
 [Service]
 Type=simple
 User=__APP__
-WorkingDirectory=__FINALPATH__/live
+WorkingDirectory=__INSTALL_DIR__/live
 Environment="__LD_PRELOAD__"
 Environment="RAILS_ENV=production"
 Environment="__YNH_RUBY_LOAD_PATH__"
-ExecStart=__FINAL_PATH__/live/bin/bundle exec sidekiq
+ExecStart=__INSTALL_DIR__/live/bin/bundle exec sidekiq
 Restart=always
 
 # Sandboxing options to harden security
-# Depending on specificities of your service/app, you may need to tweak these 
+# Depending on specificities of your service/app, you may need to tweak these
 # .. but this should be a good baseline
 # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
 NoNewPrivileges=no
@@ -40,7 +40,7 @@ CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
 CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
 CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
 CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
-CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG 
+CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
 
 [Install]
 WantedBy=__APP__.target
diff --git a/conf/diaspora_web.service b/conf/diaspora_web.service
@@ -5,17 +5,17 @@ PartOf=__APP__.target
 [Service]
 Type=simple
 User=__APP__
-WorkingDirectory=__FINALPATH__/live
+WorkingDirectory=__INSTALL_DIR__/live
 Environment="__LD_PRELOAD__"
 Environment="RAILS_ENV=production"
 Environment="__YNH_RUBY_LOAD_PATH__"
 PIDFile=/run/__APP__/diaspora.pid
-ExecStart=__FINAL_PATH__/live/bin/bundle exec unicorn -c config/unicorn.rb -E production
+ExecStart=__INSTALL_DIR__/live/bin/bundle exec unicorn -c config/unicorn.rb -E production
 ExecReload=/bin/kill -USR2 $MAINPID
 Restart=always
 
 # Sandboxing options to harden security
-# Depending on specificities of your service/app, you may need to tweak these 
+# Depending on specificities of your service/app, you may need to tweak these
 # .. but this should be a good baseline
 # Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
 NoNewPrivileges=yes
@@ -42,7 +42,7 @@ CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
 CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
 CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
 CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
-CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG 
+CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
 
 [Install]
 WantedBy=__APP__.target
diff --git a/conf/nginx.conf b/conf/nginx.conf
@@ -2,7 +2,7 @@
 location __PATH__/ {
 
   # Path to source
-  alias __FINALPATH__/live/public/;
+  alias __INSTALL_DIR__/live/public/;
 
   # Configure maximum picture size
   # Note that Diaspora has a client side check set at 4M

diff --git a/doc/DISCLAIMER.md → doc/PRE_INSTALL.md b/doc/DISCLAIMER.md → doc/PRE_INSTALL.md
@@ -1,4 +1,3 @@
-- There is currently no LDAP integration
 - the installation is very long, especially the frontend building step
 - As upstream doesn't support it, there is no possibility to change the endpoint/url of diaspora\*. Please choose it carefully!
 - The main permission should be granted to "visitors". In other term, diaspora is intented to be a public application. Only deviate from that if you know what you are doing!
diff --git a/doc/DISCLAIMER_fr.md → doc/PRE_INSTALL_fr.md b/doc/DISCLAIMER_fr.md → doc/PRE_INSTALL_fr.md
@@ -1,4 +1,3 @@
-- Il n'y a pas d'intégration LDAP pour le moment.
 - L'installation est très longue, en particulier l'étape de build du frontend.
 - le projet amont ne supporte pas les changements d'url, ainsi l'application yunohost ne supporte pas non plus cette action.
-- Le groupe visiteur doit avoir la permission "diaspora.main". En d'autres termes, diaspora est supposé être une application publique. Ne changez cela que si vous savez ce que vous faîtes ! 
+- Le groupe visiteur doit avoir la permission "diaspora.main". En d'autres termes, diaspora est supposé être une application publique. Ne changez cela que si vous savez ce que vous faîtes !
diff --git a/manifest.json b/manifest.json