From fbf5db53a5c89a61cb88d6c2de145d904a993bf0 Mon Sep 17 00:00:00 2001
From: Andreas Waider <andreas.waider@web.de>
Date: Sun, 5 Mar 2023 10:29:58 +0100
Subject: [PATCH 1/3] Added AllowedIps for Homeserver

---
 src/lib/WireGuard.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/lib/WireGuard.js b/src/lib/WireGuard.js
index 7886ac91..fba9c449 100644
--- a/src/lib/WireGuard.js
+++ b/src/lib/WireGuard.js
@@ -112,6 +112,11 @@ PostDown = ${WG_POST_DOWN}
 PublicKey = ${client.publicKey}
 PresharedKey = ${client.preSharedKey}
 AllowedIPs = ${client.address}/32`;
+      debug(client.name);
+      debug(client.name === 'Homeserver');
+      if (client.name === 'Homeserver') {
+        result += ',10.0.0.0/24,10.0.3.0/24';
+      }
     }
 
     debug('Config saving...');

From f830889595aee29f3851607eca04997912284f2b Mon Sep 17 00:00:00 2001
From: Andreas Waider <andreas.waider@web.de>
Date: Sun, 5 Mar 2023 10:30:36 +0100
Subject: [PATCH 2/3] Switch deployment to ghcr.io

---
 .github/workflows/deploy-nightly.yml |  9 +++++----
 .github/workflows/deploy.yml         | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/deploy-nightly.yml b/.github/workflows/deploy-nightly.yml
index efff9525..1eff0ec3 100644
--- a/.github/workflows/deploy-nightly.yml
+++ b/.github/workflows/deploy-nightly.yml
@@ -1,4 +1,4 @@
-name: Build & Publish Docker Image to Docker Hub
+name: Build & Publish Docker Image to GitHub Container Registry
 
 on:
   workflow_dispatch:
@@ -23,8 +23,9 @@ jobs:
     - name: Login to DockerHub
       uses: docker/login-action@v1 
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
           
     # Set environment variables
     - run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV
@@ -35,4 +36,4 @@ jobs:
       with:
         push: true
         platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
-        tags: weejewel/wg-easy:nightly, weejewel/wg-easy:${{ env.RELEASE }}-nightly
+        tags: ghcr.io/${{ github.repository }}:nightly, ghcr.io/${{ github.repository }}:${{ env.RELEASE }}-nightly
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0f2fe55d..7254c722 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: Build & Publish Docker Image to Docker Hub
+name: Build & Publish Docker Image to GitHub Container Registry
 
 on:
   workflow_dispatch:
@@ -22,11 +22,12 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v1 
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v1
       with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
           
     # Set environment variables
     - run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV
@@ -37,4 +38,4 @@ jobs:
       with:
         push: true
         platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8
-        tags: weejewel/wg-easy:latest, weejewel/wg-easy:${{ env.RELEASE }}
+        tags: ghcr.io/${{ github.repository }}:latest, ghcr.io/${{ github.repository }}:${{ env.RELEASE }}

From 7d5b570f9820c8e5e955088799db697526602a2d Mon Sep 17 00:00:00 2001
From: Andreas <41864446+a-waider@users.noreply.github.com>
Date: Mon, 27 Mar 2023 20:00:15 +0200
Subject: [PATCH 3/3] Update deploy-nightly.yml

---
 .github/workflows/deploy-nightly.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy-nightly.yml b/.github/workflows/deploy-nightly.yml
index 1eff0ec3..bc329e9b 100644
--- a/.github/workflows/deploy-nightly.yml
+++ b/.github/workflows/deploy-nightly.yml
@@ -20,8 +20,8 @@ jobs:
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v1
 
-    - name: Login to DockerHub
-      uses: docker/login-action@v1 
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v2
       with:
         registry: ghcr.io
         username: ${{ github.actor }}