Skip to content

Commit e7c2151

Browse files
DasSkelettDasSkelett
authored
Merge pull request Place1#120 from halkeye/move-packages
2 parents 818a7d5 + 93cc773 commit e7c2151

File tree

24 files changed

+90
-111
lines changed

24 files changed

+90
-111
lines changed

‎cmd/migrate/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package migrate
22

33
import (
44
"github.com/pkg/errors"
5-
"github.com/place1/wg-access-server/internal/storage"
5+
"github.com/freifunkMUC/wg-access-server/internal/storage"
66
"github.com/sirupsen/logrus"
77
"gopkg.in/alecthomas/kingpin.v2"
88
)

‎cmd/serve/main.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import (
1212
"syscall"
1313
"time"
1414

15-
"github.com/place1/wg-access-server/internal/config"
16-
"github.com/place1/wg-access-server/internal/devices"
17-
"github.com/place1/wg-access-server/internal/dnsproxy"
18-
"github.com/place1/wg-access-server/internal/network"
19-
"github.com/place1/wg-access-server/internal/services"
20-
"github.com/place1/wg-access-server/internal/storage"
21-
"github.com/place1/wg-access-server/pkg/authnz"
22-
"github.com/place1/wg-access-server/pkg/authnz/authconfig"
23-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
15+
"github.com/freifunkMUC/wg-access-server/internal/config"
16+
"github.com/freifunkMUC/wg-access-server/internal/devices"
17+
"github.com/freifunkMUC/wg-access-server/internal/dnsproxy"
18+
"github.com/freifunkMUC/wg-access-server/internal/network"
19+
"github.com/freifunkMUC/wg-access-server/internal/services"
20+
"github.com/freifunkMUC/wg-access-server/internal/storage"
21+
"github.com/freifunkMUC/wg-access-server/pkg/authnz"
22+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authconfig"
23+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
2424

2525
"github.com/docker/libnetwork/resolvconf"
2626
"github.com/docker/libnetwork/types"

‎deploy/helm/wg-access-server/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,5 @@ ingress:
8686
| nodeSelector | object | `{}` | |
8787
| tolerations | list | `[]` | |
8888
| image.pullPolicy | string | `"IfNotPresent"` | |
89-
| image.repository | string | `"place1/wg-access-server"` | |
89+
| image.repository | string | `"freifunkMUC/wg-access-server"` | |
9090
| imagePullSecrets | list | `[]` | |

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/place1/wg-access-server
1+
module github.com/freifunkMUC/wg-access-server
22

33
go 1.17
44

‎internal/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package config
22

33
import (
4-
"github.com/place1/wg-access-server/pkg/authnz/authconfig"
4+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authconfig"
55
)
66

77
type AppConfig struct {

‎internal/devices/devices.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"sync"
77
"time"
88

9-
"github.com/place1/wg-access-server/internal/network"
10-
"github.com/place1/wg-access-server/internal/storage"
11-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
9+
"github.com/freifunkMUC/wg-access-server/internal/network"
10+
"github.com/freifunkMUC/wg-access-server/internal/storage"
11+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
1212

1313
"github.com/pkg/errors"
1414
"github.com/place1/wg-embed/pkg/wgembed"

‎internal/services/api_router.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010

1111
grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
1212
"github.com/improbable-eng/grpc-web/go/grpcweb"
13-
"github.com/place1/wg-access-server/internal/config"
14-
"github.com/place1/wg-access-server/internal/devices"
15-
"github.com/place1/wg-access-server/internal/traces"
16-
"github.com/place1/wg-access-server/proto/proto"
13+
"github.com/freifunkMUC/wg-access-server/internal/config"
14+
"github.com/freifunkMUC/wg-access-server/internal/devices"
15+
"github.com/freifunkMUC/wg-access-server/internal/traces"
16+
"github.com/freifunkMUC/wg-access-server/proto/proto"
1717
"google.golang.org/grpc"
1818
)
1919

‎internal/services/device_service.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ package services
33
import (
44
"context"
55

6-
"github.com/place1/wg-access-server/internal/devices"
7-
"github.com/place1/wg-access-server/internal/storage"
8-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
9-
"github.com/place1/wg-access-server/proto/proto"
6+
"github.com/freifunkMUC/wg-access-server/internal/devices"
7+
"github.com/freifunkMUC/wg-access-server/internal/storage"
8+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
9+
"github.com/freifunkMUC/wg-access-server/proto/proto"
1010

1111
"github.com/golang/protobuf/ptypes/empty"
1212
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"

‎internal/services/middleware.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"runtime/debug"
77

88
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
9-
"github.com/place1/wg-access-server/internal/traces"
9+
"github.com/freifunkMUC/wg-access-server/internal/traces"
1010
)
1111

1212
func TracesMiddleware(next http.Handler) http.Handler {

‎internal/services/server_service.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"strings"
66

77
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
8-
"github.com/place1/wg-access-server/internal/network"
8+
"github.com/freifunkMUC/wg-access-server/internal/network"
99

10-
"github.com/place1/wg-access-server/internal/config"
11-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
12-
"github.com/place1/wg-access-server/proto/proto"
10+
"github.com/freifunkMUC/wg-access-server/internal/config"
11+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
12+
"github.com/freifunkMUC/wg-access-server/proto/proto"
1313
"github.com/place1/wg-embed/pkg/wgembed"
1414
"google.golang.org/grpc/codes"
1515
"google.golang.org/grpc/status"

‎main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"runtime"
88

99
"github.com/pkg/errors"
10-
"github.com/place1/wg-access-server/cmd"
11-
"github.com/place1/wg-access-server/cmd/migrate"
12-
"github.com/place1/wg-access-server/cmd/serve"
10+
"github.com/freifunkMUC/wg-access-server/cmd"
11+
"github.com/freifunkMUC/wg-access-server/cmd/migrate"
12+
"github.com/freifunkMUC/wg-access-server/cmd/serve"
1313
"github.com/sirupsen/logrus"
1414
"gopkg.in/alecthomas/kingpin.v2"
1515
)

‎pkg/authnz/authconfig/authconfig.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package authconfig
22

33
import (
4-
"github.com/place1/wg-access-server/pkg/authnz/authruntime"
4+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authruntime"
55
)
66

77
type AuthConfig struct {

‎pkg/authnz/authconfig/basic.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"net/http"
66
"strings"
77

8-
"github.com/place1/wg-access-server/pkg/authnz/authruntime"
9-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
8+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authruntime"
9+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
1010
"github.com/tg123/go-htpasswd"
1111
)
1212

‎pkg/authnz/authconfig/gitlab.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package authconfig
22

3-
import "github.com/place1/wg-access-server/pkg/authnz/authruntime"
3+
import "github.com/freifunkMUC/wg-access-server/pkg/authnz/authruntime"
44

55
type GitlabConfig struct {
66
Name string `yaml:"name"`

‎pkg/authnz/authconfig/oidc.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"github.com/coreos/go-oidc"
1212
"github.com/gorilla/mux"
1313
"github.com/pkg/errors"
14-
"github.com/place1/wg-access-server/pkg/authnz/authruntime"
15-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
16-
"github.com/place1/wg-access-server/pkg/authnz/authutil"
14+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authruntime"
15+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
16+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authutil"
1717
"github.com/sirupsen/logrus"
1818
"golang.org/x/oauth2"
1919
"gopkg.in/Knetic/govaluate.v2"

‎pkg/authnz/authruntime/runtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55

66
"github.com/gorilla/mux"
77
"github.com/gorilla/sessions"
8-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
8+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
99
)
1010

1111
type Provider struct {

‎pkg/authnz/authtemplates/login.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"html/template"
55
"io"
66

7-
"github.com/place1/wg-access-server/pkg/authnz/authruntime"
7+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authruntime"
88
)
99

1010
type LoginPage struct {

‎pkg/authnz/router.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus/ctxlogrus"
99
"github.com/pkg/errors"
1010

11-
"github.com/place1/wg-access-server/pkg/authnz/authconfig"
12-
"github.com/place1/wg-access-server/pkg/authnz/authruntime"
13-
"github.com/place1/wg-access-server/pkg/authnz/authsession"
14-
"github.com/place1/wg-access-server/pkg/authnz/authtemplates"
15-
"github.com/place1/wg-access-server/pkg/authnz/authutil"
11+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authconfig"
12+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authruntime"
13+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authsession"
14+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authtemplates"
15+
"github.com/freifunkMUC/wg-access-server/pkg/authnz/authutil"
1616

1717
"github.com/gorilla/mux"
1818
"github.com/gorilla/sessions"

‎proto/devices.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package proto;
44

5-
option go_package = "github.com/place1/wg-access-server/proto/proto";
5+
option go_package = "github.com/freifunkMUC/wg-access-server/proto/proto";
66

77
import "google/protobuf/wrappers.proto";
88
import "google/protobuf/timestamp.proto";

‎proto/proto/devices.pb.go

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎proto/proto/server.pb.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎proto/server.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package proto;
44

5-
option go_package = "github.com/place1/wg-access-server/proto/proto";
5+
option go_package = "github.com/freifunkMUC/wg-access-server/proto/proto";
66

77
import "google/protobuf/wrappers.proto";
88

0 commit comments

Comments
 (0)