From 9f218c9f327e9941a9b255747a98cd91006f2acb Mon Sep 17 00:00:00 2001 From: mercury Date: Mon, 29 Apr 2024 20:27:26 +0400 Subject: [PATCH 1/3] chmod +x *.sh --- mirror/start_socat.sh | 0 scripts/block_exchange.sh | 0 scripts/block_torrent.sh | 0 scripts/check_file.sh | 0 scripts/dns_close_53_port.sh | 0 scripts/dns_open_53_port.sh | 0 scripts/init.sh | 0 scripts/install_as_service.sh | 0 scripts/reset_wg.sh | 0 scripts/start_ad.sh | 0 scripts/start_ng.sh | 0 scripts/start_np.sh | 0 scripts/start_oc.sh | 0 scripts/start_php.sh | 0 scripts/start_proxy.sh | 0 scripts/start_service.sh | 0 scripts/start_ss.sh | 0 scripts/start_tg.sh | 0 scripts/start_upstream.sh | 0 scripts/start_wg.sh | 0 scripts/start_wp.sh | 0 scripts/start_xray.sh | 0 update/update.sh | 0 23 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 mirror/start_socat.sh mode change 100644 => 100755 scripts/block_exchange.sh mode change 100644 => 100755 scripts/block_torrent.sh mode change 100644 => 100755 scripts/check_file.sh mode change 100644 => 100755 scripts/dns_close_53_port.sh mode change 100644 => 100755 scripts/dns_open_53_port.sh mode change 100644 => 100755 scripts/init.sh mode change 100644 => 100755 scripts/install_as_service.sh mode change 100644 => 100755 scripts/reset_wg.sh mode change 100644 => 100755 scripts/start_ad.sh mode change 100644 => 100755 scripts/start_ng.sh mode change 100644 => 100755 scripts/start_np.sh mode change 100644 => 100755 scripts/start_oc.sh mode change 100644 => 100755 scripts/start_php.sh mode change 100644 => 100755 scripts/start_proxy.sh mode change 100644 => 100755 scripts/start_service.sh mode change 100644 => 100755 scripts/start_ss.sh mode change 100644 => 100755 scripts/start_tg.sh mode change 100644 => 100755 scripts/start_upstream.sh mode change 100644 => 100755 scripts/start_wg.sh mode change 100644 => 100755 scripts/start_wp.sh mode change 100644 => 100755 scripts/start_xray.sh mode change 100644 => 100755 update/update.sh diff --git a/mirror/start_socat.sh b/mirror/start_socat.sh old mode 100644 new mode 100755 diff --git a/scripts/block_exchange.sh b/scripts/block_exchange.sh old mode 100644 new mode 100755 diff --git a/scripts/block_torrent.sh b/scripts/block_torrent.sh old mode 100644 new mode 100755 diff --git a/scripts/check_file.sh b/scripts/check_file.sh old mode 100644 new mode 100755 diff --git a/scripts/dns_close_53_port.sh b/scripts/dns_close_53_port.sh old mode 100644 new mode 100755 diff --git a/scripts/dns_open_53_port.sh b/scripts/dns_open_53_port.sh old mode 100644 new mode 100755 diff --git a/scripts/init.sh b/scripts/init.sh old mode 100644 new mode 100755 diff --git a/scripts/install_as_service.sh b/scripts/install_as_service.sh old mode 100644 new mode 100755 diff --git a/scripts/reset_wg.sh b/scripts/reset_wg.sh old mode 100644 new mode 100755 diff --git a/scripts/start_ad.sh b/scripts/start_ad.sh old mode 100644 new mode 100755 diff --git a/scripts/start_ng.sh b/scripts/start_ng.sh old mode 100644 new mode 100755 diff --git a/scripts/start_np.sh b/scripts/start_np.sh old mode 100644 new mode 100755 diff --git a/scripts/start_oc.sh b/scripts/start_oc.sh old mode 100644 new mode 100755 diff --git a/scripts/start_php.sh b/scripts/start_php.sh old mode 100644 new mode 100755 diff --git a/scripts/start_proxy.sh b/scripts/start_proxy.sh old mode 100644 new mode 100755 diff --git a/scripts/start_service.sh b/scripts/start_service.sh old mode 100644 new mode 100755 diff --git a/scripts/start_ss.sh b/scripts/start_ss.sh old mode 100644 new mode 100755 diff --git a/scripts/start_tg.sh b/scripts/start_tg.sh old mode 100644 new mode 100755 diff --git a/scripts/start_upstream.sh b/scripts/start_upstream.sh old mode 100644 new mode 100755 diff --git a/scripts/start_wg.sh b/scripts/start_wg.sh old mode 100644 new mode 100755 diff --git a/scripts/start_wp.sh b/scripts/start_wp.sh old mode 100644 new mode 100755 diff --git a/scripts/start_xray.sh b/scripts/start_xray.sh old mode 100644 new mode 100755 diff --git a/update/update.sh b/update/update.sh old mode 100644 new mode 100755 From 8091eb497135bddf94e8f3004428b8eb02ad2bfe Mon Sep 17 00:00:00 2001 From: mercury Date: Wed, 5 Jun 2024 10:35:15 +0400 Subject: [PATCH 2/3] fix go version --- dockerfile/wireguard.dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dockerfile/wireguard.dockerfile b/dockerfile/wireguard.dockerfile index 86d0a92..e8f13e1 100644 --- a/dockerfile/wireguard.dockerfile +++ b/dockerfile/wireguard.dockerfile @@ -1,6 +1,8 @@ ARG image FROM $image -RUN apk add --no-cache --virtual .build-deps alpine-sdk git go \ +COPY --from=golang:1.22.3-alpine /usr/local/go/ /usr/local/go/ +ENV PATH="/usr/local/go/bin:${PATH}" +RUN apk add --no-cache --virtual .build-deps alpine-sdk git \ && apk add iproute2 linux-headers iptables xtables-addons openssh wireguard-tools jq bash htop \ && git clone https://github.com/amnezia-vpn/amneziawg-go \ && git clone https://github.com/amnezia-vpn/amneziawg-tools.git \ From 9662fc9d55c2a774dd235bfe3777405e01afad66 Mon Sep 17 00:00:00 2001 From: mercury Date: Sun, 7 Jul 2024 15:35:43 +0400 Subject: [PATCH 3/3] fix autobackup hint --- app/bot.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/bot.php b/app/bot.php index 9badcda..7172985 100644 --- a/app/bot.php +++ b/app/bot.php @@ -4706,9 +4706,13 @@ DNS-over-HTTPS with IP: 'callback_data' => "/import", ], ]; + $backup = array_filter(explode('/', $conf['backup'])); + if (!empty($backup)) { + $backup = "{$backup[0]} start / {$backup[1]} period"; + } $data[] = [ [ - 'text' => $this->i18n('backup') . ': ' . (implode(' / ', explode('/', $conf['backup'])) ?: $this->i18n('off')), + 'text' => $this->i18n('backup') . ': ' . ($backup ?: $this->i18n('off')), 'callback_data' => "/backup", ], ]; @@ -4847,9 +4851,9 @@ DNS-over-HTTPS with IP: { $r = $this->send( $this->input['chat'], - "@{$this->input['username']} enter like 1 day/00:00", + "@{$this->input['username']} enter like start / period", $this->input['message_id'], - reply: 'enter like 1 day/00:00', + reply: 'enter like now / 12:00', ); $_SESSION['reply'][$r['result']['message_id']] = [ 'start_message' => $this->input['message_id'],