Merge branch 'master' of gitlab.com:agaric/sites/geo

README.md

@@ -1,15 +1,27 @@
-This is a composer based installer for the [Drutopia distribution](http://www.drupal.org/project/drutopia).
+# GEO.coop README
 
-# Prerequisites
+This project is based on Drutopia, which means it is compatible with
+existing and future Drutopia features.  We will be diverging from
+Drutopia for special functionality, however.
 
-1. [Prepare a local server for Drupal](https://www.drupal.org/docs/develop/local-server-setup)
-2. [Install Composer](https://getcomposer.org/download/)
+## Getting started
 
-
-## Installation of Drutopia basic
+One time:
 
 ```
-composer create-project drutopia/drutopia_template:dev-master --no-interaction DIRECTORY
+git clone git@gitlab.com:agaric/sites/geo.git
+cd geo
 ```
 
-Composer will create a new directory called DIRECTORY (change to whatever presumably lower-case name you would like). Inside you will find the web directory with the entire code base of [Drutopia distribution](http://www.drupal.org/project/drutopia). You should be able to install it like any other Drupal site.
+[Install DDEV](https://ddev.readthedocs.io/en/latest/#installation) for
+the following steps to work.
+
+Whenever you want a fresh start:
+
+
+```
+git pull
+ddev start
+ddev composer update
+ddev . drush -y site:install minimal --existing-config
+```

composer.json

@@ -13,7 +13,8 @@
         "drush/drush": "^9.0",
         "drupal/migrate_plus": "^4.2",
         "drupal/migrate_upgrade": "^3",
-        "drupal/migrate_tools": "^4.1"
+        "drupal/migrate_tools": "^4.1",
+        "drupal/config_actions": "1.x-dev"
     },
     "repositories": {
         "drupal": {
@@ -52,14 +53,17 @@
                 "type:drupal-drush"
             ]
         },
+        "enable-patching": true,
         "patches": {
+            "drupal/core": {
+                "Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch"
+            },
             "drutopia/drutopia": {
                 "Remove default content": "patches/drutopia-remove-default-content.patch"
             },
             "drupal/drutopia_core": {
                 "Remove default content": "patches/drutopia-core-remove-default-content.patch"
             }
-        },
-        "enable-patching": true
+        }
     }
 }

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5ab9bcf2e25d6ff9012f75b462013e1e",
+    "content-hash": "44e3defbefe14c4070d9f144fedde427",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -2515,17 +2515,11 @@
         },
         {
             "name": "drupal/config_actions",
-            "version": "1.1.0",
+            "version": "dev-1.x",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/config_actions.git",
-                "reference": "8.x-1.1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/config_actions-8.x-1.1.zip",
-                "reference": "8.x-1.1",
-                "shasum": "c3493a02af86fd6e72d00eae9265f697a80b5edd"
+                "reference": "026055919eb73f9e79aac2f2b9ec0fc85d195569"
             },
             "require": {
                 "drupal/core": "~8.0"
@@ -2536,11 +2530,11 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.1",
-                    "datestamp": "1553005385",
+                    "version": "8.x-1.1+1-dev",
+                    "datestamp": "1556823781",
                     "security-coverage": {
-                        "status": "covered",
-                        "message": "Covered by Drupal's security advisory policy"
+                        "status": "not-covered",
+                        "message": "Dev releases are not covered by Drupal security advisories."
                     }
                 },
                 "drush": {
@@ -2575,7 +2569,8 @@
             "homepage": "https://www.drupal.org/project/config_actions",
             "support": {
                 "source": "https://git.drupalcode.org/project/config_actions"
-            }
+            },
+            "time": "2019-05-03T15:13:24+00:00"
         },
         {
             "name": "drupal/config_actions_provider",
@@ -3417,6 +3412,9 @@
                     "recurse": false,
                     "replace": false,
                     "merge-extra": false
+                },
+                "patches_applied": {
+                    "Allow an install hook in profiles installing from configuration": "https://www.drupal.org/files/issues/2018-11-27/2982052-22.patch"
                 }
             },
             "autoload": {
@@ -6043,7 +6041,7 @@
         },
         {
             "name": "drupal/gnode",
-            "version": "1.0.0-rc3",
+            "version": "1.0.0-rc4",
             "require": {
                 "drupal/core": "*",
                 "drupal/group": "self.version"
@@ -6054,8 +6052,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-rc3",
-                    "datestamp": "1560345781",
+                    "version": "8.x-1.0-rc4",
+                    "datestamp": "1563460085",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -6084,17 +6082,17 @@
         },
         {
             "name": "drupal/group",
-            "version": "1.0.0-rc3",
+            "version": "1.0.0-rc4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/group.git",
-                "reference": "8.x-1.0-rc3"
+                "reference": "8.x-1.0-rc4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/group-8.x-1.0-rc3.zip",
-                "reference": "8.x-1.0-rc3",
-                "shasum": "e697310cbe99219c9f8af7858d17303c7c0a6ac0"
+                "url": "https://ftp.drupal.org/files/projects/group-8.x-1.0-rc4.zip",
+                "reference": "8.x-1.0-rc4",
+                "shasum": "d5d55167523a3ddccef7f66159b4c417d950d6f5"
             },
             "require": {
                 "drupal/core": "^8.6",
@@ -6106,8 +6104,8 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.0-rc3",
-                    "datestamp": "1560345781",
+                    "version": "8.x-1.0-rc4",
+                    "datestamp": "1563460085",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -10747,7 +10745,9 @@
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "dev",
-    "stability-flags": [],
+    "stability-flags": {
+        "drupal/config_actions": 20
+    },
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": [],