diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index f8d96a4..8dfddec 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -github: [ngoduykhanh] +github: [wireguard-ui] diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 0875223..fdf8c01 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -26,7 +26,7 @@ jobs: - name: Prepare image tags id: image-tags run: | - base=ngoduykhanh/wireguard-ui + base=wireguard-ui/wireguard-ui app_version=dev ## Set git tag as image tag diff --git a/README.md b/README.md index 0da4652..ce8c965 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![](https://github.com/ngoduykhanh/wireguard-ui/workflows/wireguard-ui%20build%20release/badge.svg) +![](https://github.com/wireguard-ui/wireguard-ui/workflows/wireguard-ui%20build%20release/badge.svg) # wireguard-ui @@ -53,7 +53,7 @@ docker-compose up | `WGUI_TABLE` | The default WireGuard table value settings | `auto` | | `WGUI_CONFIG_FILE_PATH` | The default WireGuard config file path used in global settings | `/etc/wireguard/wg0.conf` | | `WGUI_LOG_LEVEL` | The default log level. Possible values: `DEBUG`, `INFO`, `WARN`, `ERROR`, `OFF` | `INFO` | -| `WG_CONF_TEMPLATE` | The custom `wg.conf` config file template. Please refer to our [default template](https://github.com/ngoduykhanh/wireguard-ui/blob/master/templates/wg.conf) | N/A | +| `WG_CONF_TEMPLATE` | The custom `wg.conf` config file template. Please refer to our [default template](https://github.com/wireguard-ui/wireguard-ui/blob/master/templates/wg.conf) | N/A | | `EMAIL_FROM_ADDRESS` | The sender email address | N/A | | `EMAIL_FROM_NAME` | The sender name | `WireGuard UI` | | `SENDGRID_API_KEY` | The SendGrid api key | N/A | @@ -204,9 +204,9 @@ or docker compose build --build-arg=GIT_COMMIT=$(git rev-parse --short HEAD) ``` -:information_source: A container image is avaialble on [Docker Hub](https://hub.docker.com/r/ngoduykhanh/wireguard-ui) which you can pull and use +:information_source: A container image is avaialble on [Docker Hub](https://hub.docker.com/r/wireguard-ui/wireguard-ui) which you can pull and use ``` -docker pull ngoduykhanh/wireguard-ui +docker pull wireguard-ui/wireguard-ui ```` ### Build binary file @@ -224,10 +224,4 @@ go build -o wireguard-ui ## License -MIT. See [LICENSE](https://github.com/ngoduykhanh/wireguard-ui/blob/master/LICENSE). - -## Support - -If you like the project and want to support it, you can *buy me a coffee* ☕ - -Buy Me A Coffee +MIT. See [LICENSE](https://github.com/wireguard-ui/wireguard-ui/blob/master/LICENSE). diff --git a/docker-compose.yaml b/docker-compose.yaml index a7d49c0..d1cbab0 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ version: "3" services: wg: build: . - #image: ngoduykhanh/wireguard-ui:latest + #image: wireguard-ui/wireguard-ui:latest container_name: wgui cap_add: - NET_ADMIN diff --git a/examples/docker-compose/boringtun.yml b/examples/docker-compose/boringtun.yml index a1bdd2f..8c1b593 100644 --- a/examples/docker-compose/boringtun.yml +++ b/examples/docker-compose/boringtun.yml @@ -15,7 +15,7 @@ services: - ./config:/etc/wireguard wireguard-ui: - image: ngoduykhanh/wireguard-ui:latest + image: wireguard-ui/wireguard-ui:latest container_name: wireguard-ui cap_add: - NET_ADMIN diff --git a/examples/docker-compose/linuxserver.yml b/examples/docker-compose/linuxserver.yml index 1b7a66f..ed591ce 100644 --- a/examples/docker-compose/linuxserver.yml +++ b/examples/docker-compose/linuxserver.yml @@ -15,7 +15,7 @@ services: - "51820:51820/udp" wireguard-ui: - image: ngoduykhanh/wireguard-ui:latest + image: wireguard-ui/wireguard-ui:latest container_name: wireguard-ui depends_on: - wireguard diff --git a/examples/docker-compose/system.yml b/examples/docker-compose/system.yml index c27f31e..641ede5 100644 --- a/examples/docker-compose/system.yml +++ b/examples/docker-compose/system.yml @@ -2,7 +2,7 @@ version: "3" services: wireguard-ui: - image: ngoduykhanh/wireguard-ui:latest + image: wireguard-ui/wireguard-ui:latest container_name: wireguard-ui cap_add: - NET_ADMIN diff --git a/go.mod b/go.mod index 5842acb..f9ef1eb 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ngoduykhanh/wireguard-ui +module github.com/wireguard-ui/wireguard-ui go 1.16 diff --git a/handler/routes.go b/handler/routes.go index a2ceeaf..6e1c34e 100644 --- a/handler/routes.go +++ b/handler/routes.go @@ -20,10 +20,10 @@ import ( "golang.zx2c4.com/wireguard/wgctrl" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" - "github.com/ngoduykhanh/wireguard-ui/emailer" - "github.com/ngoduykhanh/wireguard-ui/model" - "github.com/ngoduykhanh/wireguard-ui/store" - "github.com/ngoduykhanh/wireguard-ui/util" + "github.com/wireguard-ui/wireguard-ui/emailer" + "github.com/wireguard-ui/wireguard-ui/model" + "github.com/wireguard-ui/wireguard-ui/store" + "github.com/wireguard-ui/wireguard-ui/util" ) // Health check handler diff --git a/handler/routes_wake_on_lan.go b/handler/routes_wake_on_lan.go index 43a6186..f9c81ce 100644 --- a/handler/routes_wake_on_lan.go +++ b/handler/routes_wake_on_lan.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/labstack/echo/v4" "github.com/labstack/gommon/log" - "github.com/ngoduykhanh/wireguard-ui/model" - "github.com/ngoduykhanh/wireguard-ui/store" + "github.com/wireguard-ui/wireguard-ui/model" + "github.com/wireguard-ui/wireguard-ui/store" "github.com/sabhiram/go-wol/wol" "net" "net/http" diff --git a/handler/session.go b/handler/session.go index 4cede6e..e2f6186 100644 --- a/handler/session.go +++ b/handler/session.go @@ -6,7 +6,7 @@ import ( "github.com/labstack/echo-contrib/session" "github.com/labstack/echo/v4" - "github.com/ngoduykhanh/wireguard-ui/util" + "github.com/wireguard-ui/wireguard-ui/util" ) func ValidSession(next echo.HandlerFunc) echo.HandlerFunc { diff --git a/main.go b/main.go index 0131208..8200078 100644 --- a/main.go +++ b/main.go @@ -6,17 +6,17 @@ import ( "fmt" "github.com/labstack/echo/v4" "github.com/labstack/gommon/log" - "github.com/ngoduykhanh/wireguard-ui/store" + "github.com/wireguard-ui/wireguard-ui/store" "io/fs" "net/http" "os" "time" - "github.com/ngoduykhanh/wireguard-ui/emailer" - "github.com/ngoduykhanh/wireguard-ui/handler" - "github.com/ngoduykhanh/wireguard-ui/router" - "github.com/ngoduykhanh/wireguard-ui/store/jsondb" - "github.com/ngoduykhanh/wireguard-ui/util" + "github.com/wireguard-ui/wireguard-ui/emailer" + "github.com/wireguard-ui/wireguard-ui/handler" + "github.com/wireguard-ui/wireguard-ui/router" + "github.com/wireguard-ui/wireguard-ui/store/jsondb" + "github.com/wireguard-ui/wireguard-ui/util" ) var ( @@ -107,7 +107,7 @@ func init() { fmt.Println("Git Commit\t:", gitCommit) fmt.Println("Git Ref\t\t:", gitRef) fmt.Println("Build Time\t:", buildTime) - fmt.Println("Git Repo\t:", "https://github.com/ngoduykhanh/wireguard-ui") + fmt.Println("Git Repo\t:", "https://github.com/wireguard-ui/wireguard-ui") fmt.Println("Authentication\t:", !util.DisableLogin) fmt.Println("Bind address\t:", util.BindAddress) //fmt.Println("Sendgrid key\t:", util.SendgridApiKey) diff --git a/package.json b/package.json index a0cda64..c4b82dd 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "Wireguard web interface", "main": "index.js", - "repository": "git@github.com:ngoduykhanh/wireguard-ui.git", + "repository": "git@github.com:wireguard-ui/wireguard-ui.git", "author": "Khanh Ngo ", "license": "MIT", "dependencies": { diff --git a/router/router.go b/router/router.go index 569ebaf..f7789c6 100644 --- a/router/router.go +++ b/router/router.go @@ -13,7 +13,7 @@ import ( "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" "github.com/labstack/gommon/log" - "github.com/ngoduykhanh/wireguard-ui/util" + "github.com/wireguard-ui/wireguard-ui/util" ) // TemplateRegistry is a custom html/template renderer for Echo framework diff --git a/store/jsondb/jsondb.go b/store/jsondb/jsondb.go index 0b674b0..be3496c 100644 --- a/store/jsondb/jsondb.go +++ b/store/jsondb/jsondb.go @@ -12,8 +12,8 @@ import ( "github.com/skip2/go-qrcode" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" - "github.com/ngoduykhanh/wireguard-ui/model" - "github.com/ngoduykhanh/wireguard-ui/util" + "github.com/wireguard-ui/wireguard-ui/model" + "github.com/wireguard-ui/wireguard-ui/util" ) type JsonDB struct { diff --git a/store/jsondb/jsondb_wake_on_lan.go b/store/jsondb/jsondb_wake_on_lan.go index a0ee935..fd87a18 100644 --- a/store/jsondb/jsondb_wake_on_lan.go +++ b/store/jsondb/jsondb_wake_on_lan.go @@ -6,7 +6,7 @@ import ( "os" "path" - "github.com/ngoduykhanh/wireguard-ui/model" + "github.com/wireguard-ui/wireguard-ui/model" ) func (o *JsonDB) GetWakeOnLanHosts() ([]model.WakeOnLanHost, error) { diff --git a/store/store.go b/store/store.go index ef6d723..5e2a888 100644 --- a/store/store.go +++ b/store/store.go @@ -1,7 +1,7 @@ package store import ( - "github.com/ngoduykhanh/wireguard-ui/model" + "github.com/wireguard-ui/wireguard-ui/model" ) type IStore interface { diff --git a/templates/about.html b/templates/about.html index edbeb47..1cf5e67 100644 --- a/templates/about.html +++ b/templates/about.html @@ -63,7 +63,7 @@ About Copyright © - Wireguard UI. + Wireguard UI. All rights reserved. @@ -83,7 +83,7 @@ About $.ajax({ cache: false, method: 'GET', - url: 'https://api.github.com/repos/ngoduykhanh/wireguard-ui/releases/tags/' + $("#version").val(), + url: 'https://api.github.com/repos/wireguard-ui/wireguard-ui/releases/tags/' + $("#version").val(), dataType: 'json', contentType: "application/json", success: function (data) { @@ -99,7 +99,7 @@ About $.ajax({ cache: false, method: 'GET', - url: 'https://api.github.com/repos/ngoduykhanh/wireguard-ui/releases/latest', + url: 'https://api.github.com/repos/wireguard-ui/wireguard-ui/releases/latest', dataType: 'json', contentType: "application/json", success: function (data) { @@ -121,7 +121,7 @@ About $.ajax({ cache: false, method: 'GET', - url: 'https://api.github.com/repos/ngoduykhanh/wireguard-ui/contributors', + url: 'https://api.github.com/repos/wireguard-ui/wireguard-ui/contributors', dataType: 'json', contentType: "application/json", success: function (data) { diff --git a/templates/base.html b/templates/base.html index 0865ff3..d6955bd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -328,7 +328,7 @@
Version {{ .appVersion }}
- Copyright © Wireguard UI. All rights + Copyright © Wireguard UI. All rights reserved. --> diff --git a/templates/login.html b/templates/login.html index c0a96b9..4e16a6f 100644 --- a/templates/login.html +++ b/templates/login.html @@ -25,7 +25,7 @@
diff --git a/templates/wake_on_lan_hosts.html b/templates/wake_on_lan_hosts.html index 80ba3f6..2519eb0 100644 --- a/templates/wake_on_lan_hosts.html +++ b/templates/wake_on_lan_hosts.html @@ -79,7 +79,7 @@
{{ range $idx, $host := .hosts }} - {{- /*gotype: github.com/ngoduykhanh/wireguard-ui/model.WakeOnLanHost*/ -}} + {{- /*gotype: github.com/wireguard-ui/wireguard-ui/model.WakeOnLanHost*/ -}}
diff --git a/templates/wg.conf b/templates/wg.conf index 81893a8..8268e4e 100644 --- a/templates/wg.conf +++ b/templates/wg.conf @@ -1,4 +1,4 @@ -# This file was generated using wireguard-ui (https://github.com/ngoduykhanh/wireguard-ui) +# This file was generated using wireguard-ui (https://github.com/wireguard-ui/wireguard-ui) # Please don't modify it manually, otherwise your change might get replaced. # Address updated at: {{ .serverConfig.Interface.UpdatedAt }} diff --git a/util/util.go b/util/util.go index 44f8f01..8d03026 100644 --- a/util/util.go +++ b/util/util.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" "fmt" - "github.com/ngoduykhanh/wireguard-ui/store" + "github.com/wireguard-ui/wireguard-ui/store" "golang.org/x/mod/sumdb/dirhash" "io" "io/fs" @@ -21,7 +21,7 @@ import ( externalip "github.com/glendc/go-external-ip" "github.com/labstack/gommon/log" - "github.com/ngoduykhanh/wireguard-ui/model" + "github.com/wireguard-ui/wireguard-ui/model" "github.com/sdomino/scribble" )