use config system.server_role and deprecate 'UNO'

10 files changed, 74 insertions, 20 deletions

diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 2b71610b6..9d4333fb0 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,12 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
 
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
diff --git a/view/en-au/htconfig.tpl b/view/en-au/htconfig.tpl
index 896b35bb2..090bbf06f 100644
--- a/view/en-au/htconfig.tpl
+++ b/view/en-au/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,12 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
 
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
diff --git a/view/en-gb/htconfig.tpl b/view/en-gb/htconfig.tpl
index 04eb404fc..515957b36 100644
--- a/view/en-gb/htconfig.tpl
+++ b/view/en-gb/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 47daf3f99..a270951b2 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
+
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index d49448ac2..fae8e3f98 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -12,8 +12,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Note: Plusieurs de ces réglages seront disponibles via le panneau d'administration
  * après l'installation. Lorsque des modifications sont apportés à travers le panneau d'administration
@@ -37,6 +35,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
+
 
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 802b31b49..ea3f5b5c2 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
+
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
index 802b31b49..ea3f5b5c2 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
+
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl
index 802b31b49..ea3f5b5c2 100644
--- a/view/pt-br/htconfig.tpl
+++ b/view/pt-br/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,14 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
+
 // These lines set additional security headers to be sent with all responses
 // You may wish to set transport_security_header to 0 if your server already sends
 // this header. content_security_policy may need to be disabled if you wish to
diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl
index 5456d12c1..00da08c91 100644
--- a/view/ru/htconfig.tpl
+++ b/view/ru/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,13 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 5456d12c1..00da08c91 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -10,8 +10,6 @@ $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
-define( 'UNO', {{$uno}} );
-
 /*
  * Notice: Many of the following settings will be available in the admin panel 
  * after a successful site install. Once they are set in the admin panel, they
@@ -36,6 +34,13 @@ App::$config['system']['baseurl'] = '{{$siteurl}}';
 App::$config['system']['sitename'] = "Hubzilla";
 App::$config['system']['location_hash'] = '{{$site_id}}';
 
+// Choices are 'basic', 'standard', and 'pro'.
+// basic sets up the sevrer for basic social networking and removes "complicated" features
+// standard provides most desired features except e-commerce
+// pro gives you access to everything
+
+App::$config['system']['server_role'] = '{{$server_role}}';
+
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
 // REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on