diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-03-21 11:13:54 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-03-21 11:13:54 +0100 |
| commit | efd9421dc9f90f6573b0650d27ed49c12ead3cc3 (patch) | |
| tree | 87da06a07ad0b29cc7c993e4a4da2476ff43a355 /Zotlabs/Module/Setup.php | |
| parent | 578230e32c7599043830abd49a571f69bbbe4e51 (diff) | |
| parent | 9b696a872bf8712875dc0851b1873ec3353591be (diff) | |
| download | volse-hubzilla-efd9421dc9f90f6573b0650d27ed49c12ead3cc3.tar.gz volse-hubzilla-efd9421dc9f90f6573b0650d27ed49c12ead3cc3.tar.bz2 volse-hubzilla-efd9421dc9f90f6573b0650d27ed49c12ead3cc3.zip | |
Merge branch 'dev'
Diffstat (limited to 'Zotlabs/Module/Setup.php')
| -rw-r--r-- | Zotlabs/Module/Setup.php | 6 |
1 files changed, 6 insertions, 0 deletions
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, |