time Location - local

fail2ban service in docker container (#2632 )
docker container Co-authored-by: Dmitrij Vinogradov <dmitrij.vinogradov@gmail.com>
2025-12-27 00:32:42 +00:00 · 2025-01-11 15:13:49 +01:00 · 2025-01-11 13:41:48 +01:00 · 2025-01-11 13:39:32 +01:00 · 2025-01-11 13:38:26 +01:00
8 changed files with 12 additions and 6 deletions
--- a/DockerEntrypoint.sh
+++ b/DockerEntrypoint.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 # Start fail2ban
-fail2ban-client -x start
+[ $X_UI_ENABLE_FAIL2BAN == "true" ] && fail2ban-client -x start

 # Run x-ui
 exec /app/x-ui
--- a/1
+++ b/1
@ -48,6 +48,7 @@ RUN chmod +x \
  /app/x-ui \
  /usr/bin/x-ui

+ENV X_UI_ENABLE_FAIL2BAN="true"
 VOLUME [ "/etc/x-ui" ]
 CMD [ "./x-ui" ]
 ENTRYPOINT [ "/app/DockerEntrypoint.sh" ]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -11,6 +11,7 @@ services:
      - $PWD/cert/:/root/cert/
    environment:
      XRAY_VMESS_AEAD_FORCED: "false"
+      X_UI_ENABLE_FAIL2BAN: "true"
    tty: true
    network_mode: host
    restart: unless-stopped
--- a/web/assets/css/custom.min.css
+++ b/web/assets/css/custom.min.css
--- a/web/assets/js/model/setting.js
+++ b/web/assets/js/model/setting.js
@ -43,7 +43,7 @@ class AllSetting {
        this.subJsonMux = "";
        this.subJsonRules = "";

-        this.timeLocation = "Asia/Tehran";
+        this.timeLocation = "Local";

        if (data == null) {
            return
--- a/web/html/xui/form/stream/stream_xhttp.html
+++ b/web/html/xui/form/stream/stream_xhttp.html
@ -17,7 +17,7 @@
            </a-input>
            <a-input style="width: 50%" v-model.trim="header.value"
                placeholder='{{ i18n "pages.inbounds.stream.general.value" }}'>
-                <a-button slot="addonAfter" size="small" @click="inbound.stream.xhttp.removeHeader(index)">-</a-button>
+                <a-button icon="minus" slot="addonAfter" size="small" @click="inbound.stream.xhttp.removeHeader(index)"></a-button>
            </a-input>
        </a-input-group>
    </a-form-item>
--- a/web/html/xui/xray.html
+++ b/web/html/xui/xray.html
@ -916,7 +916,9 @@
                    { label: '🇨🇳 China', value: 'geosite:cn' },
                    { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
                    { label: '🇷🇺 Russia', value: 'ext:geosite_RU.dat:ru-available-only-inside' },
-                    { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
+                    { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru$' },
+                    { label: '🇷🇺 .su', value: 'regexp:.*\\.su$' },
+                    { label: '🇷🇺 .рф', value: 'regexp:.*\\.xn--p1ai$' },
                    { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
                ],
                BlockDomainsOptions: [
@ -933,6 +935,8 @@
                    { label: '🇨🇳 .cn', value: 'regexp:.*\\.cn$' },
                    { label: '🇷🇺 Russia', value: 'ext:geosite_RU.dat:ru-available-only-inside' },
                    { label: '🇷🇺 .ru', value: 'regexp:.*\\.ru' },
+                    { label: '🇷🇺 .su', value: 'regexp:.*\\.su$' },
+                    { label: '🇷🇺 .рф', value: 'regexp:.*\\.xn--p1ai$' },
                    { label: '🇻🇳 .vn', value: 'regexp:.*\\.vn$' },
                ],
                ServicesOptions: [
--- a/web/service/setting.go
+++ b/web/service/setting.go
@ -37,7 +37,7 @@ var defaultValueMap = map[string]string{
 	"expireDiff":         "0",
 	"trafficDiff":        "0",
 	"remarkModel":        "-ieo",
-	"timeLocation":       "Asia/Tehran",
+	"timeLocation":       "Local",
 	"tgBotEnable":        "false",
 	"tgBotToken":         "",
 	"tgBotProxy":         "",
Author	SHA1	Message	Date
mhsanaei	783f1a073e	time Location - local	2025-01-11 15:13:49 +01:00
Dmitiry Vinogradov	a4c38ec8ae	fail2ban service in docker container (#2632 ) docker container Co-authored-by: Dmitrij Vinogradov <dmitrij.vinogradov@gmail.com>	2025-01-11 13:41:48 +01:00
Igor Semenov	0c47771671	Add Russian domains (#2635 ) Add Russian domains	2025-01-11 13:39:32 +01:00
Tara Rostami	67920a1962	Minor Fixes (UI) (#2636 ) * Minor Fixes (UI) * Update custom.min.css	2025-01-11 13:38:26 +01:00