From c4dfbedc2c71ec1de9731c2be9d2dc37b5182308 Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 20 Aug 2020 09:56:09 +0200
Subject: [PATCH 1/2] Add settings API endpoint and settings app endpoint to
 example

---
 config/proxy-example-migration.json | 10 +++++++++-
 config/proxy-example.json           |  8 ++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/config/proxy-example-migration.json b/config/proxy-example-migration.json
index 04760b7..d2ee433 100644
--- a/config/proxy-example-migration.json
+++ b/config/proxy-example-migration.json
@@ -68,7 +68,15 @@
 				{
           "endpoint": "/accounts.js",
 					"backend":  "http://localhost:9181"
-				}
+				},
+        {
+          "endpoint": "/api/v0/settings",
+          "backend":  "http://localhost:9190"
+        },
+        {
+          "endpoint": "/settings.js",
+          "backend":  "http://localhost:9190"
+        }
       ]
     },
     {
diff --git a/config/proxy-example.json b/config/proxy-example.json
index 28fd674..68c2fe3 100644
--- a/config/proxy-example.json
+++ b/config/proxy-example.json
@@ -71,6 +71,14 @@
         {
           "endpoint": "/accounts.js",
           "backend": "http://localhost:9181"
+        },
+        {
+          "endpoint": "/api/v0/settings",
+          "backend":  "http://localhost:9190"
+        },
+        {
+          "endpoint": "/settings.js",
+          "backend":  "http://localhost:9190"
         }
       ]
     },

From ee155116328912e8290143a1b4b4a3245278b66a Mon Sep 17 00:00:00 2001
From: Benedikt Kulmann <benedikt@kulmann.biz>
Date: Thu, 20 Aug 2020 10:01:08 +0200
Subject: [PATCH 2/2] Add changelog item

---
 changelog/unreleased/settings-in-example-config.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 changelog/unreleased/settings-in-example-config.md

diff --git a/changelog/unreleased/settings-in-example-config.md b/changelog/unreleased/settings-in-example-config.md
new file mode 100644
index 0000000..1828e18
--- /dev/null
+++ b/changelog/unreleased/settings-in-example-config.md
@@ -0,0 +1,6 @@
+Bugfix: Add settings API and app endpoints to example config
+
+We had the ocis-settings API and app endpoints in the builtin config already, but they were missing in the example
+config. Added them for consistency.
+
+https://github.com/owncloud/ocis-proxy/pull/93