Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions .env.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPOSE_PROJECT_NAME=easyvpn
COMPOSE_PROJECT_NAME=easyzsv


PORT=8000
Expand All @@ -14,15 +14,15 @@ BACK_TASK_EXPIRE=5
BACK_DOCS_ENABLED=true
FRONT_CHECK_AUTH=10

VPN_IP=89.191.226.158
VPN_USER=user
VPN_PASSWORD=passwd
ZSV_IP=89.191.226.158
ZSV_USER=user
ZSV_PASSWORD=passwd

WG_VPN_PORT=51820
WG_ZSV_PORT=51820
WG_API_PORT=8400
WG_VOLUME=./.data/wg

AWG_VPN_PORT=51840
AWG_ZSV_PORT=51840
AWG_API_PORT=8410
AWG_VOLUME=./.data/awg

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: "AmneziaWgVpn"
name: "AmneziaWgZsv"

on:
pull_request:
paths: [ "services/AmneziaWgVpn/**" ]
paths: [ "services/AmneziaWgZsv/**" ]
branches: [ "main", "develop" ]

jobs:
build_amneziawgvpn:
build_amneziawgzsv:
name: Build and Test

runs-on: ubuntu-latest
Expand All @@ -21,9 +21,9 @@ jobs:

- name: Replace service source
run: |
cp -r ./services/AmneziaWgVpn /tmp/AmneziaWgVpn
cp -r ./services/AmneziaWgZsv /tmp/AmneziaWgZsv
rm -rf .[^.]* ..?* *
cp -r /tmp/AmneziaWgVpn/. ./
cp -r /tmp/AmneziaWgZsv/. ./

- name: Restore dependencies
run: go mod download
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
steps:
- name: Pull latest compose
run: |
cd /opt/EasyVPN.dev
cd /opt/EasyZsV.dev
docker-compose --profile init pull

- name: Restart Docker Compose
run: |
cd /opt/EasyVPN.dev
cd /opt/EasyZsV.dev
docker-compose --profile init up -d
6 changes: 3 additions & 3 deletions .github/workflows/prod-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:

- name: Pull latest compose
run: |
cd /opt/EasyVPN
curl -L -o docker-compose.yml https://raw.githubusercontent.com/F1st3K/EasyVPN/refs/heads/main/docker-compose.yml
cd /opt/EasyZsV
curl -L -o docker-compose.yml https://raw.githubusercontent.com/F1st3K/EasyZsV/refs/heads/main/docker-compose.yml
docker-compose pull

- name: Restart Docker Compose
run: |
cd /opt/EasyVPN
cd /opt/EasyZsV
docker-compose up -d
12 changes: 6 additions & 6 deletions .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
{ name: "backend", path: "./backend/" },
{ name: "frontend", path: "./frontend/" },
{ name: "init", path: "./init/" },
{ name: "wireguard-vpn", path: "./services/WireguardVpn/" },
{ name: "amneziawg-vpn", path: "./services/AmneziaWgVpn/" },
{ name: "wireguard-zsv", path: "./services/WireguardZsv/" },
{ name: "amneziawg-zsv", path: "./services/AmneziaWgZsv/" },
{ name: "bot", path: "./services/TelegramBot/" },
]

Expand All @@ -37,10 +37,10 @@ jobs:

- name: Publish
run: |
docker build -t easyvpn/${{ matrix.service.name }} ${{ matrix.service.path }}
docker tag easyvpn/${{ matrix.service.name }} easyvpn/${{ matrix.service.name }}:$(cat VERSION)
docker push easyvpn/${{ matrix.service.name }}:$(cat VERSION)
docker push easyvpn/${{ matrix.service.name }}
docker build -t easyzsv/${{ matrix.service.name }} ${{ matrix.service.path }}
docker tag easyzsv/${{ matrix.service.name }} easyzsv/${{ matrix.service.name }}:$(cat VERSION)
docker push easyzsv/${{ matrix.service.name }}:$(cat VERSION)
docker push easyzsv/${{ matrix.service.name }}

publish_github_release:
name: GitHub release publish
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: "WireguardVpn"
name: "WireguardZsv"

on:
pull_request:
paths: [ "services/WireguardVpn/**" ]
paths: [ "services/WireguardZsv/**" ]
branches: [ "main", "develop" ]

jobs:
build_wireguardvpn:
build_wireguardzsv:
name: Build and Test

runs-on: ubuntu-latest
Expand All @@ -21,9 +21,9 @@ jobs:

