diff --git a/Makefile b/Makefile deleted file mode 100644 index 1dcef79..0000000 --- a/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -build-ui: - ./prepare_assets.sh - -build: - CGO_ENABLED=0 go build -v -ldflags="-s -w" - -run: - ./wireguard-ui - -clean: - rm -f wireguard-ui diff --git a/README.md b/README.md index b611959..c43adc3 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ docker-compose up | `BIND_ADDRESS` | The addresses that can access to the web interface and the port, use unix:///abspath/to/file.socket for unix domain socket. | 0.0.0.0:80 | | `SESSION_SECRET` | The secret key used to encrypt the session cookies. Set this to a random value | N/A | | `SESSION_SECRET_FILE` | Optional filepath for the secret key used to encrypt the session cookies. Leave `SESSION_SECRET` blank to take effect | N/A | -| `SUBNET_RANGES` | The list of address subdivision ranges. Format: `SR Name: 10.0.1.0/24; SR2: 10.0.2.0/24, 10.0.3.0/24` Each CIDR must be inside one of the server interfaces. | N/A | +| `SUBNET_RANGES` | The list of address subdivision ranges. Format: `SR Name:10.0.1.0/24; SR2:10.0.2.0/24,10.0.3.0/24` Each CIDR must be inside one of the server interfaces. | N/A | | `WGUI_USERNAME` | The username for the login page. Used for db initialization only | `admin` | | `WGUI_PASSWORD` | The password for the user on the login page. Will be hashed automatically. Used for db initialization only | `admin` | | `WGUI_PASSWORD_FILE` | Optional filepath for the user login password. Will be hashed automatically. Used for db initialization only. Leave `WGUI_PASSWORD` blank to take effect | N/A | diff --git a/handler/routes.go b/handler/routes.go index 6f555d0..1937985 100644 --- a/handler/routes.go +++ b/handler/routes.go @@ -385,9 +385,9 @@ func GetClient(db store.IStore) echo.HandlerFunc { } qrCodeSettings := model.QRCodeSettings{ - Enabled: true, - IncludeDNS: true, - IncludeMTU: true, + Enabled: true, + IncludeDNS: true, + IncludeMTU: true, } clientData, err := db.GetClientByID(clientID, qrCodeSettings) @@ -517,9 +517,9 @@ func EmailClient(db store.IStore, mailer emailer.Emailer, emailSubject, emailCon } qrCodeSettings := model.QRCodeSettings{ - Enabled: true, - IncludeDNS: true, - IncludeMTU: true, + Enabled: true, + IncludeDNS: true, + IncludeMTU: true, } clientData, err := db.GetClientByID(payload.ID, qrCodeSettings) if err != nil { @@ -1108,6 +1108,7 @@ func ApplyServerConfig(db store.IStore, tmplDir fs.FS) echo.HandlerFunc { } } + // GetHashesChanges handler returns if database hashes have changed func GetHashesChanges(db store.IStore) echo.HandlerFunc { return func(c echo.Context) error { diff --git a/model/client.go b/model/client.go index 6199123..187ec72 100644 --- a/model/client.go +++ b/model/client.go @@ -30,7 +30,7 @@ type ClientData struct { } type QRCodeSettings struct { - Enabled bool - IncludeDNS bool - IncludeMTU bool + Enabled bool + IncludeDNS bool + IncludeMTU bool } diff --git a/templates/base.html b/templates/base.html index b6d83db..3f34140 100644 --- a/templates/base.html +++ b/templates/base.html @@ -58,13 +58,13 @@
@@ -406,7 +406,7 @@ } function updateApplyConfigVisibility() { - $.ajax({ + $.ajax({ cache: false, method: 'GET', url: '{{.basePath}}/test-hash', diff --git a/util/config.go b/util/config.go index 2c7791f..cd61fd5 100644 --- a/util/config.go +++ b/util/config.go @@ -37,7 +37,7 @@ const ( DefaultDNS = "1.1.1.1" DefaultMTU = 1450 DefaultPersistentKeepalive = 15 - DefaultFirewallMark = "0xca6c" // i.e. 51820 + DefaultFirewallMark = "0xca6c" // i.e. 51820 DefaultTable = "auto" DefaultConfigFilePath = "/etc/wireguard/wg0.conf" UsernameEnvVar = "WGUI_USERNAME" diff --git a/util/util.go b/util/util.go index b6bcc76..fa168fd 100644 --- a/util/util.go +++ b/util/util.go @@ -429,7 +429,7 @@ func findSubnetRangeForIP(cidr string) (uint16, error) { } } } - return 0, fmt.Errorf("Subnet range not foud for this IP") + return 0, fmt.Errorf("Subnet range not found for this IP") } // FillClientSubnetRange to fill subnet ranges client belongs to, does nothing if SRs are not found