Update confSrc, remove nginx.

lando · Dec 29, 2023 · a7dac1e · a7dac1e
1 parent 3056c35
commit a7dac1e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git 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
diff --git 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
@@ -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,