From a6ff279e222e154b156d86e3f24e28d032628e6b Mon Sep 17 00:00:00 2001
From: fspreck <f.spreckelsen@indiscale.com>
Date: Fri, 8 Oct 2021 12:16:53 +0200
Subject: [PATCH] ENH: Make '/' at the end of URLs in cofig optional
---
src/caosdb/schema-pycaosdb-ini.yml | 2 +-
unittests/broken_configs/pycaosdb-indiscale-demo.ini | 12 ------------
2 files changed, 1 insertion(+), 13 deletions(-)
delete mode 100644 unittests/broken_configs/pycaosdb-indiscale-demo.ini
diff --git a/src/caosdb/schema-pycaosdb-ini.yml b/src/caosdb/schema-pycaosdb-ini.yml
index 977fcdfa..fd49c2ff 100644
--- a/src/caosdb/schema-pycaosdb-ini.yml
+++ b/src/caosdb/schema-pycaosdb-ini.yml
@@ -16,7 +16,7 @@ schema-pycaosdb-ini:
url:
description: URL of the CaosDB server
type: string
- pattern: https://[-a-zA-Z0-9\.]+(:[0-9]+)?/
+ pattern: https://[-a-zA-Z0-9\.]+(:[0-9]+)?(/)?
examples: [https://demo.indiscale.com/, https://localhost:10443/]
username:
type: string
diff --git a/unittests/broken_configs/pycaosdb-indiscale-demo.ini b/unittests/broken_configs/pycaosdb-indiscale-demo.ini
deleted file mode 100644
index d8994eae..00000000
--- a/unittests/broken_configs/pycaosdb-indiscale-demo.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[Connection]
-url=https://demo.indiscale.com
-username=admin
-password=caosdb
-password_method=plain
-cacert=/etc/ssl/cert.pem
-
-timeout=10000
-debug=0
-
-[Container]
-debug=0
\ No newline at end of file
--
GitLab