Merge branch 'master' into feat-h3

2024-03-15 15:22:17 +01:00 · 2024-03-15 15:22:17 +01:00 · 44cc5683d4
parent 7596385d5a e2242daef1
commit 44cc5683d4
5 changed files with 96 additions and 11 deletions
--- a/.github/workflows/deploy-pr.yml
+++ b/.github/workflows/deploy-pr.yml
@ -0,0 +1,38 @@
+name: Build Pull Request
+
+on:
+  workflow_dispatch:
+  pull_request:
+
+jobs:
+  deploy:
+    name: Build & Deploy
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'wg-easy'
+    permissions:
+      packages: write
+      contents: read
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        ref: production
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Build Docker Image
+      uses: docker/build-push-action@v5
+      with:
+        push: false
+        platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
+        tags: ghcr.io/wg-easy/wg-easy:pr
--- a/README.md
+++ b/README.md
@ -23,6 +23,8 @@ You have found the easiest way to install & manage WireGuard on any Linux host!
 * Tx/Rx charts for each connected client.
 * Gravatar support.
 * Automatic Light / Dark Mode
+* Multilanguage Support
+* UI_TRAFFIC_STATS (default off)

 ## Requirements

@ -36,9 +38,9 @@ You have found the easiest way to install & manage WireGuard on any Linux host!
 If you haven't installed Docker yet, install it by running:

 ```bash
-$ curl -sSL https://get.docker.com | sh
-$ sudo usermod -aG docker $(whoami)
-$ exit
+curl -sSL https://get.docker.com | sh
+sudo usermod -aG docker $(whoami)
+exit
 ```

 And log in again.
@ -72,6 +74,10 @@ The Web UI will now be available on `http://0.0.0.0:51821`.

 > 💡 Your configuration files will be saved in `~/.wg-easy`

+WireGuard Easy can be launched with Docker Compose as well - just download
+[`docker-compose.yml`](docker-compose.yml), make necessary adjustments and
+execute `docker compose up --detach`.
+
 ### 3. Sponsor

 Are you enjoying this project? [Buy Emile a beer!](https://github.com/sponsors/WeeJeWel) 🍻
@ -97,7 +103,7 @@ These options can be configured by setting environment variables using `-e KEY="
 | `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L20) for the default value. |
 | `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L27) for the default value. |
 | `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/wg-easy/wg-easy/blob/master/src/config.js#L28) for the default value. |
-| `LANG` | `en` | `de` | Web UI language (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th). |
+| `LANG` | `en` | `de` | Web UI language (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi). |
 | `UI_TRAFFIC_STATS` | `false` | `true` | Enable detailed RX / TX client stats in Web UI |

 > If you change `WG_PORT`, make sure to also change the exposed port.
@ -114,6 +120,16 @@ docker pull ghcr.io/wg-easy/wg-easy

 And then run the `docker run -d \ ...` command above again.

+To update using Docker Compose:
+
+```shell
+docker compose pull
+docker compose up --detach
+```
+
+The WireGuared Easy container will be automatically recreated if a newer image
+was pulled.
+
 ## Common Use Cases

 * [Using WireGuard-Easy with Pi-Hole](https://github.com/wg-easy/wg-easy/wiki/Using-WireGuard-Easy-with-Pi-Hole)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,7 +6,7 @@ services:
  wg-easy:
    environment:
      # Change Language:
-      # (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th)
+      # (Supports: en, ua, ru, tr, no, pl, fr, de, ca, es, ko, vi, nl, is, pt, chs, cht, it, th, hi)
      - LANG=de
      # ⚠️ Required:
      # Change this to your host's public address
--- a/src/package-lock.json
+++ b/src/package-lock.json
@ -965,12 +965,15 @@
      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
    },
    "node_modules/binary-extensions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
-      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
      "dev": true,
      "engines": {
        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
    "node_modules/brace-expansion": {
@ -3605,9 +3608,9 @@
      }
    },
    "node_modules/postcss-selector-parser": {
-      "version": "6.0.15",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz",
-      "integrity": "sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==",
+      "version": "6.0.16",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.16.tgz",
+      "integrity": "sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==",
      "dev": true,
      "dependencies": {
        "cssesc": "^3.0.0",
--- a/src/www/js/i18n.js
+++ b/src/www/js/i18n.js
@ -517,4 +517,32 @@ const messages = { // eslint-disable-line no-unused-vars
    madeBy: 'สร้างโดย',
    donate: 'บริจาค',
  },
+  hi: { // github.com/rahilarious
+    name: 'नाम',
+    password: 'पासवर्ड',
+    signIn: 'लॉगिन',
+    logout: 'लॉगआउट',
+    updateAvailable: 'अपडेट उपलब्ध है!',
+    update: 'अपडेट',
+    clients: 'उपयोगकर्ताये',
+    new: 'नया',
+    deleteClient: 'उपयोगकर्ता हटाएँ',
+    deleteDialog1: 'क्या आपको पक्का हटाना है',
+    deleteDialog2: 'यह निर्णय पलट नहीं सकता।',
+    cancel: 'कुछ ना करें',
+    create: 'बनाएं',
+    createdOn: 'सर्जन तारीख ',
+    lastSeen: 'पिछली बार देखे गए थे ',
+    totalDownload: 'कुल डाउनलोड: ',
+    totalUpload: 'कुल अपलोड: ',
+    newClient: 'नया उपयोगकर्ता',
+    disableClient: 'उपयोगकर्ता स्थगित कीजिये',
+    enableClient: 'उपयोगकर्ता शुरू कीजिये',
+    noClients: 'अभी तक कोई भी उपयोगकर्ता नहीं है।',
+    noPrivKey: 'ये उपयोगकर्ता की कोई भी गुप्त चाबी नहीं हे। बना नहीं सकते।',
+    showQR: 'क्यू आर कोड देखिये',
+    downloadConfig: 'डाउनलोड कॉन्फीग्यूरेशन',
+    madeBy: 'सर्जक',
+    donate: 'दान करें',
+  },
 };