From 6f6791966aed9a49414c1e6136d7b052da70da6e Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sun, 10 Feb 2019 16:30:01 +0100
Subject: [PATCH] remove site_name

---
 check_process   |  1 -
 conf/config.ini | 18 +++++++++++-------
 manifest.json   |  9 ---------
 scripts/install |  3 ---
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/check_process b/check_process
index 337b148..ba5bb8c 100644
--- a/check_process
+++ b/check_process
@@ -11,7 +11,6 @@
 		is_public=1	(PUBLIC|public=1|private=0)
 		password="pass"
 		single_user="true"
-		site_name="WriteFreely"
 		site_description="WriteFreely Blogs"
 		open_registration="true"
 		max_blogs="1"
diff --git a/conf/config.ini b/conf/config.ini
index feccda9..2e024c0 100644
--- a/conf/config.ini
+++ b/conf/config.ini
@@ -1,9 +1,13 @@
 [server]
-hidden_host   = 
-port          = __PORT__
-bind          = localhost
-tls_cert_path = 
-tls_key_path  = 
+hidden_host          = 
+port                 = __PORT__
+bind                 = localhost
+tls_cert_path        = 
+tls_key_path         = 
+templates_parent_dir = 
+static_parent_dir    = 
+pages_parent_dir     = 
+keys_parent_dir      = 
 
 [database]
 type     = mysql
@@ -15,7 +19,7 @@ host     = localhost
 port     = 3306
 
 [app]
-site_name         = __SITENAME__
+site_name         = 
 site_description  = __SITEDESCRIPTION__
 host              = __DOMAIN_URL__
 theme             = write
@@ -29,4 +33,4 @@ federation        = __FEDERATION__
 public_stats      = __PUBLICSTATS__
 private           = __PRIVATE__
 local_timeline    = __LOCALTIMELINE__
-
+user_invites      = 
diff --git a/manifest.json b/manifest.json
index 6be23b0..2df2997 100644
--- a/manifest.json
+++ b/manifest.json
@@ -72,15 +72,6 @@
                 },
                 "default": true
             },
-            {
-                "name": "site_name",
-                "type": "string",
-                "ask": {
-                    "en": "Choose a name for your WriteFreely instance",
-                    "fr": "Choisissez un nom pour votre instance WriteFreely"
-                },
-                "default": "WriteFreely"
-            },
             {
                 "name": "site_description",
                 "type": "string",
diff --git a/scripts/install b/scripts/install
index d4df1dd..78f1d3b 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
-site_name=$YNH_APP_ARG_SITE_NAME
 site_description=$YNH_APP_ARG_SITE_DESCRIPTION
 open_registration=$YNH_APP_ARG_OPEN_REGISTRATION
 max_blogs=$YNH_APP_ARG_MAX_BLOGS
@@ -97,7 +96,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 site_name $site_name
 ynh_app_setting_set $app site_description $site_description
 ynh_app_setting_set $app open_registration $open_registration
 ynh_app_setting_set $app max_blogs $max_blogs
@@ -277,7 +275,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 "__SITENAME__" "$site_name" "$final_path/config.ini"
 ynh_replace_string "__SITEDESCRIPTION__" "$site_description" "$final_path/config.ini"
 ynh_replace_string "__OPENREGISTRATION__" "$open_registration" "$final_path/config.ini"
 ynh_replace_string "__MAXBLOGS__" "$max_blogs" "$final_path/config.ini"