diff --git a/builders/acquia-base.js b/builders/acquia-base.js index 5f6577b..3f50e6e 100644 --- a/builders/acquia-base.js +++ b/builders/acquia-base.js @@ -195,7 +195,7 @@ module.exports = { config: { build: [], composer: {}, - confSrc: __dirname, + confSrc: path.resolve(__dirname, '..', 'config'), config: {}, database: 'mysql', defaultFiles: { diff --git a/builders/acquia-nginx.js b/builders/acquia-nginx.js deleted file mode 100644 index 3f928db..0000000 --- a/builders/acquia-nginx.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -const _ = require('lodash'); -const PhpNginx = require('@lando/php/builders/php-nginx.js'); - -// Builder -module.exports = { - name: 'acquia-nginx', - parent: '_webserver', - config: { - version: '1.25', - }, - builder: (parent, config) => class AcquiaNginx extends PhpNginx.builder(parent, PhpNginx.config) { - constructor(id, options = {}) { - super(id, _.merge({}, config, options), {services: _.set({}, options.name)}); - }; - }, -}; diff --git a/builders/acquia-php.js b/builders/acquia-php.js index c1e0f19..ff1596d 100644 --- a/builders/acquia-php.js +++ b/builders/acquia-php.js @@ -24,8 +24,8 @@ module.exports = { parent: '_appserver', builder: (parent, config) => class AcquiaPhp extends LandoPhp.builder(parent, LandoPhp.config) { constructor(id, options = {}, factory) { + options = _.merge({}, config, options); loadScripts(options); - options.nginxServiceType = 'acquia-nginx'; super(id, options, factory); }; }, diff --git a/builders/acquia.js b/builders/acquia.js index 0d66cac..cf14f24 100644 --- a/builders/acquia.js +++ b/builders/acquia.js @@ -1,6 +1,7 @@ 'use strict'; const _ = require('lodash'); +const path = require('path'); const {getAcquiaPull} = require('./../lib/pull'); const {getAcquiaPush} = require('./../lib/push'); const utils = require('./../lib/utils'); @@ -11,7 +12,7 @@ module.exports = { config: { cache: true, composer_version: '2', - confSrc: __dirname, + confSrc: path.resolve(__dirname, '..', 'config'), defaultFiles: {}, drush: '8.4.8', inbox: true,