From cf5d63ee88f97dfe4788c7ac3d234ce97f485132 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <me@cschwarz.com>
Date: Mon, 24 Sep 2018 12:40:02 +0200
Subject: [PATCH] config: fix broken tests + reduce example configs

---
 config/samples/local.yml      | 15 ---------------
 config/samples/pull.yml       | 15 ---------------
 config/samples/pull_ssh.yml   | 15 ---------------
 config/samples/push.yml       | 14 --------------
 config/samples/sink.yml       | 16 ----------------
 config/samples/source.yml     | 23 -----------------------
 config/samples/source_ssh.yml | 23 -----------------------
 7 files changed, 121 deletions(-)

diff --git a/config/samples/local.yml b/config/samples/local.yml
index 3c56373..56441a2 100644
--- a/config/samples/local.yml
+++ b/config/samples/local.yml
@@ -24,18 +24,3 @@ jobs:
     - type: grid
       grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d
       keep_bookmarks: all
-
-global:
-  logging:
-  - type: "stdout"
-    time: true
-    level: "warn"
-    format: "human"
-  monitoring:
-  - type: "prometheus"
-    listen: ":9091"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
diff --git a/config/samples/pull.yml b/config/samples/pull.yml
index 45406c6..4fd162b 100644
--- a/config/samples/pull.yml
+++ b/config/samples/pull.yml
@@ -22,18 +22,3 @@ jobs:
     - type: grid
       grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d
       keep_bookmarks: all
-
-global:
-  logging:
-  - type: "stdout"
-    time: true
-    level: "warn"
-    format: "human"
-  monitoring:
-  - type: "prometheus"
-    listen: ":9091"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
\ No newline at end of file
diff --git a/config/samples/pull_ssh.yml b/config/samples/pull_ssh.yml
index 9830b01..3e809a6 100644
--- a/config/samples/pull_ssh.yml
+++ b/config/samples/pull_ssh.yml
@@ -26,18 +26,3 @@ jobs:
     - type: grid
       grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d
       keep_bookmarks: all
-
-global:
-  logging:
-  - type: "stdout"
-    time: true
-    level: "warn"
-    format: "human"
-  monitoring:
-  - type: "prometheus"
-    listen: ":9091"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
\ No newline at end of file
diff --git a/config/samples/push.yml b/config/samples/push.yml
index 862a8f5..b017dad 100644
--- a/config/samples/push.yml
+++ b/config/samples/push.yml
@@ -24,17 +24,3 @@ jobs:
         - type: grid
           grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d
           keep_bookmarks: all
-global:
-  logging:
-    - type: "stdout"
-      time: true
-      level: "warn"
-      format: "human"
-  monitoring:
-    - type: "prometheus"
-      listen: ":9091"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
\ No newline at end of file
diff --git a/config/samples/sink.yml b/config/samples/sink.yml
index b927041..01990da 100644
--- a/config/samples/sink.yml
+++ b/config/samples/sink.yml
@@ -11,19 +11,3 @@ jobs:
       client_cns:
         - "laptop1"
         - "homeserver"
-global:
-  logging:
-    - type: "tcp"
-      address: "123.123.123.123:1234"
-      retry_interval: 10s
-      tls:
-        ca: "ca.pem"
-        cert: "cert.pem"
-        key: "key.pem"
-      level: "warn"
-      format: "human"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
\ No newline at end of file
diff --git a/config/samples/source.yml b/config/samples/source.yml
index 128cfa1..9162421 100644
--- a/config/samples/source.yml
+++ b/config/samples/source.yml
@@ -14,26 +14,3 @@ jobs:
   snapshotting:
     snapshot_prefix: zrepl_
     interval: 10m
-  pruning:
-    keep:
-    - type: not_replicated
-    - type: last_n
-      count: 10
-    - type: grid
-      grid: 1x1h(keep=all) | 24x1h | 14x1d
-      keep_bookmarks: all
-
-global:
-  logging:
-  - type: "stdout"
-    time: true
-    level: "warn"
-    format: "human"
-  monitoring:
-  - type: "prometheus"
-    listen: ":9091"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
\ No newline at end of file
diff --git a/config/samples/source_ssh.yml b/config/samples/source_ssh.yml
index b1c034d..b1e6e11 100644
--- a/config/samples/source_ssh.yml
+++ b/config/samples/source_ssh.yml
@@ -13,26 +13,3 @@ jobs:
   snapshotting:
     snapshot_prefix: zrepl_
     interval: 10m
-  pruning:
-    keep:
-    - type: not_replicated
-    - type: last_n
-      count: 10
-    - type: grid
-      grid: 1x1h(keep=all) | 24x1h | 14x1d
-      keep_bookmarks: all
-
-global:
-  logging:
-  - type: "stdout"
-    time: true
-    level: "warn"
-    format: "human"
-  monitoring:
-  - type: "prometheus"
-    listen: ":9091"
-  control:
-    sockpath: /var/run/zrepl/control
-  serve:
-    stdinserver:
-      sockdir: /var/run/zrepl/stdinserver
\ No newline at end of file