Skip to content

Commit

Permalink
Merge branch 'wg-easy:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dartegnian authored Jun 20, 2024
2 parents 3a7b372 + 9b6ac7c commit b81858f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 19 deletions.
3 changes: 2 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ services:
- WG_HOST=wg.dartegnian.com

# Optional:
# - PASSWORD=foobar123
# - PASSWORD=foobar123 (deprecated, see readme)
# - PASSWORD_HASH=$$2y$$10$$hBCoykrB95WSzuV4fafBzOHWKu9sbyVa34GJr8VV5R/pIelfEMYyG (needs double $$, hash of 'foobar123')
# - PORT=51821
# - WG_PORT=51820
# - WG_CONFIG_PORT=92820
Expand Down
39 changes: 23 additions & 16 deletions src/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
"bcryptjs": "^2.4.3",
"debug": "^4.3.5",
"express-session": "^1.18.0",
"h3": "^1.11.1",
"h3": "^1.12.0",
"qrcode": "^1.5.3"
},
"devDependencies": {
"eslint-config-athom": "^3.1.3",
"nodemon": "^3.1.3",
"nodemon": "^3.1.4",
"tailwindcss": "^3.4.4"
},
"nodemonConfig": {
Expand Down

0 comments on commit b81858f

Please sign in to comment.