aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
Diffstat (limited to 'install')
-rw-r--r--install/INSTALL.txt7
-rwxr-xr-xinstall/htconfig.sample.php4
2 files changed, 5 insertions, 6 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt
index efcf8c9af..50d755f0f 100644
--- a/install/INSTALL.txt
+++ b/install/INSTALL.txt
@@ -83,10 +83,9 @@ but may be an issue with nginx or other web server platforms.
php.ini file - and with no hosting provider restrictions on the use of
exec() and proc_open().
- - curl, gd (with at least jpeg and png support), mysqli, mbstring, mcrypt,
- and openssl extensions. The imagick extension is not required but desirable.
-
- - xml extension is required if you want webdav to work.
+ - curl, gd (with at least jpeg and png support), mysqli, mbstring, xml,
+ and openssl extensions. The imagick extension MAY be used instead of gd,
+ but is not required and MAY also be disabled via configuration option.
- some form of email server or email gateway such that PHP mail() works.
diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php
index 5e506225e..c46805171 100755
--- a/install/htconfig.sample.php
+++ b/install/htconfig.sample.php
@@ -37,11 +37,11 @@ define( 'UNO', 0 );
// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
// It can be changed later and only applies to timestamps for anonymous viewers.
-$default_timezone = 'America/Los_Angeles';
+App::$config['system']['timezone'] = 'America/Los_Angeles';
// What is your site name? DO NOT ADD A TRAILING SLASH!
-App::$config['system']['baseurl'] = 'https://myredsite.example';
+App::$config['system']['baseurl'] = 'https://mysite.example';
App::$config['system']['sitename'] = "Hubzilla";
App::$config['system']['location_hash'] = 'if the auto install failed, put a unique random string here';