diff --git a/check_process b/check_process index 9fc202f..6be900f 100644 --- a/check_process +++ b/check_process @@ -7,12 +7,9 @@ ; Manifest domain="domain.tld" (DOMAIN) admin="john" (USER) - is_public=1 (PUBLIC|public=1|private=0) password="pass" single_user="true" - public_stats="true" - private="false" local_timeline="true" ; Checks pkg_linter=1 diff --git a/conf/config.ini b/conf/config.ini index a6ff54f..be3b108 100644 --- a/conf/config.ini +++ b/conf/config.ini @@ -30,7 +30,7 @@ open_registration = true min_username_len = 3 max_blogs = 4 federation = true -public_stats = __PUBLICSTATS__ -private = __PRIVATE__ +public_stats = true +private = false local_timeline = __LOCALTIMELINE__ user_invites = diff --git a/manifest.json b/manifest.json index ea0a3a4..3bb9011 100644 --- a/manifest.json +++ b/manifest.json @@ -72,24 +72,6 @@ }, "default": true }, - { - "name": "public_stats", - "type": "boolean", - "ask": { - "en": "Are federation stats public ?", - "fr": "Est-ce les statistiques de federation sont publiques ?" - }, - "default": true - }, - { - "name": "private", - "type": "boolean", - "ask": { - "en": "Are the instance metadata private ?", - "fr": "Est-ce les metadatas de l'instance sont privée ?" - }, - "default": false - }, { "name": "local_timeline", "type": "boolean", diff --git a/scripts/install b/scripts/install index f6324b3..7232836 100755 --- a/scripts/install +++ b/scripts/install @@ -43,8 +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 -public_stats=$YNH_APP_ARG_PUBLIC_STATS -private=$YNH_APP_ARG_PRIVATE local_timeline=$YNH_APP_ARG_LOCAL_TIMELINE ## Bypass package_checker name not compatible with writefreely @@ -92,8 +90,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 public_stats $public_stats -ynh_app_setting_set $app private $private ynh_app_setting_set $app local_timeline $local_timeline #================================================= @@ -267,8 +263,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 "__PUBLICSTATS__" "$public_stats" "$final_path/config.ini" -ynh_replace_string "__PRIVATE__" "$private" "$final_path/config.ini" ynh_replace_string "__LOCALTIMELINE__" "$local_timeline" "$final_path/config.ini" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 3aa61c0..2fb4b99 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -41,6 +41,7 @@ ynh_app_setting_delete $app site_description 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 #================================================= # CHECK VERSION