config: no-field for replication anymore

It's closer to the original config and we don't want users to specify
'filesystems' and similar multiple times in a single job definition.

config/samples/local.yml

@@ -4,15 +4,14 @@ jobs:
   type: local
   # snapshot the filesystems matched by the left-hand-side of the mapping
   # every 10m with zrepl_ as prefix
-  replication:
-    filesystems: {
-      "pool1/var/db<": true,
-      "pool1/usr/home<": true,
-      "pool1/usr/home/paranoid": false, #don't backup paranoid user
-      "pool1/poudriere/ports<": false #don't backup the ports trees
-    }
-    # TODO FIXME enforce that the tree under root_dataset and the trees allowed (true) by filesystems are non-overlapping
-    root_dataset: "pool2/backups/pool1"
+  filesystems: {
+    "pool1/var/db<": true,
+    "pool1/usr/home<": true,
+    "pool1/usr/home/paranoid": false, #don't backup paranoid user
+    "pool1/poudriere/ports<": false #don't backup the ports trees
+  }
+  # TODO FIXME enforce that the tree under root_dataset and the trees allowed (true) by filesystems are non-overlapping
+  root_dataset: "pool2/backups/pool1"
 
   snapshotting:
     snapshot_prefix: zrepl_

config/samples/pull.yml

@@ -1,16 +1,15 @@
 jobs:
 - name: pull_servers
   type: pull
-  replication:
-    connect:
-      type: tls
-      address: "server1.foo.bar:8888"
-      ca: "/certs/ca.crt"
-      cert: "/certs/cert.crt"
-      key: "/certs/key.pem"
-      server_cn: "server1"
-    root_dataset: "pool2/backup_servers"
-    interval: 10m
+  connect:
+    type: tls
+    address: "server1.foo.bar:8888"
+    ca: "/certs/ca.crt"
+    cert: "/certs/cert.crt"
+    key: "/certs/key.pem"
+    server_cn: "server1"
+  root_dataset: "pool2/backup_servers"
+  interval: 10m
   pruning:
     keep_sender:
     - type: not_replicated

config/samples/pull_ssh.yml

@@ -2,17 +2,16 @@ jobs:
 
 - name: pull_servers
   type: pull
-  replication:
-    connect:
-      type: ssh+stdinserver
-      host: app-srv.example.com
-      user: root
-      port: 22
-      identity_file: /etc/zrepl/ssh/identity
-      options: # optional, default [], `-o` arguments passed to ssh
-      - "Compression=on"
-    root_dataset: "pool2/backup_servers"
-    interval: 10m
+  connect:
+    type: ssh+stdinserver
+    host: app-srv.example.com
+    user: root
+    port: 22
+    identity_file: /etc/zrepl/ssh/identity
+    options: # optional, default [], `-o` arguments passed to ssh
+    - "Compression=on"
+  root_dataset: "pool2/backup_servers"
+  interval: 10m
   pruning:
     keep_sender:
     - type: not_replicated

config/samples/push.yml

@@ -1,14 +1,13 @@
 jobs:
   - type: push
     name: "push"
-    replication:
-      connect:
-        type: tcp
-        address: "backup-server.foo.bar:8888"
-      filesystems: {
-        "<": true,
-        "tmp": false
-      }
+    filesystems: {
+      "<": true,
+      "tmp": false
+    }
+    connect:
+      type: tcp
+      address: "backup-server.foo.bar:8888"
     snapshotting:
       snapshot_prefix: zrepl_
       interval: 10m

config/samples/sink.yml

@@ -1,15 +1,14 @@
 jobs:
   - type: sink
     name: "laptop_sink"
-    replication:
-      root_dataset: "pool2/backup_laptops"
-      serve:
-        type: tls
-        listen: "192.168.122.189:8888"
-        ca: "ca.pem"
-        cert: "cert.pem"
-        key: "key.pem"
-        client_cn: "laptop1"
+    root_dataset: "pool2/backup_laptops"
+    serve:
+      type: tls
+      listen: "192.168.122.189:8888"
+      ca: "ca.pem"
+      cert: "cert.pem"
+      key: "key.pem"
+      client_cn: "laptop1"
 global:
   logging:
     - type: "tcp"

config/samples/source.yml

@@ -1,17 +1,16 @@
 jobs:
 - name: pull_source
   type: source
-  replication:
-    serve:
-      type: tcp
-      listen: "0.0.0.0:8888"
-      clients: {
-        "192.168.122.123" : "client1"
-      }
-    filesystems: {
-      "<": true,
-      "secret": false
+  serve:
+    type: tcp
+    listen: "0.0.0.0:8888"
+    clients: {
+      "192.168.122.123" : "client1"
     }
+  filesystems: {
+    "<": true,
+    "secret": false
+  }
   snapshotting:
     snapshot_prefix: zrepl_
     interval: 10m

config/samples/source_ssh.yml

@@ -1,14 +1,13 @@
 jobs:
 - name: pull_source
   type: source
-  replication:
-    serve:
-      type: stdinserver
-      client_identity: "client1"
-    filesystems: {
-      "<": true,
-      "secret": false
-    }
+  serve:
+    type: stdinserver
+    client_identity: "client1"
+  filesystems: {
+    "<": true,
+    "secret": false
+  }
   snapshotting:
     snapshot_prefix: zrepl_
     interval: 10m