2 files changed, 4 insertions, 27 deletions
diff --git a/template-opt/am/config-windows.yaml b/template-opt/am/config-windows.yaml
index 0f1325b7..6c160fca 100644
--- a/template-opt/am/config-windows.yaml
+++ b/template-opt/am/config-windows.yaml
@@ -4,15 +4,6 @@ formatType: am-configuration
 # installations will go into the standard /opt/am hierarchy
 
 applications:
-  installedAppsManifestDir: "c:/cygwin/opt/am/manifests"
-  appImageMountDir: "c:/cygwin/opt/am/image-mounts"
+  installationDir: "c:/cygwin/opt/am/apps"
+  documentDir: "c:/cygwin/opt/am/docs"
   database: "c:/cygwin/opt/am/apps.db"
-
-# simulate an internal and a SD-card installation location
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "c:/cygwin/opt/am/apps"
-  documentPath: "c:/cygwin/opt/am/docs"
-  mountPoint: "c:/cygwin/opt"
-  isDefault: true
diff --git a/template-opt/am/config.yaml b/template-opt/am/config.yaml
index 94fc9bcb..38ce6195 100644
--- a/template-opt/am/config.yaml
+++ b/template-opt/am/config.yaml
@@ -4,20 +4,6 @@ formatType: am-configuration
 # installations will go into the standard /opt/am hierarchy
 
 applications:
-  installedAppsManifestDir: "/opt/am/manifests"
-  appImageMountDir: "/opt/am/image-mounts"
+  installationDir: "/opt/am/apps"
+  documentDir: "/opt/am/docs"
   database: "/opt/am/apps.db"
-
-# simulate an internal and a SD-card installation location
-
-installationLocations:
-- id: "internal-0"
-  installationPath: "/opt/am/apps"
-  documentPath: "/opt/am/docs"
-  mountPoint: "/opt"
-  isDefault: true
-
-- id: "removable-0"
-  installationPath: "/media/sdcard/apps"
-  documentPath: "/media/sdcard/docs"
-  mountPoint: "/media/sdcard"