From 0f493a1dafbd92242ed4f2397357beba0e8b524b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 7 Nov 2019 18:55:15 +0900 Subject: [PATCH] Don't store is_public --- scripts/install | 1 - scripts/upgrade | 17 ++--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/scripts/install b/scripts/install index 4cc23d2..1c498ef 100644 --- a/scripts/install +++ b/scripts/install @@ -67,7 +67,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=2 ynh_app_setting_set --app=$app --key=admin --value=$admin 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=use_web_account --value=$use_web_account ynh_app_setting_set --app=$app --key=final_path --value=$final_path ynh_app_setting_set --app=$app --key=config_path --value=$config_path diff --git a/scripts/upgrade b/scripts/upgrade index b02ce09..a42a100 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -53,12 +53,8 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 +if [ ! -z $is_public ]; then + ynh_app_setting_delete --app=$app --key=is_public fi # If final_path doesn't exist, create it @@ -352,15 +348,6 @@ fi yunohost service add "gitlab-runsvdir" --log "/var/log/$app/gitlab-rails/application.log" "/var/log/$app/gitlab-rails/api_json.log" "/var/log/$app/gitlab-rails/production.log" "/var/log/$app/gitlab-rails/production_json.log" "/var/log/$app/gitlab-rails/sidekiq.log" "/var/log/$app/unicorn/unicorn_stderr.log" "/var/log/$app/unicorn/current" "/var/log/$app/alertmanager/current" "/var/log/$app/gitaly/current" "/var/log/$app/gitlab-monitor/current" "/var/log/$app/gitlab-shell/gitlab-shell.log" "/var/log/$app/gitlab-workhorse/current" "/var/log/$app/logrotate/current" "/var/log/$app/nginx/current" "/var/log/$app/nginx/access.log" "/var/log/$app/nginx/error.log" "/var/log/$app/nginx/gitlab_access.log" "/var/log/$app/nginx/gitlab_error.log" "/var/log/$app/node-exporter/current" "/var/log/$app/postgres-exporter/current" "/var/log/$app/postgresql/current" "/var/log/$app/prometheus/current" "/var/log/$app/redis/current" "/var/log/$app/redis-exporter/current" -#================================================= -# SETUP SSOWAT -#================================================= - -# Make app public if necessary -if [ $is_public -eq 1 ]; then - ynh_permission_update --permission "main" --remove "all_users" --add "visitors" -fi - #================================================= # WAITING GITLAB #=================================================