aboutsummaryrefslogtreecommitdiff
path: root/userapi
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-12-02 17:41:00 +0000
committerGitHub <noreply@github.com>2020-12-02 17:41:00 +0000
commitb5aa7ca3ab1c91397700637c91d60860a0535f1e (patch)
tree9da277c7b22027f09a7f45b0b0d771e44949e8f0 /userapi
parent3ef6187e96ca2d68b3014bbd150e69971b6f7800 (diff)
Top-level setup package (#1605)
* Move config, setup, mscs into "setup" top-level folder * oops, forgot the EDU server * Add setup * goimports
Diffstat (limited to 'userapi')
-rw-r--r--userapi/internal/api.go2
-rw-r--r--userapi/storage/accounts/postgres/storage.go2
-rw-r--r--userapi/storage/accounts/sqlite3/storage.go2
-rw-r--r--userapi/storage/accounts/storage.go2
-rw-r--r--userapi/storage/accounts/storage_wasm.go2
-rw-r--r--userapi/storage/devices/postgres/storage.go2
-rw-r--r--userapi/storage/devices/sqlite3/storage.go2
-rw-r--r--userapi/storage/devices/storage.go2
-rw-r--r--userapi/storage/devices/storage_wasm.go2
-rw-r--r--userapi/userapi.go2
-rw-r--r--userapi/userapi_test.go2
11 files changed, 11 insertions, 11 deletions
diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index 3b5f4978..c1b9bcab 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -23,9 +23,9 @@ import (
"github.com/matrix-org/dendrite/appservice/types"
"github.com/matrix-org/dendrite/clientapi/userutil"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
keyapi "github.com/matrix-org/dendrite/keyserver/api"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/storage/accounts"
"github.com/matrix-org/dendrite/userapi/storage/devices"
diff --git a/userapi/storage/accounts/postgres/storage.go b/userapi/storage/accounts/postgres/storage.go
index 40c4b8ff..870756d8 100644
--- a/userapi/storage/accounts/postgres/storage.go
+++ b/userapi/storage/accounts/postgres/storage.go
@@ -22,8 +22,8 @@ import (
"strconv"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/storage/accounts/postgres/deltas"
_ "github.com/matrix-org/dendrite/userapi/storage/accounts/postgres/deltas"
diff --git a/userapi/storage/accounts/sqlite3/storage.go b/userapi/storage/accounts/sqlite3/storage.go
index 0be7bcbe..2b621c4c 100644
--- a/userapi/storage/accounts/sqlite3/storage.go
+++ b/userapi/storage/accounts/sqlite3/storage.go
@@ -23,8 +23,8 @@ import (
"sync"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/storage/accounts/sqlite3/deltas"
"github.com/matrix-org/gomatrixserverlib"
diff --git a/userapi/storage/accounts/storage.go b/userapi/storage/accounts/storage.go
index 57d5f703..3f69e95f 100644
--- a/userapi/storage/accounts/storage.go
+++ b/userapi/storage/accounts/storage.go
@@ -19,7 +19,7 @@ package accounts
import (
"fmt"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/storage/accounts/postgres"
"github.com/matrix-org/dendrite/userapi/storage/accounts/sqlite3"
"github.com/matrix-org/gomatrixserverlib"
diff --git a/userapi/storage/accounts/storage_wasm.go b/userapi/storage/accounts/storage_wasm.go
index ade32b68..dcaf371a 100644
--- a/userapi/storage/accounts/storage_wasm.go
+++ b/userapi/storage/accounts/storage_wasm.go
@@ -17,7 +17,7 @@ package accounts
import (
"fmt"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/storage/accounts/sqlite3"
"github.com/matrix-org/gomatrixserverlib"
)
diff --git a/userapi/storage/devices/postgres/storage.go b/userapi/storage/devices/postgres/storage.go
index 6dd18b09..48523433 100644
--- a/userapi/storage/devices/postgres/storage.go
+++ b/userapi/storage/devices/postgres/storage.go
@@ -20,8 +20,8 @@ import (
"database/sql"
"encoding/base64"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/storage/devices/postgres/deltas"
"github.com/matrix-org/gomatrixserverlib"
diff --git a/userapi/storage/devices/sqlite3/storage.go b/userapi/storage/devices/sqlite3/storage.go
index 2eefb3f3..8afa9fb4 100644
--- a/userapi/storage/devices/sqlite3/storage.go
+++ b/userapi/storage/devices/sqlite3/storage.go
@@ -20,8 +20,8 @@ import (
"database/sql"
"encoding/base64"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/sqlutil"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/storage/devices/sqlite3/deltas"
"github.com/matrix-org/gomatrixserverlib"
diff --git a/userapi/storage/devices/storage.go b/userapi/storage/devices/storage.go
index 1bd73a9f..bfce924d 100644
--- a/userapi/storage/devices/storage.go
+++ b/userapi/storage/devices/storage.go
@@ -19,7 +19,7 @@ package devices
import (
"fmt"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/storage/devices/postgres"
"github.com/matrix-org/dendrite/userapi/storage/devices/sqlite3"
"github.com/matrix-org/gomatrixserverlib"
diff --git a/userapi/storage/devices/storage_wasm.go b/userapi/storage/devices/storage_wasm.go
index e966c37f..f360f985 100644
--- a/userapi/storage/devices/storage_wasm.go
+++ b/userapi/storage/devices/storage_wasm.go
@@ -17,7 +17,7 @@ package devices
import (
"fmt"
- "github.com/matrix-org/dendrite/internal/config"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/storage/devices/sqlite3"
"github.com/matrix-org/gomatrixserverlib"
)
diff --git a/userapi/userapi.go b/userapi/userapi.go
index 13249142..b8b826bc 100644
--- a/userapi/userapi.go
+++ b/userapi/userapi.go
@@ -16,8 +16,8 @@ package userapi
import (
"github.com/gorilla/mux"
- "github.com/matrix-org/dendrite/internal/config"
keyapi "github.com/matrix-org/dendrite/keyserver/api"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/internal"
"github.com/matrix-org/dendrite/userapi/inthttp"
diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go
index 3fc97d06..25c262ad 100644
--- a/userapi/userapi_test.go
+++ b/userapi/userapi_test.go
@@ -8,9 +8,9 @@ import (
"testing"
"github.com/gorilla/mux"
- "github.com/matrix-org/dendrite/internal/config"
"github.com/matrix-org/dendrite/internal/httputil"
"github.com/matrix-org/dendrite/internal/test"
+ "github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/userapi"
"github.com/matrix-org/dendrite/userapi/api"
"github.com/matrix-org/dendrite/userapi/inthttp"