wip

demo.sh

@@ -15,7 +15,7 @@ fi
 
 CONFIG_FILE="$1"
 
-docker build -t place1/wireguard-access-server .
+docker build -t place1/wg-access-server .
 
 docker run \
   -it \
@@ -29,4 +29,4 @@ docker run \
   -p 8000:8000/tcp \
   -p 51820:51820/udp \
   -p 53:53/udp \
-  place1/wireguard-access-server /server --config /config.yaml
+  place1/wg-access-server /server --config /config.yaml

go.mod

@@ -1,4 +1,4 @@
-module github.com/place1/wireguard-access-server
+module github.com/place1/wg-access-server
 
 go 1.13
 

internal/auth/authconfig/authconfig.go

@@ -1,7 +1,7 @@
 package authconfig
 
 import (
-	"github.com/place1/wireguard-access-server/internal/auth/authruntime"
+	"github.com/place1/wg-access-server/internal/auth/authruntime"
 )
 
 type AuthConfig struct {

internal/auth/authconfig/basic.go

@@ -5,8 +5,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/place1/wireguard-access-server/internal/auth/authruntime"
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/auth/authruntime"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
 	"github.com/tg123/go-htpasswd"
 )
 

internal/auth/authconfig/gitlab.go

@@ -1,6 +1,6 @@
 package authconfig
 
-import "github.com/place1/wireguard-access-server/internal/auth/authruntime"
+import "github.com/place1/wg-access-server/internal/auth/authruntime"
 
 type GitlabConfig struct {
 	Name         string `yaml:"name"`

internal/auth/authconfig/oidc.go

@@ -9,9 +9,9 @@ import (
 	"github.com/coreos/go-oidc"
 	"github.com/gorilla/mux"
 	"github.com/pkg/errors"
-	"github.com/place1/wireguard-access-server/internal/auth/authruntime"
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
-	"github.com/place1/wireguard-access-server/internal/auth/authutil"
+	"github.com/place1/wg-access-server/internal/auth/authruntime"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/auth/authutil"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/oauth2"
 )

internal/auth/authruntime/runtime.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
 )
 
 type Provider struct {

internal/auth/authtemplates/login.go

@@ -4,7 +4,7 @@ import (
 	"html/template"
 	"io"
 
-	"github.com/place1/wireguard-access-server/internal/auth/authruntime"
+	"github.com/place1/wg-access-server/internal/auth/authruntime"
 )
 
 type LoginPage struct {

internal/auth/router.go

@@ -5,11 +5,11 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/place1/wireguard-access-server/internal/auth/authconfig"
-	"github.com/place1/wireguard-access-server/internal/auth/authruntime"
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
-	"github.com/place1/wireguard-access-server/internal/auth/authtemplates"
-	"github.com/place1/wireguard-access-server/internal/auth/authutil"
+	"github.com/place1/wg-access-server/internal/auth/authconfig"
+	"github.com/place1/wg-access-server/internal/auth/authruntime"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/auth/authtemplates"
+	"github.com/place1/wg-access-server/internal/auth/authutil"
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/sessions"

internal/config/config.go

@@ -10,7 +10,7 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/place1/wireguard-access-server/internal/auth/authconfig"
+	"github.com/place1/wg-access-server/internal/auth/authconfig"
 	"github.com/vishvananda/netlink"
 
 	"github.com/pkg/errors"

internal/devices/devices.go

@@ -11,7 +11,7 @@ import (
 	"github.com/place1/wg-embed/pkg/wgembed"
 
 	"github.com/pkg/errors"
-	"github.com/place1/wireguard-access-server/internal/storage"
+	"github.com/place1/wg-access-server/internal/storage"
 	"github.com/sirupsen/logrus"
 )
 

internal/services/device_service.go

@@ -3,12 +3,12 @@ package services
 import (
 	"context"
 
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/place1/wireguard-access-server/internal/devices"
-	"github.com/place1/wireguard-access-server/internal/storage"
-	"github.com/place1/wireguard-access-server/proto/proto"
+	"github.com/place1/wg-access-server/internal/devices"
+	"github.com/place1/wg-access-server/internal/storage"
+	"github.com/place1/wg-access-server/proto/proto"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

internal/services/server_service.go

@@ -4,9 +4,9 @@ import (
 	"context"
 
 	"github.com/place1/wg-embed/pkg/wgembed"
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
-	"github.com/place1/wireguard-access-server/internal/config"
-	"github.com/place1/wireguard-access-server/proto/proto"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/config"
+	"github.com/place1/wg-access-server/proto/proto"
 	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

main.go

@@ -8,19 +8,19 @@ import (
 	"runtime/debug"
 
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
-	"github.com/place1/wireguard-access-server/proto/proto"
+	"github.com/place1/wg-access-server/proto/proto"
 
 	"github.com/gorilla/mux"
 	"github.com/place1/wg-embed/pkg/wgembed"
 
 	"github.com/pkg/errors"
-	"github.com/place1/wireguard-access-server/internal/auth"
-	"github.com/place1/wireguard-access-server/internal/auth/authsession"
-	"github.com/place1/wireguard-access-server/internal/config"
-	"github.com/place1/wireguard-access-server/internal/devices"
-	"github.com/place1/wireguard-access-server/internal/dnsproxy"
-	"github.com/place1/wireguard-access-server/internal/services"
-	"github.com/place1/wireguard-access-server/internal/storage"
+	"github.com/place1/wg-access-server/internal/auth"
+	"github.com/place1/wg-access-server/internal/auth/authsession"
+	"github.com/place1/wg-access-server/internal/config"
+	"github.com/place1/wg-access-server/internal/devices"
+	"github.com/place1/wg-access-server/internal/dnsproxy"
+	"github.com/place1/wg-access-server/internal/services"
+	"github.com/place1/wg-access-server/internal/storage"
 	"github.com/sirupsen/logrus"
 
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"