Refactor config to have multiple trees

Author: DiamondJoseph

docs/source/explanations/security.md

@@ -111,7 +111,8 @@ This is a complete working example:
 allow_anonymous_access: true
 trees:
   - path: /
-    tree: tiled.examples.generated_minimal:tree
+    tree:
+      type: tiled.examples.generated_minimal:tree
 ```
 
 ```
@@ -181,7 +182,8 @@ authenticators:
     provider: local
 trees:
   - path: /
-    tree: tiled.examples.generated_minimal:tree
+    tree:
+      type: tiled.examples.generated_minimal:tree
 ```
 
 ```
@@ -278,7 +280,8 @@ authenticators:
       cara: ${CARA_PASSWORD}
 trees:
   - path: /
-    tree: tiled.examples.generated_minimal:tree
+    tree: 
+      type: tiled.examples.generated_minimal:tree
 ```
 
 ```
@@ -295,7 +298,8 @@ authenticators:
     type: tiled.authenticators:DummyAuthenticator
 trees:
   - path: /
-    tree: tiled.examples.generated_minimal:tree
+    tree: 
+      type: tiled.examples.generated_minimal:tree
 ```
 
 ```

docs/source/explanations/specialized-formats.md

@@ -85,13 +85,14 @@ Now take the following simple server configuration:
 # config.yml
 trees:
   - path: /
-    tree: tiled.catalog:from_uri
-    args:
-      uri: ./catalog.db
-        readable_storage:
-          - ./data/
-      adapters_by_mimetype:
-        application/x-xdi: tiled.examples.xdi:read_xdi
+    tree: 
+      type: tiled.catalog:from_uri
+      args:
+        uri: ./catalog.db
+          readable_storage:
+            - ./data/
+        adapters_by_mimetype:
+          application/x-xdi: tiled.examples.xdi:read_xdi
 ```
 
 and serve it:
@@ -206,7 +207,8 @@ Add new sections to the configuration as follows.
 ```yaml
 trees:
   - path: /
-    tree: tiled.catalog:from_uri
+    tree: 
+      type: tiled.catalog:from_uri
     args:
       uri: ./catalog.db
       readable_storage:

docs/source/how-to/custom-export-formats.md

@@ -74,7 +74,8 @@ media_types:
 # And provide some example data to try it with....
 trees:
   - path: /
-    tree: tiled.examples.generated_minimal:tree
+    tree: 
+      type: tiled.examples.generated_minimal:tree
 ```
 
 The term `application/x-smileys` is a "media type", also known as "MIME type".
@@ -174,7 +175,8 @@ media_types:
     image/jpeg: custom_exporters:to_jpeg
 trees:
   - path: /
-    tree: tiled.examples.generated_minimal:tree
+    tree: 
+      type: tiled.examples.generated_minimal:tree
 ```
 
 Start the server again

docs/source/how-to/profiles.md

@@ -171,9 +171,10 @@ my_profile:
   direct:
      trees:
        - path: /
-         tree: tiled.catalog:from_uri
-         args:
-           uri: "/path/to/catalog.db"
+         tree: 
+            type: tiled.catalog:from_uri
+            args:
+               uri: "/path/to/catalog.db"
 ```
 
 This takes the place of the `uri:` parameter. A profile must contain
@@ -187,7 +188,8 @@ my_profile:
   direct:
     trees:
       - path: /
-        tree: tiled.catalog:from_uri
+        tree: 
+      type: tiled.catalog:from_uri
         args:
           directory: "/path/to/catalog.db"
   cache:

docs/source/how-to/read-custom-formats.md

@@ -243,8 +243,9 @@ needed.
 ```yaml
 # config.yml
 trees:
-  - tree: catalog
-    path: /
+- path: /
+  tree: 
+    type: catalog
     args:
       uri: ./catalog.db
       readable_storage:

example_configs/google_auth.yml

@@ -11,6 +11,7 @@ authenticators:
     confirmation_message: "You have logged in with Google as {id}."
 trees:
  # Just some arbitrary example data...
- # The point of this example is the authenticaiton above.
- - tree: tiled.examples.generated_minimal:tree
+ # The point of this example is the authentication above.
+ - tree: 
+      type: tiled.examples.generated_minimal:tree
    path: /

example_configs/multiple_providers.yml

@@ -22,4 +22,5 @@ authenticators:
       cara: ${CARA_PASSWORD}
 trees:
   - path: /
-    tree: tiled.examples.toy_authentication:tree
+    tree: 
+      type: tiled.examples.toy_authentication:tree

example_configs/orcid_auth.yml

@@ -12,5 +12,6 @@ authenticators:
 trees:
  # Just some arbitrary example data...
  # The point of this example is the authenticaiton above.
- - tree: tiled.examples.generated_minimal:tree
+ - tree: 
+      type: tiled.examples.generated_minimal:tree
    path: /

example_configs/saml.yml

@@ -26,4 +26,5 @@ authenticators:
         x509cert: ""
 trees:
   - path: /
-    tree: tiled.examples.toy_authentication:tree
+    tree: 
+      type: tiled.examples.toy_authentication:tree

example_configs/single_catalog_single_user.yml

@@ -3,16 +3,17 @@
 allow_anonymous_access: false
 trees:
   - path: /
-    tree: catalog
-    args:
-      uri: "sqlite:////storage/catalog.db"
-      writable_storage: "/storage/data"
-      # This creates the database if it does not exist. This is convenient, but in
-      # a horizonally-scaled deployment, this can be a race condition and multiple
-      # containers may simultanouesly attempt to create the database.
-      # If that is a problem, set this to false, and run:
-      #
-      # tiled catalog init URI
-      #
-      # separately.
-      init_if_not_exists: true
+    tree: 
+      type: catalog
+      args:
+        uri: "sqlite:////storage/catalog.db"
+        writable_storage: "/storage/data"
+        # This creates the database if it does not exist. This is convenient, but in
+        # a horizonally-scaled deployment, this can be a race condition and multiple
+        # containers may simultanouesly attempt to create the database.
+        # If that is a problem, set this to false, and run:
+        #
+        # tiled catalog init URI
+        #
+        # separately.
+        init_if_not_exists: true