eikarna commited on
Commit
2429691
·
1 Parent(s): c7f3388

feat: add flags and fix start scripts

Browse files
Files changed (5) hide show
  1. .gitattributes +1 -0
  2. Dockerfile +1 -0
  3. README.md +1 -1
  4. start.sh +2 -37
  5. zivpn/udp-zivpn-linux-amd64 +3 -0
.gitattributes CHANGED
@@ -1,2 +1,3 @@
1
  udpgw/badvpn-udpgw filter=lfs diff=lfs merge=lfs -text
2
  udp_custom/udp-custom filter=lfs diff=lfs merge=lfs -text
 
 
1
  udpgw/badvpn-udpgw filter=lfs diff=lfs merge=lfs -text
2
  udp_custom/udp-custom filter=lfs diff=lfs merge=lfs -text
3
+ zivpn/udp-zivpn-linux-amd64 filter=lfs diff=lfs merge=lfs -text
Dockerfile CHANGED
@@ -23,6 +23,7 @@ WORKDIR ${APP_HOME}
23
  # - taskset: Untuk mengikat proses ke core CPU (opsional, tapi ada di service asli)
24
  RUN apt-get update && apt-get install -y --no-install-recommends \
25
  iptables \
 
26
  iproute2 \
27
  ethtool \
28
  procps \
 
23
  # - taskset: Untuk mengikat proses ke core CPU (opsional, tapi ada di service asli)
24
  RUN apt-get update && apt-get install -y --no-install-recommends \
25
  iptables \
26
+ python3 \
27
  iproute2 \
28
  ethtool \
29
  procps \
README.md CHANGED
@@ -5,7 +5,7 @@ colorFrom: blue
5
  colorTo: green
6
  sdk: docker
7
  app_port: 7860
8
- docker_args: "--cap-add=NET_ADMIN --cap-add=SYS_NICE"
9
  ---
10
  Mereka memanggil ku seorang pahlawan, karena aku menyelamatkan
11
  mereka dari kehancuran.
 
5
  colorTo: green
6
  sdk: docker
7
  app_port: 7860
8
+ docker_args: "--cap-add=NET_ADMIN --cap-add=SYS_NICE --sysctl net.ipv4.ip_forward=1 --sysctl net.core.rmem_max=16777216 --sysctl net.core.wmem_max=16777216 --sysctl net.core.netdev_max_backlog=5000 --sysctl net.core.somaxconn=65535 --sysctl vm.swappiness=1 --sysctl net.ipv4.tcp_fin_timeout=10 --sysctl net.ipv4.tcp_keepalive_time=60"
9
  ---
10
  Mereka memanggil ku seorang pahlawan, karena aku menyelamatkan
11
  mereka dari kehancuran.
start.sh CHANGED
@@ -57,41 +57,6 @@ echo "Web server IP berjalan di background dengan PID: $WEBSERVER_PID"
57
 
58
  echo "=== Memulai Konfigurasi Server VPN ==="
59
 
60
- # Get the directory where the script is located
61
- SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
62
- PROJECT_ROOT=$(cd -- "$SCRIPT_DIR/.." &> /dev/null && pwd)
63
-
64
- # Path to the ZIVPN binary
65
- ZIVPN_BINARY="$PROJECT_ROOT/zivpn/udp-zivpn-linux-amd64"
66
- ZIVPN_URL="https://github.com/zahidbd2/udp-zivpn/releases/download/udp-zivpn_1.4.9/udp-zivpn-linux-amd64"
67
- ZIVPN_DIR=$(dirname "$ZIVPN_BINARY")
68
-
69
- # Check if the ZIVPN binary exists, and download if it does not
70
- if [ ! -f "$ZIVPN_BINARY" ]; then
71
- echo "ZIVPN binary not found. Downloading..."
72
- # Ensure the directory exists
73
- mkdir -p "$ZIVPN_DIR"
74
- # Download the binary using wget or curl
75
- if command -v wget >/dev/null 2>&1; then
76
- wget -O "$ZIVPN_BINARY" "$ZIVPN_URL"
77
- elif command -v curl >/dev/null 2>&1; then
78
- curl -L -o "$ZIVPN_BINARY" "$ZIVPN_URL"
79
- else
80
- echo "Error: Neither wget nor curl is available to download the ZIVPN binary."
81
- exit 1
82
- fi
83
- # Make the binary executable
84
- if [ -f "$ZIVPN_BINARY" ]; then
85
- chmod +x "$ZIVPN_BINARY"
86
- echo "ZIVPN binary downloaded and made executable."
87
- else
88
- echo "Error: Failed to download ZIVPN binary."
89
- exit 1
90
- fi
91
- else
92
- echo "ZIVPN binary already exists. Skipping download."
93
- fi
94
-
95
  # 1. Mengaktifkan IP Forwarding & Optimasi Kernel (sysctl)
96
  # Opsi ini sebaiknya diatur saat menjalankan kontainer dengan flag --sysctl
97
  # Namun, kita tetap menjalankannya di sini untuk memastikan.
@@ -160,7 +125,7 @@ echo "=== Semua layanan telah dimulai ==="
160
  echo "PID: webserver=$WEBSERVER_PID, badvpn=$BADVPN_PID, udp-custom=$UDP_CUSTOM_PID, zivpn=$ZIVPN_PID"
161
 
162
  # 6. Tunggu sinyal keluar dan bersihkan
163
- trap "echo 'Menutup layanan...'; kill $WEBSERVER_PID $BADVPN_PID $UDP_CUSTOM_PID $ZIVPN_PID; exit 0" SIGINT SIGTERM
164
 
165
  # Tunggu semua proses background selesai
166
  # fg %1 akan membawa proses pertama ke foreground, menjaga kontainer tetap berjalan
@@ -168,4 +133,4 @@ trap "echo 'Menutup layanan...'; kill $WEBSERVER_PID $BADVPN_PID $UDP_CUSTOM_PID
168
  wait $WEBSERVER_PID
169
  wait $BADVPN_PID
170
  wait $UDP_CUSTOM_PID
171
- wait $ZIVPN_PID
 
57
 
58
  echo "=== Memulai Konfigurasi Server VPN ==="
59
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
60
  # 1. Mengaktifkan IP Forwarding & Optimasi Kernel (sysctl)
61
  # Opsi ini sebaiknya diatur saat menjalankan kontainer dengan flag --sysctl
62
  # Namun, kita tetap menjalankannya di sini untuk memastikan.
 
125
  echo "PID: webserver=$WEBSERVER_PID, badvpn=$BADVPN_PID, udp-custom=$UDP_CUSTOM_PID, zivpn=$ZIVPN_PID"
126
 
127
  # 6. Tunggu sinyal keluar dan bersihkan
128
+ # trap "echo 'Menutup layanan...'; kill $WEBSERVER_PID $BADVPN_PID $UDP_CUSTOM_PID $ZIVPN_PID; exit 0" SIGINT SIGTERM
129
 
130
  # Tunggu semua proses background selesai
131
  # fg %1 akan membawa proses pertama ke foreground, menjaga kontainer tetap berjalan
 
133
  wait $WEBSERVER_PID
134
  wait $BADVPN_PID
135
  wait $UDP_CUSTOM_PID
136
+ wait $ZIVPN_PID
zivpn/udp-zivpn-linux-amd64 ADDED
@@ -0,0 +1,3 @@
 
 
 
 
1
+ version https://git-lfs.github.com/spec/v1
2
+ oid sha256:df6658c195882ff2f6cefb44050e8cb2c238ceb2b6e3fbefb931698f4f0519cb
3
+ size 11329536