time Location - local

docker container

Co-authored-by: Dmitrij Vinogradov <dmitrij.vinogradov@gmail.com>

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

Dockerfile

@@ -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" ]

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

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

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>

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: [

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":         "",