F1st3K · F1st3K · Apr 18, 2025 · Apr 17, 2025 · Apr 17, 2025 · Apr 17, 2025
diff --git a/.env.dev b/.env.dev
@@ -1,5 +1,5 @@
 MAIN_DB_USER=postgres
-MAIN_DB_PASSWORD=mysecretpassword
+MAIN_DB_PASSWORD=p@S$w0rd!
 MAIN_DB_VOLUME=./.data
 
 BACK_HASH_SECRET=super-puper-mega-hash-soltt-solo
@@ -24,4 +24,4 @@ AWG_VOLUME=./.data-awg
 BOT_TOKEN=6618328943:AAEKMZYUJOliAEdBkibrhg8QMMy_xni-jEg
 
 INIT_SECURITY_KEEPER=admin:admin
-INIT_DYNAMIC_PAGES=YES
+INIT_DYNAMIC_PAGES=YES
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## `0.7.2` (2025-04-18)
+
+### Hotfixes
+
+- init: Proceed invalid character in db password
+- frontend: fix env vars, replace to nginx template
+- Single Deploy: add restart always policy
+
 ## `0.7.1` (2025-04-16)
 
 ### Hotfixes

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.1
+0.7.2
diff --git a/backend/src/EasyVPN.Api/EasyVPN.Api.csproj b/backend/src/EasyVPN.Api/EasyVPN.Api.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>

diff --git a/backend/src/EasyVPN.Application/EasyVPN.Application.csproj b/backend/src/EasyVPN.Application/EasyVPN.Application.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyVPN.Domain\EasyVPN.Domain.csproj" />

diff --git a/backend/src/EasyVPN.Contracts/EasyVPN.Contracts.csproj b/backend/src/EasyVPN.Contracts/EasyVPN.Contracts.csproj
@@ -3,6 +3,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 </Project>
diff --git a/backend/src/EasyVPN.Domain/EasyVPN.Domain.csproj b/backend/src/EasyVPN.Domain/EasyVPN.Domain.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ErrorOr" Version="2.0.1" />

diff --git a/backend/src/EasyVPN.Infrastructure/EasyVPN.Infrastructure.csproj b/backend/src/EasyVPN.Infrastructure/EasyVPN.Infrastructure.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\EasyVPN.Application\EasyVPN.Application.csproj" />

diff --git a/backend/tests/UnitTests/EasyVPN.Application.UnitTests/EasyVPN.Application.UnitTests.csproj b/backend/tests/UnitTests/EasyVPN.Application.UnitTests/EasyVPN.Application.UnitTests.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <Version>0.7.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="7.0.0-alpha.4" />

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,8 @@ services:
       dockerfile: Dockerfile
     environment:
       - API=http://backend:80
-      - DB_CONNECTION_STRING=postgresql://${MAIN_DB_USER}:${MAIN_DB_PASSWORD}@database:5432
+      - DB_CONNECTION_STRING=postgresql://${MAIN_DB_USER}@database:5432
+      - DB_PASSWORD=${MAIN_DB_PASSWORD}
       - CREATE_SECURITY_KEEPER=${INIT_SECURITY_KEEPER:-NO}
       - CREATE_DYNAMIC_PAGES=${INIT_DYNAMIC_PAGES:-NO}
     restart: no
@@ -35,7 +36,7 @@ services:
       - POSTGRES_PASSWORD=${MAIN_DB_PASSWORD}
     ports:
       - "5432"
-    restart: unless-stopped
+    restart: always 
     volumes:
       - ${MAIN_DB_VOLUME}:/var/lib/postgresql/data
     networks:
@@ -57,7 +58,7 @@ services:
       - JwtSettings__ExpiryMinutes=${BACK_AUTH_EXPIRE}
       - ConnectionStrings__Postgres=User ID=${MAIN_DB_USER};Password=${MAIN_DB_PASSWORD};Host=database;Port=5432;
       - ASPNETCORE_URLS=http://+:80
-    restart: unless-stopped
+    restart: always
     networks:
       - easy-vpn
 
@@ -72,9 +73,9 @@ services:
       context: frontend/
       dockerfile: Dockerfile
     environment:
-      - REACT_APP_API_URL=http://localhost:${MAIN_PORT}/api/
-      - REACT_APP_AUTH_CHECK_MINUTES=${FRONT_CHECK_AUTH}
-    restart: unless-stopped
+      - API_URL=/api/
+      - AUTH_CHECK_MINUTES=${FRONT_CHECK_AUTH}
+    restart: always
     networks:
       - easy-vpn
 
@@ -109,7 +110,7 @@ services:
             }
         }' > /etc/nginx/nginx.conf && nginx -g 'daemon off;'
       "
-    restart: unless-stopped
+    restart: always
     networks:
       - easy-vpn
 # ╚═══ REGION: Base infractructure services ═══╝
@@ -140,7 +141,7 @@ services:
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
       - net.ipv4.ip_forward=1
-    restart: unless-stopped
+    restart: always
 
   amneziawg-vpn-service:
     image: easyvpn/amneziawg-vpn:latest
@@ -167,7 +168,7 @@ services:
       - net.ipv4.ip_forward=1
     devices:
       - "/dev/net/tun:/dev/net/tun"  # device mapping for TUN interface