- name: Replace service source
run: |
cp -r ./services/WireguardVpn /tmp/WireguardVpn
cp -r ./services/WireguardZsv /tmp/WireguardZsv
rm -rf .[^.]* ..?* *
cp -r /tmp/WireguardVpn/. ./
cp -r /tmp/WireguardZsv/. ./

- name: Restore dependencies
run: go mod download
Expand Down
File renamed without changes
4 changes: 2 additions & 2 deletions .img/SystemDesign.excalidraw.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .scripts/README.en_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[readme-en-shield]: https://img.shields.io/badge/en-blue
[readme-en-url]: README.en_EN.md

## EasyVPN.Develop scripts
## EasyZsV.Develop scripts

### This section contains scripts for development, they will be replenished during the life of the project:

Expand Down
2 changes: 1 addition & 1 deletion .scripts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[readme-en-url]: README.en_EN.md


## EasyVPN.Develop scripts
## EasyZsV.Develop scripts

### В этом разделе находятся скрипты для разработки, в процессе жизни проекта они будут пополнятся:

Expand Down
12 changes: 6 additions & 6 deletions .scripts/set-global-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ cat "$TMP_FILE" > "init.sh"
head -2 "init.sh"
cd ../

# Set version services/WireguardVpn:
echo "--- Set version services/WireguardVpn --------------------------"
cd ./services/WireguardVpn
# Set version services/WireguardZsv:
echo "--- Set version services/WireguardZsv --------------------------"
cd ./services/WireguardZsv
yq -i ".service.version = \"$NEW_VERSION\"" ./cmd/config.yml
yq ".service.version" ./cmd/config.yml
cd ../../

# Set version services/AmneziaWgVpn:
echo "--- Set version services/AmneziaWgVpn --------------------------"
cd ./services/AmneziaWgVpn
# Set version services/AmneziaWgZsv:
echo "--- Set version services/AmneziaWgZsv --------------------------"
cd ./services/AmneziaWgZsv
yq -i ".service.version = \"$NEW_VERSION\"" ./cmd/config.yml
yq ".service.version" ./cmd/config.yml
cd ../../
Expand Down
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
- Performing repository
- All missing documentation added
- Add EN to all documention
- VPN API versions has been created and moved to a separate document.
- ZSV API versions has been created and moved to a separate document.

## `0.7.0` (2025-04-11)

Expand All @@ -83,13 +83,13 @@

### Features

- services: Create new Amnezia WG vpn-service (wireguard based)
- services: Create new Amnezia WG zsv-service (wireguard based)
- services: Update documentation

### Bug fixes

- services: Fix reload wireguard to resync configuration (fasted)
- services: Fix env variables with ports (WG_PORT -> VPN_PORT)
- services: Fix env variables with ports (WG_PORT -> ZSV_PORT)

## `0.5.1` (2024-12-08)

Expand Down Expand Up @@ -152,8 +152,8 @@

### Features

- backend: Improved work with different (and adding new) versions of VPN services
- services/WireguardVpn: Version moved to new route (`/ -> /v1/`)
- backend: Improved work with different (and adding new) versions of ZSV services
- services/WireguardZsv: Version moved to new route (`/ -> /v1/`)

### Documentation

Expand All @@ -163,12 +163,12 @@

### Features

- Create swagger endpoint in EasyVPN.Api
- Create swagger endpoint in EasyZsV.Api

### Documentation

- Create & refactoring README.md files (backend, frontend, services/WireguardVpn)
- Transferred EasyVPN.Api documention to swagger
- Create & refactoring README.md files (backend, frontend, services/WireguardZsv)
- Transferred EasyZsV.Api documention to swagger
- Simplifictaion main README.md

## `0.1.2`
Expand Down
26 changes: 13 additions & 13 deletions README.en_EN.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@

<div align="center">

![Logo](.img/EasyVPN-logo.png)
![Logo](.img/EasyZsV-logo.png)

# EasyVPN
# EasyZsV

