Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bd17e5cd14 | |||
| c3975549db |
+1
-1
@@ -180,7 +180,7 @@ server-key = /certs/cert_private
|
|||||||
# the isolation was tested at. If you get random failures on worker processes, try
|
# the isolation was tested at. If you get random failures on worker processes, try
|
||||||
# disabling that option and report the failures you, along with system and debugging
|
# disabling that option and report the failures you, along with system and debugging
|
||||||
# information at: https://gitlab.com/openconnect/ocserv/issues
|
# information at: https://gitlab.com/openconnect/ocserv/issues
|
||||||
isolate-workers = true
|
isolate-workers = false
|
||||||
|
|
||||||
# A banner to be displayed on clients after connection
|
# A banner to be displayed on clients after connection
|
||||||
#banner = "Welcome"
|
#banner = "Welcome"
|
||||||
|
|||||||
@@ -462,11 +462,6 @@ services:
|
|||||||
default:
|
default:
|
||||||
ipv4_address: 10.10.0.11
|
ipv4_address: 10.10.0.11
|
||||||
logging: *default-logging
|
logging: *default-logging
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpus: '0.50'
|
|
||||||
memory: 200M
|
|
||||||
np:
|
np:
|
||||||
image: mercurykd/vpnbot-np:1.1
|
image: mercurykd/vpnbot-np:1.1
|
||||||
build:
|
build:
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
b:
|
b:
|
||||||
docker compose build
|
docker compose build
|
||||||
u: # запуск контейнеров
|
u: # запуск контейнеров
|
||||||
|
$(eval IP := $(shell curl -s -t 1 2ip.io || curl -s -t 1 ipinfo.io/ip || curl -s -t 1 ifconfig.me))
|
||||||
bash ./update/update.sh &
|
bash ./update/update.sh &
|
||||||
touch ./override.env
|
touch ./override.env
|
||||||
IP=$(shell curl ipinfo.io/ip) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
|
IP=$(IP) VER=$(shell git describe --tags) docker compose --env-file ./.env --env-file ./override.env up -d --force-recreate
|
||||||
d: # остановка контейнеров
|
d: # остановка контейнеров
|
||||||
-kill -9 $(shell cat ./update/update_pid) > /dev/null
|
-kill -9 $(shell cat ./update/update_pid) > /dev/null
|
||||||
docker compose down --remove-orphans
|
docker compose down --remove-orphans
|
||||||
|
|||||||
Reference in New Issue
Block a user