springup/cmc-sales
2
0
Fork 0
Code Issues 48 Pull requests Actions Packages Projects Releases Wiki Activity

Resolving merge conflicts

Browse source
This commit is contained in:
Finley Ghosh 2025-07-20 18:05:58 +10:00
parent 0b70b2c209 c2eb01b59a
commit 057231a414
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/config/core.php
View file

@ -56,11 +56,20 @@ $host = $_SERVER['HTTP_HOST'];
)); ));
*/ */
Configure::write('smtp_settings', array( Configure::write('smtp_settings', array(
'port' => '25', 'port' => '25',
'timeout' => '30', 'timeout' => '30',
'host' => '172.17.0.1')); 'host' => '172.17.0.1'));
// Mailhog SMTP settings for local development
// Configure::write('smtp_settings', array(
// 'port' => '1025',
// 'timeout' => '30',
// 'host' => 'host.docker.internal'
// ));
//Production/Staging Config //Production/Staging Config
$production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000'); $production_hosts = array('cmc.lan', '192.168.0.7', 'cmcbeta.lan', 'office.cmctechnologies.com.au:5000');