From 24d947f4fa7ba079b068115a9a8b838b1a0b5d10 Mon Sep 17 00:00:00 2001
From: Alec Reynolds <alec+git@lando.dev>
Date: Tue, 21 Nov 2023 21:27:00 -0800
Subject: [PATCH] Refactor plugin structure to modern style.

---
 services/solr/builder.js => builders/solr.js | 3 ++-
 {services/solr => config}/start-solr-3.sh    | 0
 {services/solr => config}/start-solr-4.sh    | 0
 {services/solr => config}/start-solr-9.sh    | 0
 {services/solr => config}/start-solr.sh      | 0
 5 files changed, 2 insertions(+), 1 deletion(-)
 rename services/solr/builder.js => builders/solr.js (98%)
 rename {services/solr => config}/start-solr-3.sh (100%)
 rename {services/solr => config}/start-solr-4.sh (100%)
 rename {services/solr => config}/start-solr-9.sh (100%)
 rename {services/solr => config}/start-solr.sh (100%)

diff --git a/services/solr/builder.js b/builders/solr.js
similarity index 98%
rename from services/solr/builder.js
rename to builders/solr.js
index 29b371b..ce29997 100644
--- a/services/solr/builder.js
+++ b/builders/solr.js
@@ -2,6 +2,7 @@
 
 // Modules
 const _ = require('lodash');
+const path = require('path');
 
 // Versions
 const supportedVersions = [
@@ -152,7 +153,7 @@ module.exports = {
     legacy: ['6.6', '6', '5.5', '5', '4.10', '4', '3.6', '3'],
     patchesSupported: true,
     command: '/start-solr.sh',
-    confSrc: __dirname,
+    confSrc: path.resolve(__dirname, '..', 'config'),
     core: 'lando',
     dataDir: '/opt/solr/server/solr/mycores',
     moreHttpPorts: ['8983'],
diff --git a/services/solr/start-solr-3.sh b/config/start-solr-3.sh
similarity index 100%
rename from services/solr/start-solr-3.sh
rename to config/start-solr-3.sh
diff --git a/services/solr/start-solr-4.sh b/config/start-solr-4.sh
similarity index 100%
rename from services/solr/start-solr-4.sh
rename to config/start-solr-4.sh
diff --git a/services/solr/start-solr-9.sh b/config/start-solr-9.sh
similarity index 100%
rename from services/solr/start-solr-9.sh
rename to config/start-solr-9.sh
diff --git a/services/solr/start-solr.sh b/config/start-solr.sh
similarity index 100%
rename from services/solr/start-solr.sh
rename to config/start-solr.sh