Merge pull request #19 from redmatrix/master

updating from original codebase

2 files changed, 9 insertions, 1 deletions

diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index 78cea638d..22c7ef35f 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -62,6 +62,14 @@ When communicating with new sites, Hubzilla always attempts connection on the
 SSL port first, before falling back to a less secure connection.  If you do not
 use SSL, your webserver MUST NOT listen on port 443 at all.
 
+If you use LetsEncrypt to provide certificates and create a file under 
+.well-known/acme-challenge so that LetsEncrypt can verify your domain ownership, 
+please remove or rename the .well-known directory as soon as the certificate is 
+generated. Hubzilla will provide its own handler for ".well-known" services when
+it is installed, and an existing directory in this location may prevent some of 
+these services from working correctly. 
+
+
 1. Requirements
     - Apache with mod-rewrite enabled and "AllowOverride All" so you can use a 
     local .htaccess file. Some folks have successfully used nginx and lighttpd.
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 794afa93b..df39bc9ad 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -37,7 +37,7 @@ $db_type = 0; // use 1 for postgres, 0 for mysql
 
 $default_timezone = 'America/Los_Angeles';
 
-// What is your site name?
+// What is your site name? DO NOT ADD A TRAILING SLASH!
 
 $a->config['system']['baseurl'] = 'https://myredsite.example';
 $a->config['system']['sitename'] = "Hubzilla";