# HG changeset patch
# User smith@nwoca.org
# Date 1492803738 -3600
# Node ID b2b23cdaabcd2e82aa3c160861c37819174a9e85
# Parent  dc3696525de42aea54b4592bb140497d67e99e14
DEP-12: convert to v2.

diff -r dc3696525de4 -r b2b23cdaabcd compose2/preview/import-usas.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/import-usas.yml	Fri Apr 21 20:42:18 2017 +0100
@@ -0,0 +1,14 @@
+version: "2"
+services:
+  usasimport:
+    image: docker.ssdt.io/usas-import:preview
+    command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH}
+    environment:
+      - DB_HOST=usasdb
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=usasdefault
+    environment:
+      - DB_NAME=usasdb
+      - DB_USER=usas
+      - DB_PASS=usasdefault
\ No newline at end of file
diff -r dc3696525de4 -r b2b23cdaabcd compose2/preview/import-usps.yml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/compose2/preview/import-usps.yml	Fri Apr 21 20:42:18 2017 +0100
@@ -0,0 +1,10 @@
+version: "2"
+services:
+  uspsimport:
+    image: docker.ssdt.io/usps-import:preview
+    command: -i ${IMP_IRN} -u ${IMP_URL} -r ${IMP_PATH} ${IMP_ANON} ${IMP_EM}
+    environment:
+      - DB_HOST=uspsdb
+      - DB_NAME=uspsdb
+      - DB_USER=usps
+      - DB_PASS=uspsdefault
\ No newline at end of file
diff -r dc3696525de4 -r b2b23cdaabcd compose2/preview/usas.yml
--- a/compose2/preview/usas.yml	Fri Apr 21 17:17:24 2017 +0100
+++ b/compose2/preview/usas.yml	Fri Apr 21 20:42:18 2017 +0100
@@ -15,6 +15,6 @@
       - DB_NAME=usasdb
       - DB_USER=usas
       - DB_PASS=usasdefault
-      - ORG_SSDT_OHIO_USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=uspsapp
-      - ORG_SSDT_OHIO_USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERDNSLOOKUP=true
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERHOST=uspsapp
+      - USAS_MODULE_USPSINTEGRATION_CONFIGURATION_USPSCONFIGURATION_SERVERDNSLOOKUP=true
       
diff -r dc3696525de4 -r b2b23cdaabcd compose2/preview/usps.yml
--- a/compose2/preview/usps.yml	Fri Apr 21 17:17:24 2017 +0100
+++ b/compose2/preview/usps.yml	Fri Apr 21 20:42:18 2017 +0100
@@ -16,5 +16,5 @@
       - DB_NAME=uspsdb
       - DB_USER=usps
       - DB_PASS=uspsdefault
-      - ORG_SSDT_OHIO_USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=usasapp
-      - ORG_SSDT_OHIO_USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERDNSLOOKUP=true
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERHOST=usasapp
+      - USPS_MODULE_USASINTEGRATION_CONFIGURATION_USASCONFIGURATION_SERVERDNSLOOKUP=true