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

Remove is_public for now, will be replaced by an allow_registration

Browse source
This commit is contained in:
Augustin Trancart 2019-12-16 22:54:16 +01:00
parent a9638ab2a3
commit 9fad7b255e
2 changed files with 10 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
conf/diaspora.yml
View file

@ -186,7 +186,6 @@ configuration: ## Section
## Change this to 'production' if you wish to run a production environment. ## Change this to 'production' if you wish to run a production environment.
rails_environment: 'production' rails_environment: 'production'
# TODO check
## Write unicorn stderr and stdout log. ## Write unicorn stderr and stdout log.
stderr_log: 'log/unicorn-stderr.log' stderr_log: 'log/unicorn-stderr.log'
stdout_log: 'log/unicorn-stdout.log' stdout_log: 'log/unicorn-stdout.log'
@ -302,8 +301,8 @@ configuration: ## Section
## Set this to false to prevent people from signing up to your pod ## Set this to false to prevent people from signing up to your pod
## without an invitation. Note that this needs to be set to true ## without an invitation. Note that this needs to be set to true
## (or commented out) to enable the first registration (you). ## (or commented out) to enable the first registration (you).
# TODO ynh settings? # TODO ynh settings
#enable_registrations: true enable_registrations: false
## Auto-follow on sign-up (default=true) ## Auto-follow on sign-up (default=true)
## Users will automatically follow a specified account on creation. ## Users will automatically follow a specified account on creation.

25
scripts/install
View file

@ -31,7 +31,6 @@ ynh_abort_if_errors
domain=$YNH_APP_ARG_DOMAIN domain=$YNH_APP_ARG_DOMAIN
path_url=$YNH_APP_ARG_PATH path_url=$YNH_APP_ARG_PATH
is_public=$YNH_APP_ARG_IS_PUBLIC
admin=$YNH_APP_ARG_ADMIN admin=$YNH_APP_ARG_ADMIN
admin_password=$YNH_APP_ARG_ADMIN_PASSWORD admin_password=$YNH_APP_ARG_ADMIN_PASSWORD
admin_email=$(ynh_user_get_info --username=$admin --key=mail) admin_email=$(ynh_user_get_info --username=$admin --key=mail)
@ -71,7 +70,6 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
ynh_script_progression --message="Saving app settings..." --time --weight=1 ynh_script_progression --message="Saving app settings..." --time --weight=1
ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=domain --value=$domain
ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=path --value=$path_url
ynh_app_setting_set --app=$app --key=is_public --value=$is_public
ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=final_path --value=$final_path
#================================================= #=================================================
@ -213,25 +211,18 @@ ynh_use_logrotate
#================================================= #=================================================
# ADVERTISE SERVICE IN ADMIN PANEL # ADVERTISE SERVICE IN ADMIN PANEL
#================================================= #=================================================
yunohost service add $app --log "$final_path/diaspora/log/production.log" \ yunohost service add $app.target\
--log "$final_path/diaspora/log/sidekiq.log"\ --log $final_path/diaspora/log/production.log -t file\
--log "$final_path/diaspora/log/unicorn-stderr.log"\ --log $final_path/diaspora/log/unicorn-stderr.log -t file\
--log "$final_path/diaspora/log/unicorn-stdout.log" --log $final_path/diaspora/log/unicorn-stdout.log -t file\
--log $final_path/diaspora/log/sidekiq.log -t file\
--description "Diaspora service (unicorn web and sidekiq)"
#================================================= #=================================================
# SETUP SSOWAT # SETUP SSOWAT
#================================================= #=================================================
# unprotected_uris allows SSO credentials to be passed anyway.
if [ $is_public -eq 0 ] ynh_app_setting_set $app unprotected_uris "/"
then # Remove the public access
ynh_app_setting_delete $app skipped_uris
fi
# Make app public if necessary
if [ $is_public -eq 1 ]
then
# unprotected_uris allows SSO credentials to be passed anyway.
ynh_app_setting_set $app unprotected_uris "/"
fi
#================================================= #=================================================
# RELOAD NGINX # RELOAD NGINX