Merge pull request #210 from palantirnet/TECH-35-pantheon-install

Tech 35 pantheon install
palantirnet · Jan 19, 2023 · 68cbd44 · 68cbd44
2 parents 2937b23 + 67aff19
commit 68cbd44
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/targets/drupal.xml b/targets/drupal.xml
@@ -275,7 +275,6 @@ Or, you can specify the export file directly:
         <composer command="require" composer="${composer.composer}">
             <arg value="drupal/admin_toolbar" />
             <arg value="drupal/config_split" />
-            <arg value="drupal/config_ignore" />
             <arg value="drupal/devel" />
             <arg value="drupal/workbench" />
             <arg value="drupal/workbench_tabs" />

diff --git a/targets/install.xml b/targets/install.xml
@@ -142,6 +142,16 @@
                 <!-- The one that's available is the location we're moving from. -->
                 <available file="${build.dir}/web/core" type="dir" property="drupal.root.old" value="web" />
                 <available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />
+                <available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />
+
+                <!-- Copy settings.ddev.php if it doesn't exist in the old drupal root. -->
+                <if>
+                    <not><equals arg1="${ddev_settings_exists}" arg2="1" /></not>
+                    <then>
+                        <echo msg="Copying settings.ddev.php to old drupal root." />
+                        <exec command="cp ${drupal.root}/sites/default/settings.ddev.php ${drupal.root.old}/sites/default" dir="${build.dir}" checkreturn="true" logoutput="true" />
+                    </then>
+                </if>
 
                 <echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
                 <exec command="rm -rf ${drupal.root}" dir="${build.dir}" />
@@ -169,7 +179,7 @@
     <!-- Target: setup-templates -->
     <target name="setup-templates" depends="set-site">
         <!-- Set the project name in the ddev config. -->
-        <replaceregexp match="name: .*" replace="name: ${projectname}" file=".ddev/config.yaml" />
+        <replaceregexp match="name: .*" replace="name: ${projectname}" file="${application.startdir}/.ddev/config.yaml" />
 
         <!-- Copy the build file template.