Update and simplify deployment instructions

README.md

@@ -77,24 +77,18 @@ Note: The migration will partially fail because of missing files. For now, re-ru
 
 ## Running the migration on the hosted instance
 
-1. Ensure the files you need are uploaded to the server. Obtain the latest from the prior site: database, and files. Upload these to the server (e.g. `scp *.gz geo_live@drutopia.org:`) and we'll extract them there.
+1. Refresh files and database from live.
-1. If a deployment has been performed already, it must be moved out of the way by removing existing databases. Log into the server (`ssh geo_live@drutopia.org`) and remove the database(s):
+   - Obtain the latest from the prior site via [Migrate and Backup](http://geo.coop/admin/config/system/backup_migrate): database, and public files, as two separate downloads. The following commands assume the files saved as `files.tar.gz` and `database.sql.gz`
-   - Start the mysql client (logged into geo_live): `mysql`
+   - Upload these to the server: `scp *.gz geo_live@drutopia.org:`
-   - Drop the drupal db: `drop database geo_live;`
+   - SSH to server: `ssh geo_live@drutopia.org`
-   - Drop the migration source db: `drop database geo_legacy;`
+   - Unzip the uploaded database file: `gunzip database.sql.gz`
-   - Exit mysql by typing `ctrl+d`
+   - Drop the existing tables: `drop-tables.sh geo_legacy`
-1. Extract the uploaded files (still on server):
+   - Reload the uploaded database: `mysql geo_legacy < database.sql`
-   - Unzip the uploaded database file (this expects there to be only ONE such file): `gunzip *.mysql.gz`
+   - Change to the files folder and untar them: `cd site/d7/sites/default/files/` and then: `tar xzf ~/files.tar.gz` (this will take a couple minutes).
-   - Rename the database file: `mv *.mysql geo_legacy.sql`
-   - Unpack the files, but first cd to where they go (again, there should only be ONE file ending in .tar.gz in home): `cd site/d7/sites/default/files/` and untar: `tar xzf ~/*.tar.gz` (this will take a minute/two).
    - The server side is ready! Log off by typing `ctrl+d`
-1. Now perform a deployment with drutopia_hosting. This will install the site using the minimal profile and existing config:
+1. Now perform a deployment with drutopia_hosting. This will install the site using the minimal profile and existing config. Set the vars accordingly (drupal_install and drupal_forceinstall must be True), if needed: `ahoy vault-edit`
-   - `ahoy deploy-build news`
+   - Deploy a new build, as needed: `ahoy deploy-build news`
-   - `ahoy deploy-site geo_live`
+   - Deploy the site. With a forced re-install, a migration will be performed automatically: `ahoy deploy-site geo_live`
-1. Return to the server (`ssh geo_live@drutopia.org`), load legacy db and run the migration:
-   - Read the db source into the proper database: `mysql geo_legacy < geo_legacy.sql`
-   - `drush mim --group="migrate_drupal_7_geo"`
-   - `drush php:script article_type_term.php`
 
 ## Post go-live tasks