[![Build](https://github.com/F1st3K/EasyVPN/actions/workflows/test-single-deploy.yml/badge.svg)](https://github.com/F1st3K/EasyVPN/actions/workflows/test-single-deploy.yml)
[![Build](https://github.com/F1st3K/EasyZsV/actions/workflows/test-single-deploy.yml/badge.svg)](https://github.com/F1st3K/EasyZsV/actions/workflows/test-single-deploy.yml)

[![GitHub Release](https://img.shields.io/github/v/release/F1st3K/EasyVPN)](https://hub.docker.com/u/easyvpn)
[![GitHub Release](https://img.shields.io/github/v/release/F1st3K/EasyZsV)](https://hub.docker.com/u/easyzsv)
[![License: CC BY-NC 4.0](https://img.shields.io/badge/License-CC_BY--NC_4.0-lightgrey.svg)](https://creativecommons.org/licenses/by-nc/4.0/)
[![GitHub contributors](https://img.shields.io/github/contributors/F1st3K/EasyVPN)](https://GitHub.com/F1st3K/EasyVPN/graphs/contributors/)
[![GitHub Stars](https://img.shields.io/github/stars/F1st3K/EasyVPN.svg)](https://github.com/F1st3K/EasyVPN/stargazers)
[![GitHub contributors](https://img.shields.io/github/contributors/F1st3K/EasyZsV)](https://GitHub.com/F1st3K/EasyZsV/graphs/contributors/)
[![GitHub Stars](https://img.shields.io/github/stars/F1st3K/EasyZsV.svg)](https://github.com/F1st3K/EasyZsV/stargazers)

A simple VPN + Backend + Frontend application on one server!
EasyZsV - Easy Zooming secure Velocity!

[
<h3>
Expand All @@ -34,13 +34,13 @@ A simple VPN + Backend + Frontend application on one server!
</div>

## Single Deploy (docker-compose)
To deploy `EasyVPN` on a single server, use `Docker Compose`:
To deploy `EasyZsV` on a single server, use `Docker Compose`:

### Production enviroment:

```bash
curl -L -o docker-compose.yml https://raw.githubusercontent.com/F1st3K/EasyVPN/refs/heads/main/docker-compose.yml && \
curl -L -o .env https://raw.githubusercontent.com/F1st3K/EasyVPN/refs/heads/main/.env.dev
curl -L -o docker-compose.yml https://raw.githubusercontent.com/F1st3K/EasyZsV/refs/heads/main/docker-compose.yml && \
curl -L -o .env https://raw.githubusercontent.com/F1st3K/EasyZsV/refs/heads/main/.env.dev
```

> It is recommended to change variables in `.env`
Expand All @@ -57,7 +57,7 @@ docker-compose up
### Develop environment:

```bash
git clone https://github.com/F1st3K/EasyVPN
git clone https://github.com/F1st3K/EasyZsV
```

```bash
Expand All @@ -69,5 +69,5 @@ docker-compose --env-file .env.dev --profile init up --build
docker-compose --env-file .env.dev up --build
```

Also for independent deployment of the components of the `EasyVPN` web application, you can use the documentation for each service:
[EasyVPN backend](backend/README.md), [EasyVPN frontend](/frontend/README.md), [EasyVPN init](/init/README.md), as well as others [EasyVPN services](/services/README.md).
Also for independent deployment of the components of the `EasyZsV` web application, you can use the documentation for each service:
[EasyZsV backend](backend/README.md), [EasyZsV frontend](/frontend/README.md), [EasyZsV init](/init/README.md), as well as others [EasyZsV services](/services/README.md).
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@

<div align="center">

![Logo](.img/EasyVPN-logo.png)
![Logo](.img/EasyZsV-logo.png)

# EasyVPN
# EasyZsV

[![GitHub Release](https://img.shields.io/github/v/release/F1st3K/EasyVPN)](https://hub.docker.com/u/easyvpn)
[![GitHub Release](https://img.shields.io/github/v/release/F1st3K/EasyZsV)](https://hub.docker.com/u/easyzsv)

[![Build](https://github.com/F1st3K/EasyVPN/actions/workflows/test-single-deploy.yml/badge.svg)](https://github.com/F1st3K/EasyVPN/actions/workflows/test-single-deploy.yml)
[![DEV](https://img.shields.io/badge/dynamic/json?label=DEV&url=https%3A%2F%2Fdev.easy-vpn.f1st3k.tw1.su%2Fapi%2Fhealth&query=%24.version&color=yellowgreen)](https://dev.easy-vpn.f1st3k.tw1.su)
[![PROD](https://img.shields.io/badge/dynamic/json?label=PROD&url=https%3A%2F%2Feasy-vpn.f1st3k.tw1.su%2Fapi%2Fhealth&query=%24.version&color=brightgreen)](https://easy-vpn.f1st3k.tw1.su)
[![Build](https://github.com/F1st3K/EasyZsV/actions/workflows/test-single-deploy.yml/badge.svg)](https://github.com/F1st3K/EasyZsV/actions/workflows/test-single-deploy.yml)
[![DEV](https://img.shields.io/badge/dynamic/json?label=DEV&url=https%3A%2F%2Fdev.easy-zsv.f1st3k.tw1.su%2Fapi%2Fhealth&query=%24.version&color=yellowgreen)](https://dev.easy-zsv.f1st3k.tw1.su)
[![PROD](https://img.shields.io/badge/dynamic/json?label=PROD&url=https%3A%2F%2Feasy-zsv.f1st3k.tw1.su%2Fapi%2Fhealth&query=%24.version&color=brightgreen)](https://easy-zsv.f1st3k.tw1.su)



[![License: CC BY-NC 4.0](https://img.shields.io/badge/License-CC_BY--NC_4.0-lightgrey.svg)](https://creativecommons.org/licenses/by-nc/4.0/)
[![GitHub contributors](https://img.shields.io/github/contributors/F1st3K/EasyVPN)](https://GitHub.com/F1st3K/EasyVPN/graphs/contributors/)
[![GitHub Stars](https://img.shields.io/github/stars/F1st3K/EasyVPN.svg)](https://github.com/F1st3K/EasyVPN/stargazers)
[![GitHub contributors](https://img.shields.io/github/contributors/F1st3K/EasyZsV)](https://GitHub.com/F1st3K/EasyZsV/graphs/contributors/)
[![GitHub Stars](https://img.shields.io/github/stars/F1st3K/EasyZsV.svg)](https://github.com/F1st3K/EasyZsV/stargazers)


Простое VPN + Backend + Frontend приложение на одном сервере!
EasyZsV — Защищённые cкоростные Волны? Да Easy!

[![System Design](.img/SystemDesign.excalidraw.svg)**💻 Watch**](https://www.youtube.com/watch?v=nR8FZ8_98pk)

Expand All @@ -35,13 +35,13 @@
</div>

## Single Deploy (docker-compose)
Для развертывания `EasyVPN` на одном единственном сервере используйте `Docker Compose` :
Для развертывания `EasyZsV` на одном единственном сервере используйте `Docker Compose` :

### Production enviroment:

```bash
curl -L -o docker-compose.yml https://raw.githubusercontent.com/F1st3K/EasyVPN/refs/heads/main/docker-compose.yml && \
curl -L -o .env https://raw.githubusercontent.com/F1st3K/EasyVPN/refs/heads/main/.env.dev
curl -L -o docker-compose.yml https://raw.githubusercontent.com/F1st3K/EasyZsV/refs/heads/main/docker-compose.yml && \
curl -L -o .env https://raw.githubusercontent.com/F1st3K/EasyZsV/refs/heads/main/.env.dev
```

> Рекомендуется изменить переменные в `.env`
Expand All @@ -58,7 +58,7 @@ docker-compose up
### Develop enviroment:

```bash
git clone https://github.com/F1st3K/EasyVPN
git clone https://github.com/F1st3K/EasyZsV
```

```bash
Expand All @@ -70,5 +70,5 @@ docker-compose --env-file .env.dev --profile init up --build
docker-compose --env-file .env.dev up --build
```

Так же для независимого развертывания компонентов web-приложения `EasyVPN`, можно воспользоваться документацией для каждого сервиса:
[EasyVPN backend](backend/README.md), [EasyVPN frontend](/frontend/README.md), [EasyVPN init](/init/README.md), а так же остальные [EasyVPN services](/services/README.md).
Так же для независимого развертывания компонентов web-приложения `EasyZsV`, можно воспользоваться документацией для каждого сервиса:
[EasyZsV backend](backend/README.md), [EasyZsV frontend](/frontend/README.md), [EasyZsV init](/init/README.md), а так же остальные [EasyZsV services](/services/README.md).
8 changes: 4 additions & 4 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS builder
WORKDIR /app

COPY . ./
RUN dotnet restore src/EasyVPN.Api/*.csproj
RUN dotnet publish src/EasyVPN.Api/*.csproj -c Release -o build --no-restore
RUN dotnet restore src/EasyZsV.Api/*.csproj
RUN dotnet publish src/EasyZsV.Api/*.csproj -c Release -o build --no-restore

# Build runtime image
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS runner

WORKDIR /usr/local/src/EasyVPN.Api
WORKDIR /usr/local/src/EasyZsV.Api
COPY --from=builder /app/build .

ENTRYPOINT ["dotnet", "EasyVPN.Api.dll"]
ENTRYPOINT ["dotnet", "EasyZsV.Api.dll"]
Loading
Loading