aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-03-17 17:56:29 -0700
committerzotlabs <mike@macgirvin.com>2019-03-17 17:56:29 -0700
commit026b96b8f2aebff50f594aa2a184a60a66cc3fd4 (patch)
tree4f2dea61bdc49be73de4ae00fc4e22937361df3e /Zotlabs
parent136b2ae37f36d0b772166f7c8fac5a27b4b8a4d3 (diff)
downloadvolse-hubzilla-026b96b8f2aebff50f594aa2a184a60a66cc3fd4.tar.gz
volse-hubzilla-026b96b8f2aebff50f594aa2a184a60a66cc3fd4.tar.bz2
volse-hubzilla-026b96b8f2aebff50f594aa2a184a60a66cc3fd4.zip
clone systems apps to the extent possible, auto-configure imagick thumbnail binary during setup if possible
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Import.php3
-rw-r--r--Zotlabs/Module/Setup.php6
2 files changed, 9 insertions, 0 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 0daf28aa9..9d047ed7b 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -472,6 +472,9 @@ class Import extends \Zotlabs\Web\Controller {
if(is_array($data['app']))
import_apps($channel,$data['app']);
+ if(is_array($data['sysapp']))
+ import_sysapps($channel,$data['sysapp']);
+
if(is_array($data['chatroom']))
import_chatrooms($channel,$data['chatroom']);
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index ce0538099..c809ff5ec 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -732,6 +732,12 @@ class Setup extends \Zotlabs\Web\Controller {
// install the standard theme
set_config('system', 'allowed_themes', 'redbasic');
+ // if imagick converter is installed, use it
+ if(@is_executable('/usr/bin/convert')) {
+ set_config('system','imagick_convert_path','/usr/bin/convert');
+ }
+
+
// Set a lenient list of ciphers if using openssl. Other ssl engines
// (e.g. NSS used in RedHat) require different syntax, so hopefully
// the default curl cipher list will work for most sites. If not,