Rebrand fork

This commit is contained in:
Paul Donald 2023-12-02 21:01:59 +01:00
parent b55543f424
commit 3c63b54830
23 changed files with 42 additions and 48 deletions

2
.github/FUNDING.yml vendored
View file

@ -1 +1 @@
github: [ngoduykhanh] github: [wireguard-ui]

View file

@ -26,7 +26,7 @@ jobs:
- name: Prepare image tags - name: Prepare image tags
id: image-tags id: image-tags
run: | run: |
base=ngoduykhanh/wireguard-ui base=wireguard-ui/wireguard-ui
app_version=dev app_version=dev
## Set git tag as image tag ## Set git tag as image tag

View file

@ -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 # wireguard-ui
@ -53,7 +53,7 @@ docker-compose up
| `WGUI_TABLE` | The default WireGuard table value settings | `auto` | | `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_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` | | `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_ADDRESS` | The sender email address | N/A |
| `EMAIL_FROM_NAME` | The sender name | `WireGuard UI` | | `EMAIL_FROM_NAME` | The sender name | `WireGuard UI` |
| `SENDGRID_API_KEY` | The SendGrid api key | N/A | | `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) 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 ### Build binary file
@ -224,10 +224,4 @@ go build -o wireguard-ui
## License ## License
MIT. See [LICENSE](https://github.com/ngoduykhanh/wireguard-ui/blob/master/LICENSE). MIT. See [LICENSE](https://github.com/wireguard-ui/wireguard-ui/blob/master/LICENSE).
## Support
If you like the project and want to support it, you can *buy me a coffee*
<a href="https://www.buymeacoffee.com/khanhngo" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/default-orange.png" alt="Buy Me A Coffee" height="41" width="174"></a>

View file

@ -3,7 +3,7 @@ version: "3"
services: services:
wg: wg:
build: . build: .
#image: ngoduykhanh/wireguard-ui:latest #image: wireguard-ui/wireguard-ui:latest
container_name: wgui container_name: wgui
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN

View file

@ -15,7 +15,7 @@ services:
- ./config:/etc/wireguard - ./config:/etc/wireguard
wireguard-ui: wireguard-ui:
image: ngoduykhanh/wireguard-ui:latest image: wireguard-ui/wireguard-ui:latest
container_name: wireguard-ui container_name: wireguard-ui
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN

View file

@ -15,7 +15,7 @@ services:
- "51820:51820/udp" - "51820:51820/udp"
wireguard-ui: wireguard-ui:
image: ngoduykhanh/wireguard-ui:latest image: wireguard-ui/wireguard-ui:latest
container_name: wireguard-ui container_name: wireguard-ui
depends_on: depends_on:
- wireguard - wireguard

View file

@ -2,7 +2,7 @@ version: "3"
services: services:
wireguard-ui: wireguard-ui:
image: ngoduykhanh/wireguard-ui:latest image: wireguard-ui/wireguard-ui:latest
container_name: wireguard-ui container_name: wireguard-ui
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN

2
go.mod
View file

@ -1,4 +1,4 @@
module github.com/ngoduykhanh/wireguard-ui module github.com/wireguard-ui/wireguard-ui
go 1.16 go 1.16

View file

@ -20,10 +20,10 @@ import (
"golang.zx2c4.com/wireguard/wgctrl" "golang.zx2c4.com/wireguard/wgctrl"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"github.com/ngoduykhanh/wireguard-ui/emailer" "github.com/wireguard-ui/wireguard-ui/emailer"
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/wireguard-ui/wireguard-ui/model"
"github.com/ngoduykhanh/wireguard-ui/store" "github.com/wireguard-ui/wireguard-ui/store"
"github.com/ngoduykhanh/wireguard-ui/util" "github.com/wireguard-ui/wireguard-ui/util"
) )
// Health check handler // Health check handler

View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
"github.com/labstack/gommon/log" "github.com/labstack/gommon/log"
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/wireguard-ui/wireguard-ui/model"
"github.com/ngoduykhanh/wireguard-ui/store" "github.com/wireguard-ui/wireguard-ui/store"
"github.com/sabhiram/go-wol/wol" "github.com/sabhiram/go-wol/wol"
"net" "net"
"net/http" "net/http"

View file

@ -6,7 +6,7 @@ import (
"github.com/labstack/echo-contrib/session" "github.com/labstack/echo-contrib/session"
"github.com/labstack/echo/v4" "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 { func ValidSession(next echo.HandlerFunc) echo.HandlerFunc {

14
main.go
View file

@ -6,17 +6,17 @@ import (
"fmt" "fmt"
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
"github.com/labstack/gommon/log" "github.com/labstack/gommon/log"
"github.com/ngoduykhanh/wireguard-ui/store" "github.com/wireguard-ui/wireguard-ui/store"
"io/fs" "io/fs"
"net/http" "net/http"
"os" "os"
"time" "time"
"github.com/ngoduykhanh/wireguard-ui/emailer" "github.com/wireguard-ui/wireguard-ui/emailer"
"github.com/ngoduykhanh/wireguard-ui/handler" "github.com/wireguard-ui/wireguard-ui/handler"
"github.com/ngoduykhanh/wireguard-ui/router" "github.com/wireguard-ui/wireguard-ui/router"
"github.com/ngoduykhanh/wireguard-ui/store/jsondb" "github.com/wireguard-ui/wireguard-ui/store/jsondb"
"github.com/ngoduykhanh/wireguard-ui/util" "github.com/wireguard-ui/wireguard-ui/util"
) )
var ( var (
@ -107,7 +107,7 @@ func init() {
fmt.Println("Git Commit\t:", gitCommit) fmt.Println("Git Commit\t:", gitCommit)
fmt.Println("Git Ref\t\t:", gitRef) fmt.Println("Git Ref\t\t:", gitRef)
fmt.Println("Build Time\t:", buildTime) 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("Authentication\t:", !util.DisableLogin)
fmt.Println("Bind address\t:", util.BindAddress) fmt.Println("Bind address\t:", util.BindAddress)
//fmt.Println("Sendgrid key\t:", util.SendgridApiKey) //fmt.Println("Sendgrid key\t:", util.SendgridApiKey)

View file

@ -3,7 +3,7 @@
"version": "1.0.0", "version": "1.0.0",
"description": "Wireguard web interface", "description": "Wireguard web interface",
"main": "index.js", "main": "index.js",
"repository": "git@github.com:ngoduykhanh/wireguard-ui.git", "repository": "git@github.com:wireguard-ui/wireguard-ui.git",
"author": "Khanh Ngo <k@ndk.name>", "author": "Khanh Ngo <k@ndk.name>",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

View file

@ -13,7 +13,7 @@ import (
"github.com/labstack/echo/v4" "github.com/labstack/echo/v4"
"github.com/labstack/echo/v4/middleware" "github.com/labstack/echo/v4/middleware"
"github.com/labstack/gommon/log" "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 // TemplateRegistry is a custom html/template renderer for Echo framework

View file

@ -12,8 +12,8 @@ import (
"github.com/skip2/go-qrcode" "github.com/skip2/go-qrcode"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes" "golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/wireguard-ui/wireguard-ui/model"
"github.com/ngoduykhanh/wireguard-ui/util" "github.com/wireguard-ui/wireguard-ui/util"
) )
type JsonDB struct { type JsonDB struct {

View file

@ -6,7 +6,7 @@ import (
"os" "os"
"path" "path"
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/wireguard-ui/wireguard-ui/model"
) )
func (o *JsonDB) GetWakeOnLanHosts() ([]model.WakeOnLanHost, error) { func (o *JsonDB) GetWakeOnLanHosts() ([]model.WakeOnLanHost, error) {

View file

@ -1,7 +1,7 @@
package store package store
import ( import (
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/wireguard-ui/wireguard-ui/model"
) )
type IStore interface { type IStore interface {

View file

@ -63,7 +63,7 @@ About
</div> </div>
<strong>Copyright &copy; <strong>Copyright &copy;
<script>document.write(new Date().getFullYear())</script> <script>document.write(new Date().getFullYear())</script>
<a href="https://github.com/ngoduykhanh/wireguard-ui">Wireguard UI</a>. <a href="https://github.com/wireguard-ui/wireguard-ui">Wireguard UI</a>.
</strong> All rights reserved. </strong> All rights reserved.
</div> </div>
@ -83,7 +83,7 @@ About
$.ajax({ $.ajax({
cache: false, cache: false,
method: 'GET', 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', dataType: 'json',
contentType: "application/json", contentType: "application/json",
success: function (data) { success: function (data) {
@ -99,7 +99,7 @@ About
$.ajax({ $.ajax({
cache: false, cache: false,
method: 'GET', 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', dataType: 'json',
contentType: "application/json", contentType: "application/json",
success: function (data) { success: function (data) {
@ -121,7 +121,7 @@ About
$.ajax({ $.ajax({
cache: false, cache: false,
method: 'GET', 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', dataType: 'json',
contentType: "application/json", contentType: "application/json",
success: function (data) { success: function (data) {

View file

@ -328,7 +328,7 @@
<div class="float-right d-none d-sm-block"> <div class="float-right d-none d-sm-block">
<b>Version</b> {{ .appVersion }} <b>Version</b> {{ .appVersion }}
</div> </div>
<strong>Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/ngoduykhanh/wireguard-ui">Wireguard UI</a>.</strong> All rights <strong>Copyright &copy; <script>document.write(new Date().getFullYear())</script> <a href="https://github.com/wireguard-ui/wireguard-ui">Wireguard UI</a>.</strong> All rights
reserved. reserved.
</footer> </footer>
--> -->

View file

@ -25,7 +25,7 @@
<body class="hold-transition login-page"> <body class="hold-transition login-page">
<div class="login-box"> <div class="login-box">
<div class="login-logo"> <div class="login-logo">
<a href="https://github.com/ngoduykhanh/wireguard-ui">WireGuard UI</a> <a href="https://github.com/wireguard-ui/wireguard-ui">WireGuard UI</a>
</div> </div>
<!-- /.login-logo --> <!-- /.login-logo -->
<div class="card"> <div class="card">

View file

@ -79,7 +79,7 @@
<div class="row"> <div class="row">
{{ range $idx, $host := .hosts }} {{ range $idx, $host := .hosts }}
{{- /*gotype: github.com/ngoduykhanh/wireguard-ui/model.WakeOnLanHost*/ -}} {{- /*gotype: github.com/wireguard-ui/wireguard-ui/model.WakeOnLanHost*/ -}}
<div class="col-sm-4" id="{{ $host.ResolveResourceName }}"> <div class="col-sm-4" id="{{ $host.ResolveResourceName }}">
<div class="info-box"> <div class="info-box">
<div class="info-box-content"> <div class="info-box-content">

View file

@ -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. # Please don't modify it manually, otherwise your change might get replaced.
# Address updated at: {{ .serverConfig.Interface.UpdatedAt }} # Address updated at: {{ .serverConfig.Interface.UpdatedAt }}

View file

@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/ngoduykhanh/wireguard-ui/store" "github.com/wireguard-ui/wireguard-ui/store"
"golang.org/x/mod/sumdb/dirhash" "golang.org/x/mod/sumdb/dirhash"
"io" "io"
"io/fs" "io/fs"
@ -21,7 +21,7 @@ import (
externalip "github.com/glendc/go-external-ip" externalip "github.com/glendc/go-external-ip"
"github.com/labstack/gommon/log" "github.com/labstack/gommon/log"
"github.com/ngoduykhanh/wireguard-ui/model" "github.com/wireguard-ui/wireguard-ui/model"
"github.com/sdomino/scribble" "github.com/sdomino/scribble"
) )