From d8c459851199023a5d8b905ee3bdcc2810903eb6 Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 23 May 2021 16:59:27 +0200 Subject: [PATCH 1/7] update readme --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9039dc9..0c24aa1 100644 --- a/README.md +++ b/README.md @@ -10,14 +10,13 @@ You have found the easiest way to install & manage WireGuard on any Linux host! ## Features -* All-in-one: WireGuard + Web UI -* A beautiful management Web UI -* Easy installation -* List, create, delete, enable & disable clients -* Show a client's QR code -* Download a client's configuration file -* Statistics for which clients are connected -* Gravatar support 😏 +* All-in-one: WireGuard + Web UI. +* Easy installation, simple to use. +* List, create, delete, enable & disable clients. +* Show a client's QR code. +* Download a client's configuration file. +* Statistics for which clients are connected. +* Gravatar support. ## Installation From a6da5cc684153e8611985d0a573db4aeb54b85bb Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 23 May 2021 17:05:24 +0200 Subject: [PATCH 2/7] wip --- .github/workflows/lint.yml | 23 +++++++++++++++++++++++ README.md | 5 ++++- docker-compose.yml | 2 +- package.json | 3 ++- src/.eslintrc.json | 3 +++ 5 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..fd473bf --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,23 @@ +name: Lint + +on: + push: + branches: + - master + - production + pull_request: + +jobs: + lint: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v1 + with: + node-version: '14' + + - run: | + cd src + npm ci + npm run lint diff --git a/README.md b/README.md index 0c24aa1..5e8daaa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # WireGuard Easy [![Build & Publish Docker Image to Docker Hub](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml) +[![Docker](https://img.shields.io/docker/v/weejewel/wg-easy/latest)](https://hub.docker.com/r/weejewel/wg-easy) +[![Docker](https://img.shields.io/docker/pulls/weejewel/wg-easy.svg)](https://hub.docker.com/r/weejewel/wg-easy) +[![Sponsor](https://img.shields.io/github/sponsors/weejewel)](https://github.com/sponsors/WeeJeWel) You have found the easiest way to install & manage WireGuard on any Linux host! @@ -51,7 +54,7 @@ Optionally, set a Web UI password by uncommenting `PASSWORD=foobar123` and chang Finally, run WireGuard. It will automatically start after a reboot. ```bash -$ docker-compose up +$ docker-compose up --detach ``` The Web UI will be available on `http://0.0.0.0:51821`. You can create new clients there. diff --git a/docker-compose.yml b/docker-compose.yml index 92ed610..09ec7ff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,7 +15,7 @@ services: image: weejewel/wg-easy container_name: wg-easy volumes: - - .wg-easy:/etc/wireguard + - .:/etc/wireguard ports: - "51820:51820/udp" - "51821:51821/tcp" diff --git a/package.json b/package.json index bb62b5d..452856e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "version": "1.0.0", "scripts": { "build": "docker build --tag wg-easy .", - "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy" + "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy", + "lint": "eslint src" }, "docker": { "production": { diff --git a/src/.eslintrc.json b/src/.eslintrc.json index f0d4a77..4652c8d 100644 --- a/src/.eslintrc.json +++ b/src/.eslintrc.json @@ -1,5 +1,8 @@ { "extends": "athom", + "ignorePatterns": [ + "**/vendor/*.js" + ], "rules": { "consistent-return": "off", "no-shadow": "off" From 03066b5e43e662f385d6624c8fb6696f99d02770 Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 23 May 2021 17:06:29 +0200 Subject: [PATCH 3/7] fix yaml --- .github/workflows/lint.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fd473bf..b2a65b9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,6 +18,6 @@ jobs: node-version: '14' - run: | - cd src - npm ci - npm run lint + cd src + npm ci + npm run lint From 2a92b8bbe687f8199785dc18c5b4e99b22f77644 Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 23 May 2021 17:07:37 +0200 Subject: [PATCH 4/7] fix --- package.json | 3 +-- src/package.json | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 452856e..bb62b5d 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "version": "1.0.0", "scripts": { "build": "docker build --tag wg-easy .", - "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy", - "lint": "eslint src" + "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy" }, "docker": { "production": { diff --git a/src/package.json b/src/package.json index 611c879..f061e5b 100644 --- a/src/package.json +++ b/src/package.json @@ -5,7 +5,8 @@ "main": "server.js", "scripts": { "serve": "DEBUG=Server,WireGuard WG_HOST=0.0.0.0 WG_PATH=../config/ nodemon server.js", - "serve-with-password": "PASSWORD=wg npm run serve" + "serve-with-password": "PASSWORD=wg npm run serve", + "lint": "eslint ." }, "author": "Emile Nijssen", "license": "GPL", From 62bd7ddb9104ef1de1f6c979ff2510bad509a2cf Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 23 May 2021 17:08:36 +0200 Subject: [PATCH 5/7] add badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5e8daaa..8978721 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # WireGuard Easy [![Build & Publish Docker Image to Docker Hub](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml) +[![Lint](https://github.com/WeeJeWel/wg-easy/actions/workflows/lint.yml/badge.svg?branch=master)](https://github.com/WeeJeWel/wg-easy/actions/workflows/lint.yml) [![Docker](https://img.shields.io/docker/v/weejewel/wg-easy/latest)](https://hub.docker.com/r/weejewel/wg-easy) [![Docker](https://img.shields.io/docker/pulls/weejewel/wg-easy.svg)](https://hub.docker.com/r/weejewel/wg-easy) [![Sponsor](https://img.shields.io/github/sponsors/weejewel)](https://github.com/sponsors/WeeJeWel) From 932caddb3ceaaf440d6f2adbd29f203a0dd3028e Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Sun, 23 May 2021 18:17:22 +0200 Subject: [PATCH 6/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8978721..0974992 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ You have found the easiest way to install & manage WireGuard on any Linux host!

- +

## Features From 12d8013d01ee6b668080ffb9c239a4b991faca25 Mon Sep 17 00:00:00 2001 From: Emile Nijssen Date: Mon, 24 May 2021 11:26:08 +0200 Subject: [PATCH 7/7] Delete .wg-easy directory --- .wg-easy/wg0.conf | 9 --------- .wg-easy/wg0.json | 8 -------- 2 files changed, 17 deletions(-) delete mode 100644 .wg-easy/wg0.conf delete mode 100644 .wg-easy/wg0.json diff --git a/.wg-easy/wg0.conf b/.wg-easy/wg0.conf deleted file mode 100644 index 73c5f2f..0000000 --- a/.wg-easy/wg0.conf +++ /dev/null @@ -1,9 +0,0 @@ - -# Note: Do not edit this file directly. -# Your changes will be overwritten! - -# Server -[Interface] -PrivateKey = 8JtWwlHvx4ogphP601ABdvNFXbd1noCd+Sn9fg19jWA= -Address = 10.8.0.1/24 -ListenPort = 51820 \ No newline at end of file diff --git a/.wg-easy/wg0.json b/.wg-easy/wg0.json deleted file mode 100644 index 4175eef..0000000 --- a/.wg-easy/wg0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "server": { - "privateKey": "8JtWwlHvx4ogphP601ABdvNFXbd1noCd+Sn9fg19jWA=", - "publicKey": "065+jEZi4CMWbwSCrixByy3D+haZR2e+kjmxMq6h+EY=", - "address": "10.8.0.1" - }, - "clients": {} -} \ No newline at end of file