From 417523991bf74bc5435d0ed4c218cc206ac1fe20 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 10 Feb 2019 16:46:29 +0100
Subject: [PATCH] remove max_blogs and federation parameters

---
 check_process   |  2 --
 conf/config.ini | 10 +++++-----
 manifest.json   | 20 +-------------------
 scripts/install |  6 ------
 scripts/upgrade |  6 ++++++
 5 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/check_process b/check_process
index e95a35d..9fc202f 100644
--- a/check_process
+++ b/check_process
@@ -11,8 +11,6 @@
 		is_public=1	(PUBLIC|public=1|private=0)
 		password="pass"
 		single_user="true"
-		max_blogs="1"
-		federation="true"
 		public_stats="true"
 		private="false"
 		local_timeline="true"		
diff --git a/conf/config.ini b/conf/config.ini
index ff1d501..a6ff54f 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -19,17 +19,17 @@ host     = localhost
 port     = 3306
 
 [app]
-site_name         = 
-site_description  = 
+site_name         = WriteFreely
+site_description  = WriteFreely_Blogs
 host              = __DOMAIN_URL__
 theme             = write
 disable_js        = false
 webfonts          = true
 single_user       = __SINGLEUSER__
-open_registration = 
+open_registration = true
 min_username_len  = 3
-max_blogs         = __MAXBLOGS__
-federation        = __FEDERATION__
+max_blogs         = 4
+federation        = true
 public_stats      = __PUBLICSTATS__
 private           = __PRIVATE__
 local_timeline    = __LOCALTIMELINE__
diff --git a/manifest.json b/manifest.json
index ec48b68..ea0a3a4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "For starting a minimalist, federated blog — or an entire community.",
         "fr": "Permet de créer un blog fédéré minimaliste ou une communauté entière."
     },
-    "version": "0.8.1~ynh3",
+    "version": "0.8.1~ynh4",
     "url": "https://writefreely.org",
     "license": "free",
     "maintainer": {
@@ -72,24 +72,6 @@
                 },
                 "default": true
             },
-            {
-                "name": "max_blogs",
-                "type": "string",
-                "ask": {
-                    "en": "How many blogs each user can create ?",
-                    "fr": "Combien de blogs chaque utilisateur peut créer ?"
-                },
-                "default": "3"
-            },
-            {
-                "name": "federation",
-                "type": "boolean",
-                "ask": {
-                    "en": "Is it federation enabled ?",
-                    "fr": "Est-ce une application publique ?"
-                },
-                "default": true
-            },
             {
                 "name": "public_stats",
                 "type": "boolean",
diff --git a/scripts/install b/scripts/install
index 1bc52b1..f6324b3 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
-max_blogs=$YNH_APP_ARG_MAX_BLOGS
-federation=$YNH_APP_ARG_FEDERATION
 public_stats=$YNH_APP_ARG_PUBLIC_STATS
 private=$YNH_APP_ARG_PRIVATE
 local_timeline=$YNH_APP_ARG_LOCAL_TIMELINE
@@ -94,8 +92,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 max_blogs $max_blogs
-ynh_app_setting_set $app federation $federation
 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
@@ -271,8 +267,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 "__MAXBLOGS__" "$max_blogs" "$final_path/config.ini"
-ynh_replace_string "__FEDERATION__" "$federation" "$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 57531be..3aa61c0 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -36,6 +36,12 @@ final_path=$(ynh_app_setting_get $app final_path)
 db_name=$(ynh_app_setting_get $app db_name)
 port=$(ynh_app_setting_get $app port)
 
+ynh_app_setting_delete $app site_name
+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
+
 #=================================================
 # CHECK VERSION
 #=================================================