From 9a4cbc05a6a05b5335552f17e960ea06a3eaf604 Mon Sep 17 00:00:00 2001 From: Jeroen van Riet Paap Date: Wed, 27 Jan 2016 23:48:14 +0100 Subject: no trailing slash --- view/en/htconfig.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/en') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 17ee7bfeb..17f19702f 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -28,7 +28,7 @@ $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres $default_timezone = '{{$timezone}}'; -// What is your site name? +// What is your site name? DO NOT ADD A TRAILING SLASH! $a->config['system']['baseurl'] = '{{$siteurl}}'; $a->config['system']['sitename'] = "Hubzilla"; -- cgit v1.2.3 From 9cf105f8ea89165d46cfdfd6dbb729e7647c1fd0 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 4 Feb 2016 23:58:31 -0800 Subject: initial uno config --- view/en/htconfig.tpl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'view/en') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 17f19702f..50e05fc3e 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -10,6 +10,8 @@ $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 -- cgit v1.2.3 From a14b87baf25e8a4747318efa7a7b52ad04966af7 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 8 Feb 2016 14:48:11 -0800 Subject: make yet another recommended security header optional - this time because of piwik. Personally I think if you want to track people you really don't understand this project and its history, but whatever.... --- view/en/htconfig.tpl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'view/en') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 50e05fc3e..5c05111f3 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -36,6 +36,23 @@ $a->config['system']['baseurl'] = '{{$siteurl}}'; $a->config['system']['sitename'] = "Hubzilla"; $a->config['system']['location_hash'] = '{{$site_id}}'; +// 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 +// run the piwik analytics plugin or include other offsite resources on a page + +$a->config['system']['transport_security_header'] = 1; +$a->config['system']['content_security_policy'] = 1; + +// 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 +// run the piwik analytics plugin or include other offsite resources on a page + +$a->config['system']['transport_security_header'] = 1; +$a->config['system']['content_security_policy'] = 1; + + // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting -- cgit v1.2.3 From 3da8f9b13c92adab25507ab5cd36cdec27889cac Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 8 Feb 2016 14:51:03 -0800 Subject: duplicated lines in en config file --- view/en/htconfig.tpl | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'view/en') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 5c05111f3..0ab7b6510 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -44,16 +44,6 @@ $a->config['system']['location_hash'] = '{{$site_id}}'; $a->config['system']['transport_security_header'] = 1; $a->config['system']['content_security_policy'] = 1; -// 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 -// run the piwik analytics plugin or include other offsite resources on a page - -$a->config['system']['transport_security_header'] = 1; -$a->config['system']['content_security_policy'] = 1; - - - // 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 -- cgit v1.2.3 From 1c6faa3a00caa7c2f584741351b3bc56326f7cf2 Mon Sep 17 00:00:00 2001 From: Tobias Luther Date: Sun, 6 Mar 2016 18:45:43 +0100 Subject: Added Link to TOS to EMail templates targeting members --- view/en/lostpass_eml.tpl | 3 +++ view/en/passchanged_eml.tpl | 5 +++++ view/en/register_verify_member.tpl | 5 +++++ 3 files changed, 13 insertions(+) (limited to 'view/en') diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl index 3b79d2791..285a65ade 100644 --- a/view/en/lostpass_eml.tpl +++ b/view/en/lostpass_eml.tpl @@ -29,4 +29,7 @@ Login Name: {{$email}} Sincerely, {{$sitename}} Administrator +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl index 0d94be3c2..61bf27943 100644 --- a/view/en/passchanged_eml.tpl +++ b/view/en/passchanged_eml.tpl @@ -18,3 +18,8 @@ Sincerely, {{$sitename}} Administrator + +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService + diff --git a/view/en/register_verify_member.tpl b/view/en/register_verify_member.tpl index d1e34be67..71f0964d4 100644 --- a/view/en/register_verify_member.tpl +++ b/view/en/register_verify_member.tpl @@ -23,3 +23,8 @@ To deny the request and remove the account, please visit: Thank you. + +-- +Terms Of Service: +{{$siteurl}}/help/TermsOfService + -- cgit v1.2.3 From 9abd95fad3784a10fc48bc40f9b8a75d7d74edda Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 31 Mar 2016 16:06:03 -0700 Subject: static App --- view/en/htconfig.tpl | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'view/en') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 0ab7b6510..13c5aa942 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -32,17 +32,17 @@ $default_timezone = '{{$timezone}}'; // What is your site name? DO NOT ADD A TRAILING SLASH! -$a->config['system']['baseurl'] = '{{$siteurl}}'; -$a->config['system']['sitename'] = "Hubzilla"; -$a->config['system']['location_hash'] = '{{$site_id}}'; +App::$config['system']['baseurl'] = '{{$siteurl}}'; +App::$config['system']['sitename'] = "Hubzilla"; +App::$config['system']['location_hash'] = '{{$site_id}}'; // 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 // run the piwik analytics plugin or include other offsite resources on a page -$a->config['system']['transport_security_header'] = 1; -$a->config['system']['content_security_policy'] = 1; +App::$config['system']['transport_security_header'] = 1; +App::$config['system']['content_security_policy'] = 1; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting @@ -51,14 +51,14 @@ $a->config['system']['content_security_policy'] = 1; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -$a->config['system']['register_policy'] = REGISTER_OPEN; -$a->config['system']['register_text'] = ''; -$a->config['system']['admin_email'] = '{{$adminmail}}'; +App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_text'] = ''; +App::$config['system']['admin_email'] = '{{$adminmail}}'; // Recommend you leave this set to 1. Set to 0 to let people register without // proving they own the email address they register with. -$a->config['system']['verify_email'] = 1; +App::$config['system']['verify_email'] = 1; // Site access restrictions. By default we will create private sites. @@ -71,21 +71,21 @@ $a->config['system']['verify_email'] = 1; // paid, tiered, or free determines how these listings will be presented. -$a->config['system']['access_policy'] = ACCESS_PRIVATE; +App::$config['system']['access_policy'] = ACCESS_PRIVATE; // If you operate a public site, you might wish that people are directed // to a "sellpage" where you can describe for features or policies or service plans in depth. // This must be an absolute URL beginning with http:// or https:// . -$a->config['system']['sellpage'] = ''; +App::$config['system']['sellpage'] = ''; // Maximum size of an imported message, 0 is unlimited -$a->config['system']['max_import_size'] = 200000; +App::$config['system']['max_import_size'] = 200000; // Location of PHP command line processor -$a->config['system']['php_path'] = '{{$phpath}}'; +App::$config['system']['php_path'] = '{{$phpath}}'; // Configure how we communicate with directory servers. // DIRECTORY_MODE_NORMAL = directory client, we will find a directory @@ -93,11 +93,11 @@ $a->config['system']['php_path'] = '{{$phpath}}'; // DIRECTORY_MODE_PRIMARY = master directory server - one per realm // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services -$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; +App::$config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; // default system theme -$a->config['system']['theme'] = 'redbasic'; +App::$config['system']['theme'] = 'redbasic'; // PHP error logging setup -- cgit v1.2.3 From c0bdcfedeb8c5b8753587ac77d5b90d48698ec66 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 8 Apr 2016 05:10:36 -0700 Subject: log if the session handler fails and surface the ssl_cookie config setting --- view/en/htconfig.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/en') diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 13c5aa942..4aa6132a6 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -43,6 +43,7 @@ App::$config['system']['location_hash'] = '{{$site_id}}'; App::$config['system']['transport_security_header'] = 1; App::$config['system']['content_security_policy'] = 1; +App::$config['system']['ssl_cookie_protection'] = 1; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting -- cgit v1.2.3