diff --git a/check_process b/check_process index 6be900f..20daaad 100644 --- a/check_process +++ b/check_process @@ -9,8 +9,7 @@ admin="john" (USER) is_public=1 (PUBLIC|public=1|private=0) password="pass" - single_user="true" - local_timeline="true" + single_user="true" ; Checks pkg_linter=1 setup_sub_dir=0 diff --git a/conf/config.ini b/conf/config.ini index be3b108..0cb9ec9 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -32,5 +32,5 @@ max_blogs = 4 federation = true public_stats = true private = false -local_timeline = __LOCALTIMELINE__ +local_timeline = true user_invites = diff --git a/manifest.json b/manifest.json index 3bb9011..9296d91 100644 --- a/manifest.json +++ b/manifest.json @@ -71,15 +71,6 @@ "fr": "Souhaitez vous un blog pour un seul utilisateur?" }, "default": true - }, - { - "name": "local_timeline", - "type": "boolean", - "ask": { - "en": "Do you want to add a local timeline ?", - "fr": "Voulez vous afficher une timeline locale ?" - }, - "default": false } ] } diff --git a/scripts/install b/scripts/install index 7232836..5d5d916 100755 --- a/scripts/install +++ b/scripts/install @@ -43,7 +43,6 @@ is_public=$YNH_APP_ARG_IS_PUBLIC #language=$YNH_APP_ARG_LANGUAGE password=$YNH_APP_ARG_PASSWORD single_user=$YNH_APP_ARG_SINGLE_USER -local_timeline=$YNH_APP_ARG_LOCAL_TIMELINE ## Bypass package_checker name not compatible with writefreely if [ "$admin" = "package_checker" ] @@ -90,7 +89,6 @@ ynh_app_setting_set $app admin $admin ynh_app_setting_set $app is_public $is_public #ynh_app_setting_set $app language $language ynh_app_setting_set $app single_user $single_user -ynh_app_setting_set $app local_timeline $local_timeline #================================================= # STANDARD MODIFICATIONS @@ -263,7 +261,6 @@ ynh_replace_string "__DBPWD__" "$db_pwd" "$final_path/config.ini" ynh_replace_string "__PORT__" "$port" "$final_path/config.ini" ynh_replace_string "__DOMAIN_URL__" "https://$domain$path_url" "$final_path/config.ini" ynh_replace_string "__SINGLEUSER__" "$single_user" "$final_path/config.ini" -ynh_replace_string "__LOCALTIMELINE__" "$local_timeline" "$final_path/config.ini" #================================================= # STORE THE CONFIG FILE CHECKSUM diff --git a/scripts/upgrade b/scripts/upgrade index 2fb4b99..b51a1cb 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,6 +42,7 @@ ynh_app_setting_delete $app open_registration ynh_app_setting_delete $app max_blogs ynh_app_setting_delete $app federation ynh_app_setting_delete $app public_stats +ynh_app_setting_delete $app local_timeline #================================================= # CHECK VERSION