1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/diaspora_ynh.git synced 2024-09-03 18:26:13 +02:00

Merge pull request #34 from YunoHost-Apps/testing

This commit is contained in:
Augustin Trancart 2022-05-21 19:37:54 +02:00 committed by GitHub
commit f6bc22257c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 20 additions and 16 deletions

View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Distributed social networking service Distributed social networking service
**Shipped version:** 0.7.16.0~ynh1 **Shipped version:** 0.7.17.0~ynh1
@ -26,6 +26,7 @@ Distributed social networking service
- There is currently no LDAP integration - There is currently no LDAP integration
- the installation is very long, especially the frontend building step - 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! - 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 ## Documentation and resources

View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Service de réseau social distribué Service de réseau social distribué
**Version incluse :** 0.7.16.0~ynh1 **Version incluse :** 0.7.17.0~ynh1
@ -22,6 +22,7 @@ Service de réseau social distribué
- Il n'y a pas d'intégration LDAP pour le moment. - 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. - 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 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 ## Documentations et ressources

View file

@ -10,6 +10,7 @@
setup_root=1 setup_root=1
setup_nourl=0 setup_nourl=0
upgrade=1 upgrade=1
upgrade=1 from_commit=0.7.16.0-ynh1
backup_restore=1 backup_restore=1
multi_instance=1 multi_instance=1
port_already_use=0 port_already_use=0

View file

@ -1,3 +1,4 @@
- There is currently no LDAP integration - There is currently no LDAP integration
- the installation is very long, especially the frontend building step - 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! - 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!

View file

@ -1,3 +1,4 @@
- Il n'y a pas d'intégration LDAP pour le moment. - 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. - 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 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 !

View file

@ -6,7 +6,7 @@
"en": "Distributed social networking service", "en": "Distributed social networking service",
"fr": "Service de réseau social distribué" "fr": "Service de réseau social distribué"
}, },
"version": "0.7.16.0~ynh1", "version": "0.7.17.0~ynh1",
"url": "https://diasporafoundation.org", "url": "https://diasporafoundation.org",
"upstream": { "upstream": {
"license": "AGPL-3.0", "license": "AGPL-3.0",

View file

@ -2,4 +2,4 @@
pkg_dependencies="build-essential cmake libssl-dev libcurl4-dev libxml2-dev libxslt-dev imagemagick ghostscript curl libmagickwand-dev git libpq-dev redis-server nodejs postgresql bison " pkg_dependencies="build-essential cmake libssl-dev libcurl4-dev libxml2-dev libxslt-dev imagemagick ghostscript curl libmagickwand-dev git libpq-dev redis-server nodejs postgresql bison "
ruby_build_dependencies="bison libffi-dev libgdbm-dev libncurses5-dev libsqlite3-dev libyaml-dev pkg-config sqlite3 zlib1g-dev libgmp-dev libreadline-dev libssl-dev libjemalloc-dev" ruby_build_dependencies="bison libffi-dev libgdbm-dev libncurses5-dev libsqlite3-dev libyaml-dev pkg-config sqlite3 zlib1g-dev libgmp-dev libreadline-dev libssl-dev libjemalloc-dev"
current_tag="v0.7.16.0" current_tag="v0.7.17.0"

View file

@ -22,8 +22,8 @@ systemctl restart ${app}.target
ynh_systemd_action --service_name=${app}_web.service \ ynh_systemd_action --service_name=${app}_web.service \
--action=restart\ --action=restart\
--log_path="$final_path/diaspora/log/production.log" \ --log_path="$final_path/diaspora/log/production.log" \
--line_match="Starting processing" --line_match="successfully configured the federation library"
ynh_systemd_action --service_name=${app}_sidekiq.service \ ynh_systemd_action --service_name=${app}_sidekiq.service \
--action=restart\ --action=restart\
--log_path="$final_path/diaspora/log/unicorn-stderr.log" \ --log_path="systemd" \
--line_match="listening on addr" --line_match="Running in ruby"

View file

@ -101,7 +101,7 @@ source ./install_ruby
# Download, check integrity, unucompress and patch the source from app.src # Download, check integrity, unucompress and patch the source from app.src
pushd $final_path pushd $final_path
ynh_script_progression --message="Download the sources..." --weight=10 ynh_script_progression --message="Download the sources..." --weight=10
sudo -u $app git clone https://github.com/diaspora/diaspora.git -b $current_tag ynh_exec_warn_less sudo -u $app git clone https://github.com/diaspora/diaspora.git -b $current_tag
popd popd
#================================================= #=================================================
@ -111,7 +111,7 @@ ynh_script_progression --message="Creating database..." --weight=1
db_name=$(ynh_sanitize_dbid $app) db_name=$(ynh_sanitize_dbid $app)
ynh_app_setting_set --app=$app --key=db_name --value=$db_name ynh_app_setting_set --app=$app --key=db_name --value=$db_name
ynh_psql_test_if_first_run ynh_psql_test_if_first_run
ynh_psql_setup_db --db_user=$db_name --db_name=$db_name ynh_exec_warn_less ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
db_pass=$(ynh_app_setting_get --app=$app --key=psqlpwd) db_pass=$(ynh_app_setting_get --app=$app --key=psqlpwd)
#================================================= #=================================================
@ -170,8 +170,7 @@ yunohost service add $app.target \
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================
ynh_permission_update --permission "main" --add visitors
#================================================= #=================================================
# CREATE AN ADMIN # CREATE AN ADMIN

View file

@ -4,15 +4,15 @@
pushd $final_path pushd $final_path
if [ -x Experimental_helpers ]; then if [ -x Experimental_helpers ]; then
pushd Experimental_helpers pushd Experimental_helpers
git fetch ynh_exec_warn_less git fetch
popd popd
else else
git clone https://github.com/YunoHost-Apps/Experimental_helpers.git ynh_exec_warn_less git clone https://github.com/YunoHost-Apps/Experimental_helpers.git
fi fi
pushd Experimental_helpers pushd Experimental_helpers
git checkout 606b60cf6bb3906d32020392f0a824d1f9971e96 ynh_exec_warn_less git checkout d05b4db
source ./ynh_install_ruby/ynh_install_ruby source ./ynh_install_ruby/ynh_install_ruby
popd popd
popd popd
ynh_install_ruby --ruby_version=2.6.6 ynh_exec_warn_less ynh_install_ruby --ruby_version=2.6.6

View file

@ -81,7 +81,7 @@ source ./install_ruby
# Download, check integrity, unucompress and patch the source from app.src # Download, check integrity, unucompress and patch the source from app.src
pushd $final_path pushd $final_path
ynh_script_progression --message="Download the sources..." --weight=5 ynh_script_progression --message="Download the sources..." --weight=5
sudo -u $app git clone https://github.com/diaspora/diaspora.git -b $current_tag ynh_exec_warn_less sudo -u $app git clone https://github.com/diaspora/diaspora.git -b $current_tag
popd popd
#================================================= #=================================================