feat: depend on ddev/ddev-solr, fixes #40

README.md

@@ -7,10 +7,16 @@
 
 ## What is the difference between this and ddev-solr
 
-Please consider using [ddev/ddev-solr](https://github.com/ddev/ddev-solr), which runs Solr in the modern "Cloud" mode. This offers several advantages. If you are using Drupal, the biggest advantage
-is that you can update the Solr Configset from the UI or with a Drush command everytime you update `search_api_solr`.
+[ddev/ddev-solr](https://github.com/ddev/ddev-solr) provides the Solr server. This module only adds drupal-specific convenience functions.
 
-The current addon runs in "classic standalone" mode. It is probably simpler at first to setup, but comes with the added maintainance steps for configsets. Most Solr hosting service providers run "Solr Cloud" as a backend.
+## Migratiing from 1.x to 2.x
+
+```bash
+ddev stop
+ddev add-on get ddev/ddev-solr
+ddev add-on get ddev/ddev-drupal-solr
+ddev restart
+```
 
 ## Overview
 

install.yaml

@@ -1,13 +1,33 @@
-name: solr
+name: drupal-solr
 
-project_files:
-  - solr/conf
-  - solr/docker-entrypoint-initdb.d/solr-configupdate.sh
-  - docker-compose.solr.yaml
+dependencies:
+  - ddev/ddev-solr
 
-post_install_actions:
+# migrate from ddev-drupal-solr 1.x to ddev-solr
+pre_install_actions:
   - |
-    #ddev-description:Make sure solr-configupdate.sh is executable
-    chmod +x solr/docker-entrypoint-initdb.d/solr-configupdate.sh
+    if [ -d .ddev/solr/conf ]; then
+      echo "Migrating core 'dev' to ddev-solr ..."
+      if [ -d .ddev/solr/configsets/dev ]; then
+        echo "Migration error: .ddev/solr/configsets/dev already exists."
+      else
+        echo "Moving ddev/solr/conf to .ddev/solr/configsets/dev/conf ..."
+        mkdir .ddev/solr/configsets/dev
+        mv .ddev/solr/conf .ddev/solr/configsets/dev/
+        echo "Patching .ddev/solr/configsets/dev/conf/solrconfig* ..."
+        for file in .ddev/solr/configsets/dev/conf/solrconfig*; do
+          if [ -f "$file" ]; then
+            cp "$file" "${file}.bak"
+            sed -i '/<queryResponseWriter name="xslt" class="solr.XSLTResponseWriter">/,/<\/queryResponseWriter>/{/<\/queryResponseWriter>/!d;/<\/queryResponseWriter>/d;}' "$file"
+            sed -i 's/FastLRUCache/CaffeineCache/g; s/LRUCache/CaffeineCache/g; s/LFUCache/CaffeineCache/g; s/FastLRUCache/CaffeineCache/g' "$file"
+          fi
+        done
+        echo "Removing old solr volume ..."
+        docker volume rm ddev-`ddev status | grep Project: | cut -d ' ' -f 3`_solr
+        echo "Removing solr/docker-entrypoint-initdb.d ..."
+        rm -rf solr/docker-entrypoint-initdb.d
+        echo "... migration finished."
+      fi
+    fi
 
 ddev_version_constraint: '>= v1.24.3'