-    restart: unless-stopped
+    restart: always
 # ╚═══ REGION: VPN services ═══╝
 
 
@@ -178,5 +179,5 @@ services:
     container_name: bot-service
     environment:
       - BOT_TOKEN=${BOT_TOKEN}
-    restart: unless-stopped
-# ╚═══ REGION: Other services ═══╝
+    restart: always
+# ╚═══ REGION: Other services ═══╝
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -17,4 +17,4 @@ COPY nginx.conf /etc/nginx/conf.d/default.conf
 
 EXPOSE 3000
 
-CMD ["nginx", "-g", "daemon off;"]
+CMD ["/bin/sh", "-c", "envsubst < /usr/share/nginx/html/index.html > /usr/share/nginx/html/_index.html && mv /usr/share/nginx/html/_index.html /usr/share/nginx/html/index.html && exec nginx -g 'daemon off;'"]
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
     "name": "easy-vpn-frontend",
-    "version": "0.7.1",
+    "version": "0.7.2",
     "private": true,
     "dependencies": {
         "@emotion/react": "^11.13.3",

diff --git a/frontend/public/index.html b/frontend/public/index.html
@@ -41,5 +41,12 @@
 
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
-    --></body>
+    -->
+        <script>
+            window.APP_CONFIG = {
+                API_URL: '$API_URL',
+                AUTH_CHECK_MINUTES: '$AUTH_CHECK_MINUTES',
+            };
+        </script>
+    </body>
 </html>
diff --git a/frontend/src/config.ts b/frontend/src/config.ts
@@ -9,11 +9,18 @@ const defaultConfig: AppConfig = {
 };
 
 // Загрузка ENV переменных
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const rawConfig = (window as any).APP_CONFIG || {};
 const config: AppConfig = {
-    ApiUrl: process.env.REACT_APP_API_URL || defaultConfig.ApiUrl,
+    ApiUrl:
+        rawConfig.API_URL && !rawConfig.API_URL.includes('$')
+            ? rawConfig.API_URL
+            : defaultConfig.ApiUrl,
+
     AuthCheckMinutes:
-        Number(process.env.REACT_APP_AUTH_CHECK_MINUTES) ||
-        defaultConfig.AuthCheckMinutes,
+        rawConfig.AUTH_CHECK_MINUTES && !rawConfig.AUTH_CHECK_MINUTES.includes('$')
+            ? Number(rawConfig.AUTH_CHECK_MINUTES)
+            : defaultConfig.AuthCheckMinutes,
 };
 
 export default config;
diff --git a/init/.env.example b/init/.env.example
@@ -1,4 +1,6 @@
 API=http//localhost:80/api
-DB_CONNECTION_STRING="postgresql://postgres:mysecretpassword@localhost:5432"
+DB_CONNECTION_STRING="postgresql://postgres@localhost:5432"
+DB_PASSWORD=mysecretpassword
+
 CREATE_SECURITY_KEEPER=admin:admin
 CREATE_DYNAMIC_PAGES=YES
diff --git a/init/init.sh b/init/init.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-VERSION=0.7.1
+VERSION=0.7.2
 
 echo ""
 echo "🔧 Data Initialization Script"
@@ -20,7 +20,7 @@ done
 
 echo "🔌 Attempting to connect to database..."
 
-export PGPASSWORD="$(echo "$DB_CONNECTION_STRING" | sed -n 's|postgresql://[^:]*:\([^@]*\)@.*|\1|p')"
+export PGPASSWORD="$DB_PASSWORD"
 psql "$DB_CONNECTION_STRING" -c "\dt" > /dev/null 2>&1
 if [ $? -ne 0 ]; then
   echo "❌ Failed to connect to the database!"

diff --git a/services/AmneziaWgVpn/cmd/config.yml b/services/AmneziaWgVpn/cmd/config.yml
@@ -1,6 +1,6 @@
 service:
   name: 'wireguard-vpn'
-  version: '0.7.1'
+  version: '0.7.2'
 api:
   port: "8010"
 vpn:

diff --git a/services/TelegramBot/pyproject.toml b/services/TelegramBot/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "easy-vpn-telegram-bot"
-version = "0.7.1"
+version = "0.7.2"
 description = "Telegram Notification Bot for Easy VPN"
 authors = ["Alex Poryadin (sw1pr0g) <[email protected]>"]
 license = "MIT"

diff --git a/services/WireguardVpn/cmd/config.yml b/services/WireguardVpn/cmd/config.yml
@@ -1,6 +1,6 @@
 service:
   name: 'wireguard-vpn'
-  version: '0.7.1'
+  version: '0.7.2'
 api:
   port: "8000"
 vpn:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,4 +17,4 @@ COPY nginx.conf /etc/nginx/conf.d/default.conf

		EXPOSE 3000

		CMD ["nginx", "-g", "daemon off;"]
		CMD ["/bin/sh", "-c", "envsubst < /usr/share/nginx/html/index.html > /usr/share/nginx/html/_index.html && mv /usr/share/nginx/html/_index.html /usr/share/nginx/html/index.html && exec nginx -g 'daemon off;'"]