From 7c7b774c916ec3a29caf8344f95d7e6c164febc9 Mon Sep 17 00:00:00 2001 From: jurgenhaas <juergen.haas@lakedrops.com> Date: Sat, 10 Feb 2024 13:58:15 +0100 Subject: [PATCH] composer/plugin/docker4drupal#68 Add support for invoice ninja --- src/Handler.php | 14 +++++--------- templates/{in => }/in-vhost.conf.twig | 0 templates/in/hosts.twig | 1 - 3 files changed, 5 insertions(+), 10 deletions(-) rename templates/{in => }/in-vhost.conf.twig (100%) delete mode 100644 templates/in/hosts.twig diff --git a/src/Handler.php b/src/Handler.php index e717240..20b180d 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -518,8 +518,10 @@ class Handler extends BaseHandler { // Ignore some Unlighthouse directories. $this->gitIgnore('tests/unlighthouse'); - // Ignore Invoice Ninja directory. - $this->gitIgnore('/in/'); + if ($this->config->readValue(['invoiceninja', 'enable'])) { + // Ignore Invoice Ninja directory. + $this->gitIgnore('/in/'); + } if (getenv('LAKEDROPS_BUILD_NG') !== 'yes') { $this->updateTraefik(); @@ -640,14 +642,8 @@ class Handler extends BaseHandler { 'mailpitout.yml' => [ 'dest' => $projectRoot . '/tests', ], - 'hosts' => [ - 'source' => 'in/', - 'dest' => $projectRoot . '/in', - 'condition' => $this->config->readValue(['invoiceninja', 'enable']), - ], 'in-vhost.conf' => [ - 'source' => 'in/', - 'dest' => $projectRoot . '/in', + 'dest' => $projectRoot . '/config', 'condition' => $this->config->readValue(['invoiceninja', 'enable']), ], ]; diff --git a/templates/in/in-vhost.conf.twig b/templates/in-vhost.conf.twig similarity index 100% rename from templates/in/in-vhost.conf.twig rename to templates/in-vhost.conf.twig diff --git a/templates/in/hosts.twig b/templates/in/hosts.twig deleted file mode 100644 index eaf5889..0000000 --- a/templates/in/hosts.twig +++ /dev/null @@ -1 +0,0 @@ -192.168.0.124 in5.test -- GitLab