diff --git a/README.md b/README.md index 3c51c77..79bcda4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Debug = false [HTTP] Address = :3000 -PublicDir = ${GITEAKAN_HTTP_PUBDIR} +PublicDir = ${GENGITKAN_HTTP_PUBDIR} [Gitea] BaseURL = https://forge.cadoles.com @@ -36,7 +36,7 @@ Scopes = api [Data] -DBPath = ${GITEAKAN_DATA_DBPATH} +DBPath = ${GENGITKAN_DATA_DBPATH} ``` Les valeurs pour `` et `` sont à récupérer sur la page https://forge.cadoles.com/user/settings/applications, dans la section `Gérer les applications OAuth2`. diff --git a/client/package-lock.json b/client/package-lock.json index c3d363f..a15d158 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -3438,7 +3438,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3459,12 +3460,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3479,17 +3482,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3606,7 +3612,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3618,6 +3625,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3632,6 +3640,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3639,12 +3648,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3663,6 +3674,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3743,7 +3755,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3755,6 +3768,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3840,7 +3854,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -3876,6 +3891,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -3895,6 +3911,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -3938,12 +3955,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, diff --git a/cmd/server/container.go b/cmd/server/container.go index 297cfce..2a6fb05 100644 --- a/cmd/server/container.go +++ b/cmd/server/container.go @@ -1,9 +1,9 @@ package main import ( - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/repository" - stormRepo "forge.cadoles.com/wpetit/gitea-kan/internal/repository/storm" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/repository" + stormRepo "forge.cadoles.com/wpetit/gengitkan/internal/repository/storm" "github.com/asdine/storm" "github.com/gorilla/sessions" "github.com/pkg/errors" diff --git a/cmd/server/main.go b/cmd/server/main.go index e1cf7a8..facc252 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -6,8 +6,8 @@ import ( "net/http" "os" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/route" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/route" "github.com/go-chi/chi" "github.com/go-chi/chi/middleware" "github.com/pkg/errors" diff --git a/go.mod b/go.mod index 2157aca..4ed833b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module forge.cadoles.com/wpetit/gitea-kan +module forge.cadoles.com/wpetit/gengitkan go 1.13 @@ -15,9 +15,10 @@ require ( github.com/smartystreets/assertions v1.0.1 // indirect github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect github.com/stretchr/testify v1.4.0 // indirect + github.com/zserge/lorca v0.1.8 // indirect gitlab.com/wpetit/goweb v0.0.0-20190728111123-bbcb57177273 go.etcd.io/bbolt v1.3.3 - golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 // indirect + golang.org/x/net v0.0.0-20200202094626-16171245cfb2 // indirect golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 golang.org/x/text v0.3.2 // indirect gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect diff --git a/go.sum b/go.sum index a2eebae..e25b38c 100644 --- a/go.sum +++ b/go.sum @@ -37,17 +37,22 @@ github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337/go.mod h1:s github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/zserge/lorca v0.1.8 h1:gZwyvesmaoGCwxF5NssI6pdydXkCVHOoHw2nks/PBRs= +github.com/zserge/lorca v0.1.8/go.mod h1:gTrVdXKyWxNhc8aUb1Uu3s0mY343arR1T6jUtxmBxR8= gitlab.com/wpetit/goweb v0.0.0-20190728111123-bbcb57177273 h1:YtMGT0pEGTQ5MAglg6rvu8pQVQJEtskoeEw+csUqf2o= gitlab.com/wpetit/goweb v0.0.0-20190728111123-bbcb57177273/go.mod h1:5Y/eVplFvdsd6zMdA3bx8KON6Ab1n90+cQeX5uJ6jIE= go.etcd.io/bbolt v1.3.3 h1:MUGmc65QhB3pIlaQ5bB4LwqSj6GIonVJXpZiaKNyaKk= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297 h1:k7pJ2yAPLPgbskkFdhRCsA77k2fySZ1zf2zCjvQCiIM= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/internal/config/config.go b/internal/config/config.go index 25dc7e8..418efd8 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -57,11 +57,11 @@ func NewDefault() *Config { Debug: false, HTTP: HTTPConfig{ Address: ":3000", - PublicDir: "${GITEAKAN_HTTP_PUBDIR}", + PublicDir: "${GENGITKAN_HTTP_PUBDIR}", }, Gitea: GiteaConfig{}, Data: DataConfig{ - DBPath: "${GITEAKAN_DATA_DBPATH}", + DBPath: "${GENGITKAN_DATA_DBPATH}", }, } } diff --git a/internal/middleware/auth.go b/internal/middleware/auth.go index 428483c..be13319 100644 --- a/internal/middleware/auth.go +++ b/internal/middleware/auth.go @@ -5,7 +5,7 @@ import ( "github.com/pborman/uuid" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/config" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service" diff --git a/internal/repository/storm/board.go b/internal/repository/storm/board.go index 8d04e9f..00d4274 100644 --- a/internal/repository/storm/board.go +++ b/internal/repository/storm/board.go @@ -1,7 +1,7 @@ package storm import ( - "forge.cadoles.com/wpetit/gitea-kan/internal/repository" + "forge.cadoles.com/wpetit/gengitkan/internal/repository" "github.com/asdine/storm" "github.com/pkg/errors" ) diff --git a/internal/route/board.go b/internal/route/board.go index 27aabfc..59d6ffe 100644 --- a/internal/route/board.go +++ b/internal/route/board.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi" - "forge.cadoles.com/wpetit/gitea-kan/internal/repository" + "forge.cadoles.com/wpetit/gengitkan/internal/repository" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" ) diff --git a/internal/route/logout.go b/internal/route/logout.go index b6039fc..089f511 100644 --- a/internal/route/logout.go +++ b/internal/route/logout.go @@ -3,7 +3,7 @@ package route import ( "net/http" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/config" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service/session" diff --git a/internal/route/oauth2.go b/internal/route/oauth2.go index 711f985..2f5c2d9 100644 --- a/internal/route/oauth2.go +++ b/internal/route/oauth2.go @@ -3,7 +3,7 @@ package route import ( "net/http" - "forge.cadoles.com/wpetit/gitea-kan/internal/middleware" + "forge.cadoles.com/wpetit/gengitkan/internal/middleware" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service/session" diff --git a/internal/route/proxy.go b/internal/route/proxy.go index b16fc78..dd9a5dc 100644 --- a/internal/route/proxy.go +++ b/internal/route/proxy.go @@ -6,8 +6,8 @@ import ( "net/http/httputil" "net/url" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/middleware" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/middleware" "github.com/pkg/errors" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/service/session" diff --git a/internal/route/route.go b/internal/route/route.go index 53af29f..95dfede 100644 --- a/internal/route/route.go +++ b/internal/route/route.go @@ -4,8 +4,8 @@ import ( "net/http" "path" - "forge.cadoles.com/wpetit/gitea-kan/internal/config" - "forge.cadoles.com/wpetit/gitea-kan/internal/middleware" + "forge.cadoles.com/wpetit/gengitkan/internal/config" + "forge.cadoles.com/wpetit/gengitkan/internal/middleware" "github.com/go-chi/chi" "gitlab.com/wpetit/goweb/middleware/container" "gitlab.com/wpetit/goweb/static" diff --git a/modd.conf b/modd.conf index 91033fd..1478589 100644 --- a/modd.conf +++ b/modd.conf @@ -5,8 +5,8 @@ modd.conf !mage_output_file.go { prep: make build prep: [ -e data/server.conf ] || ( mkdir -p data && bin/server -dump-config > data/server.conf ) - daemon: GITEAKAN_HTTP_PUBDIR=./client/dist \ - GITEAKAN_DATA_DBPATH=./data/data.db \ + daemon: GENGITKAN_HTTP_PUBDIR=./client/dist \ + GENGITKAN_DATA_DBPATH=./data/data.db \ bin/server \ -config ./data/server.conf }