danielsiepmann/nixpkgs
danielsiepmann/nixpkgs
1
0
Code Releases Activity

Allow usage of ImageMagick for TYPO3 on hikari

Browse source
This commit is contained in:
Daniel Siepmann 2023-02-02 16:57:00 +01:00
parent 65828b40ee
commit 6ed4a7b08a
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
home/files/typo3-configuration/AdditionalConfiguration.inc.php
View file

@ -12,7 +12,13 @@ require_once 'CacheFileBackend.php';
require_once 'Debugging.php';
require_once 'Logging.php';
require_once 'Autologin.php';
require_once '/home/daniels/Projects/own/typo3-configuration/ClientSpecific.php';
if (file_exists('/var/projects/own/typo3-client-configuration/ClientSpecific.php')) {
// New location on nixos
require_once '/var/projects/own/typo3-client-configuration/ClientSpecific.php';
} else {
// Old location on ubuntu
require_once '/home/daniels/Projects/own/typo3-configuration/ClientSpecific.php';
}
require_once 'ExtensionConfigurations.php';
// Last, as we need client specific db adjustments
require_once 'Database.php';

2
home/files/typo3-configuration/Gfx.php
View file

@ -2,7 +2,7 @@
$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor'] = 'ImageMagick';
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_version_5'] = 'im6';
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'] = '/usr/bin/';
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'] = getenv('IMAGEMAGICK_PATH') ?: '/usr/bin/';
$GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path_lzw'] = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'];
$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_path'] = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'];
$GLOBALS['TYPO3_CONF_VARS']['GFX']['processor_path_lzw'] = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im_path'];

2
systems/hikari/web-development.nix
View file

@ -1,5 +1,7 @@
{ pkgs, lib, ... }:
# TODO: Find way to place typo3-configuration at expected path.
{
imports = [
./web-development/daniel-siepmann.localhost.nix

1
systems/hikari/web-development/daniel-siepmann.localhost.nix
View file

@ -84,6 +84,7 @@ in {
TYPO3_ADDITIONAL_CONFIGURATION = "/var/projects/own/typo3-configuration/AdditionalConfiguration.inc.php";
TYPO3_DATABASE = databaseName;
TYPO3_CONTEXT = "Development/dsiepmann";
IMAGEMAGICK_PATH = lib.makeBinPath [ pkgs.imagemagick ] + "/";
};
};
mysql.ensureDatabases = [databaseName];