Browse Source

Merge branch 'master' into feat/add-sort-in-ui

# Conflicts:
#	README.md
pull/1227/head
Hoang Nè 2 years ago
parent
commit
20b8fd42c5
  1. 3
      .github/CODEOWNERS
  2. 28
      .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
  3. 4
      How_to_generate_an_bcrypt_hash.md
  4. 3
      README.md
  5. 10
      docker-compose.dev.yml
  6. 1
      docker-compose.yml
  7. 14
      src/www/js/i18n.js

3
.github/CODEOWNERS

@ -1,3 +1,4 @@
# Copyright (c) Emile Nijssen (WeeJeWel) # Copyright (c) Emile Nijssen (WeeJeWel)
# Founder and Codeowner of WireGuard Easy (wg-easy) # Founder and Codeowner of WireGuard Easy (wg-easy)
* @WeeJeWel # Maintained by Philip Heiduck (pheiduck)
* @pheiduck

28
.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

@ -0,0 +1,28 @@
<!--- Provide a general summary of your changes in the Title above -->
## Description
<!--- Describe your changes in detail -->
## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
## How has this been tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, tests ran to see how -->
<!--- your change affects other areas of the code, etc. -->
## Screenshots (if appropriate):
## Types of changes
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
## Checklist:
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.

4
How_to_generate_an_bcrypt_hash.md

@ -13,7 +13,7 @@ To generate a bcrypt password hash using docker, run the following command :
```sh ```sh
docker run ghcr.io/wg-easy/wg-easy wgpw YOUR_PASSWORD docker run ghcr.io/wg-easy/wg-easy wgpw YOUR_PASSWORD
PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW' // litteraly YOUR_PASSWORD PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW' // literally YOUR_PASSWORD
``` ```
*Important* : make sure to enclose your password in single quotes when you run `docker run` command : *Important* : make sure to enclose your password in single quotes when you run `docker run` command :
@ -25,4 +25,4 @@ $ echo "$2b$12$coPqCsPtcF"
b2 b2
$ echo '$2b$12$coPqCsPtcF' $ echo '$2b$12$coPqCsPtcF'
$2b$12$coPqCsPtcF $2b$12$coPqCsPtcF
``` ```

3
README.md

@ -32,7 +32,8 @@ You have found the easiest way to install & manage WireGuard on any Linux host!
## Versions ## Versions
We provide more then 1 docker image to get, this will help you decide which one is best for you. We provide more then 1 docker image to get, this will help you decide which one is best for you. <br>
For **stable** versions instead of nightly or development please read **README** from the **production** branch!
| tag | Branch | Example | Description | | tag | Branch | Example | Description |
| - | - | - | - | | - | - | - | - |

10
docker-compose.dev.yml

@ -1,9 +1,17 @@
services: services:
wg-easy: wg-easy:
image: wg-easy build:
dockerfile: ./Dockerfile
command: npm run serve command: npm run serve
volumes: volumes:
- ./src/:/app/ - ./src/:/app/
# - ./data/:/etc/wireguard
ports:
- "51820:51820/udp"
- "51821:51821/tcp"
cap_add:
- NET_ADMIN
- SYS_MODULE
environment: environment:
# - PASSWORD=p # - PASSWORD=p
- WG_HOST=192.168.1.233 - WG_HOST=192.168.1.233

1
docker-compose.yml

@ -12,7 +12,6 @@ services:
- WG_HOST=raspberrypi.local - WG_HOST=raspberrypi.local
# Optional: # Optional:
# - PASSWORD=foobar123 (deprecated, see readme)
# - PASSWORD_HASH=$$2y$$10$$hBCoykrB95WSzuV4fafBzOHWKu9sbyVa34GJr8VV5R/pIelfEMYyG (needs double $$, hash of 'foobar123'; see "How_to_generate_an_bcrypt_hash.md" for generate the hash) # - PASSWORD_HASH=$$2y$$10$$hBCoykrB95WSzuV4fafBzOHWKu9sbyVa34GJr8VV5R/pIelfEMYyG (needs double $$, hash of 'foobar123'; see "How_to_generate_an_bcrypt_hash.md" for generate the hash)
# - PORT=51821 # - PORT=51821
# - WG_PORT=51820 # - WG_PORT=51820

14
src/www/js/i18n.js

@ -111,19 +111,25 @@ const messages = { // eslint-disable-line no-unused-vars
deleteDialog2: 'Bu işlem geri alınamaz.', deleteDialog2: 'Bu işlem geri alınamaz.',
cancel: 'İptal', cancel: 'İptal',
create: 'Oluştur', create: 'Oluştur',
createdAt: 'Şu saatte oluşturuldu: ', createdOn: 'Şu saatte oluşturuldu: ',
lastSeen: 'Son görülme tarihi: ', lastSeen: 'Son görülme tarihi: ',
totalDownload: 'Toplam İndirme: ', totalDownload: 'Toplam İndirme: ',
totalUpload: 'Toplam Yükleme: ', totalUpload: 'Toplam Yükleme: ',
newClient: 'Yeni Kullanıcı', newClient: 'Yeni Kullanıcı',
disableClient: 'İstemciyi Devre Dışı Bırak', disableClient: 'Kullanıcıyı Devre Dışı Bırak',
enableClient: 'İstemciyi Etkinleştir', enableClient: 'Kullanıcıyı Etkinleştir',
noClients: 'Henüz kullanıcı yok.', noClients: 'Henüz kullanıcı yok.',
noPrivKey: 'Bu istemcinin bilinen bir özel anahtarı yok. Yapılandırma oluşturulamıyor.',
showQR: 'QR Kodunu Göster', showQR: 'QR Kodunu Göster',
downloadConfig: 'Yapılandırmayı İndir', downloadConfig: 'Yapılandırmayı İndir',
madeBy: 'Yapan Kişi: ', madeBy: 'Yapan Kişi: ',
donate: 'Bağış Yap', donate: 'Bağış Yap',
changeLang: 'Dil Değiştir', toggleCharts: 'Grafiği göster/gizle',
theme: { dark: 'Karanlık tema', light: 'Açık tema', auto: 'Otomatik tema' },
restore: 'Geri yükle',
backup: 'Yedekle',
titleRestoreConfig: 'Yapılandırmanızı geri yükleyin',
titleBackupConfig: 'Yapılandırmanızı yedekleyin',
}, },
no: { // github.com/digvalley no: { // github.com/digvalley
name: 'Navn', name: 'Navn',

Loading…
Cancel
Save