Fix domain configuration for mailcatcher

parent 179b635d
......@@ -137,17 +137,17 @@ class ApachePhp70Setup implements SetupInterface {
*/
protected function expandProjectConfiguration(string $domain, string $docroot, string $project): void {
global $cfg;
$cfg['docker']['domains'][ $project.'-apache' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mailcatcher' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['domains'][ $project.'-apache' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mail' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['mounts'][] = $docroot.'/';
$cfg['docker']['containers'] = [
$project.'-apache',
$project.'-mysql',
$project.'-php',
$project.'-mailcatcher',
$project.'-mail',
$project.'-phpmyadmin'
];
......@@ -155,13 +155,13 @@ class ApachePhp70Setup implements SetupInterface {
$cfg['paths']['project']['profile'].'Configuration/config.php',
PHP_EOL.PHP_EOL.'/* :: Docker Configuration START :: */'.
PHP_EOL.'/* DO NOT EDIT! This block is maintained by the EPM Docker Module */'.
PHP_EOL."\$cfg['docker']['domains']['{$project}-apache'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mailcatcher'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-apache'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mail'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['mounts'][] = '{$docroot}/';".
PHP_EOL."\$cfg['docker']['containers'] = ['{$project}-apache',".
"'{$project}-mysql','{$project}-php','{$project}-mailcatcher','{$project}-phpmyadmin'];".
"'{$project}-mysql','{$project}-php','{$project}-mail','{$project}-phpmyadmin'];".
PHP_EOL.'/* :: Docker Configuration END :: */'.PHP_EOL
);
}
......
......@@ -137,17 +137,17 @@ class ApachePhp71Setup implements SetupInterface {
*/
protected function expandProjectConfiguration(string $domain, string $docroot, string $project): void {
global $cfg;
$cfg['docker']['domains'][ $project.'-apache' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mailcatcher' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['domains'][ $project.'-apache' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mail' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['mounts'][] = $docroot.'/';
$cfg['docker']['containers'] = [
$project.'-apache',
$project.'-mysql',
$project.'-php',
$project.'-mailcatcher',
$project.'-mail',
$project.'-phpmyadmin'
];
......@@ -155,13 +155,13 @@ class ApachePhp71Setup implements SetupInterface {
$cfg['paths']['project']['profile'].'Configuration/config.php',
PHP_EOL.PHP_EOL.'/* :: Docker Configuration START :: */'.
PHP_EOL.'/* DO NOT EDIT! This block is maintained by the EPM Docker Module */'.
PHP_EOL."\$cfg['docker']['domains']['{$project}-apache'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mailcatcher'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-apache'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mail'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['mounts'][] = '{$docroot}/';".
PHP_EOL."\$cfg['docker']['containers'] = ['{$project}-apache',".
"'{$project}-mysql','{$project}-php','{$project}-mailcatcher','{$project}-phpmyadmin'];".
"'{$project}-mysql','{$project}-php','{$project}-mail','{$project}-phpmyadmin'];".
PHP_EOL.'/* :: Docker Configuration END :: */'.PHP_EOL
);
}
......
......@@ -137,17 +137,17 @@ class NginxPhp70Setup implements SetupInterface {
*/
protected function expandProjectConfiguration(string $domain, string $docroot, string $project): void {
global $cfg;
$cfg['docker']['domains'][ $project.'-nginx' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mailcatcher' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['domains'][ $project.'-nginx' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mail' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['mounts'][] = $docroot.'/';
$cfg['docker']['containers'] = [
$project.'-nginx',
$project.'-mysql',
$project.'-php',
$project.'-mailcatcher',
$project.'-mail',
$project.'-phpmyadmin'
];
......@@ -155,13 +155,13 @@ class NginxPhp70Setup implements SetupInterface {
$cfg['paths']['project']['profile'].'Configuration/config.php',
PHP_EOL.PHP_EOL.'/* :: Docker Configuration START :: */'.
PHP_EOL.'/* DO NOT EDIT! This block is maintained by the EPM Docker Module */'.
PHP_EOL."\$cfg['docker']['domains']['{$project}-nginx'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mailcatcher'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-nginx'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mail'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['mounts'][] = '{$docroot}/';".
PHP_EOL."\$cfg['docker']['containers'] = ['{$project}-nginx',".
"'{$project}-mysql','{$project}-php','{$project}-mailcatcher','{$project}-phpmyadmin'];".
"'{$project}-mysql','{$project}-php','{$project}-mail','{$project}-phpmyadmin'];".
PHP_EOL.'/* :: Docker Configuration END :: */'.PHP_EOL
);
}
......
......@@ -137,17 +137,17 @@ class NginxPhp71Setup implements SetupInterface {
*/
protected function expandProjectConfiguration(string $domain, string $docroot, string $project): void {
global $cfg;
$cfg['docker']['domains'][ $project.'-nginx' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mailcatcher' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['domains'][ $project.'-nginx' ] = [$domain, 'www.'.$domain];
$cfg['docker']['domains'][ $project.'-mail' ] = ['mail.'.$domain];
$cfg['docker']['domains'][ $project.'-phpmyadmin' ] = ['phpmyadmin.'.$domain];
$cfg['docker']['domains'][ $project.'-mysql' ] = ['db.'.$domain];
$cfg['docker']['mounts'][] = $docroot.'/';
$cfg['docker']['containers'] = [
$project.'-nginx',
$project.'-mysql',
$project.'-php',
$project.'-mailcatcher',
$project.'-mail',
$project.'-phpmyadmin'
];
......@@ -155,13 +155,13 @@ class NginxPhp71Setup implements SetupInterface {
$cfg['paths']['project']['profile'].'Configuration/config.php',
PHP_EOL.PHP_EOL.'/* :: Docker Configuration START :: */'.
PHP_EOL.'/* DO NOT EDIT! This block is maintained by the EPM Docker Module */'.
PHP_EOL."\$cfg['docker']['domains']['{$project}-nginx'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mailcatcher'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-nginx'] = ['$domain', 'www.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mail'] = ['mail.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-phpmyadmin'] = ['phpmyadmin.$domain'];".
PHP_EOL."\$cfg['docker']['domains']['{$project}-mysql'] = ['db.$domain'];".
PHP_EOL."\$cfg['docker']['mounts'][] = '{$docroot}/';".
PHP_EOL."\$cfg['docker']['containers'] = ['{$project}-nginx',".
"'{$project}-mysql','{$project}-php','{$project}-mailcatcher','{$project}-phpmyadmin'];".
"'{$project}-mysql','{$project}-php','{$project}-mail','{$project}-phpmyadmin'];".
PHP_EOL.'/* :: Docker Configuration END :: */'.PHP_EOL
);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment