Refactor scripts and traefik

Author: snoups

.env.example

@@ -6,5 +6,4 @@ BOT_DOMAIN=3xui-shop.com
 XUI_USERNAME=admin
 XUI_PASSWORD=admin
 
-CF_API_KEY=key
-CF_API_EMAIL=[email protected]
+LETSENCRYPT_EMAIL=[email protected]

.gitignore

@@ -171,4 +171,6 @@ cython_debug/
 *.gz
 
 # Plans
-plans.json
+plans.json
+
+tmp_test/

README.md

@@ -102,7 +102,7 @@ Before starting the installation, make sure you have the installed [**Docker**](
 
 1. **Clone the repository:**
    ```bash
-   git clone https://github.com/snoups/3xui-shop.git
+   bash <(curl -Ls https://raw.githubusercontent.com/snoups/3xui-shop/main/scripts/install.sh) -q
    cd 3xui-shop
    ```
 
@@ -130,6 +130,8 @@ Before starting the installation, make sure you have the installed [**Docker**](
 
 | Variable | Required | Default | Description |
 |-|-|-|-|
+| LETSENCRYPT_EMAIL | 🔴 | - | Email for generating certificates |
+| | | |
 | BOT_TOKEN | 🔴 | - | Telegram bot token |
 | BOT_ADMINS | ⭕ | - | List of admin IDs (e.g., 123456789,987654321) |
 | BOT_DEV_ID | 🔴 | - | ID of the bot developer |
@@ -167,9 +169,7 @@ Before starting the installation, make sure you have the installed [**Docker**](
 | LOG_LEVEL | ⭕ | DEBUG | Log level (e.g., INFO, DEBUG) |
 | LOG_FORMAT | ⭕ | %(asctime)s \| %(name)s \| %(levelname)s \| %(message)s | Log format |
 | LOG_ARCHIVE_FORMAT | ⭕ | zip | Log archive format (e.g., zip, gz) |
-| | | |
-| CF_API_KEY | 🔴 | - | Cloudflare API key |
-| CF_API_EMAIL | 🔴 | - | Cloudflare API email |
+
 
 ### Subscription Plans Configuration
 
@@ -209,23 +209,6 @@ Before starting the installation, make sure you have the installed [**Docker**](
 }
 ```
 
-### Cloudflare Configuration
-
-1. **Domain and SSL/TLS Setup:**
-   
-    - Add an A record in the DNS section:
-        - Name: Your bot’s subdomain (e.g., bot)
-        - IPv4 address: Your server’s IP address
-        - Proxy status: DNS only (disable proxy)
-    - Enable Full (strict) SSL/TLS mode under the SSL/TLS section.
-
-2. **Environment Variables Setup:**
-
-    - Visit the [API Tokens](https://dash.cloudflare.com/profile/api-tokens) page.
-    - Click `View Global API Key` and set:
-        - `CF_API_KEY`: Your global API key
-        - `CF_API_EMAIL`: Your Cloudflare email
-
 ### YooKassa Configuration
 
 1. **Webhook Setup:**
@@ -259,10 +242,10 @@ Before starting the installation, make sure you have the installed [**Docker**](
 
 To ensure the bot functions correctly, you must configure the 3X-UI panel:
 
-- [Set up SSL certificates from Cloudflare.](https://github.com/MHSanaei/3x-ui?tab=readme-ov-file#ssl-certificate)
+- [Set up SSL certificate.](https://github.com/MHSanaei/3x-ui?tab=readme-ov-file#ssl-certificate)
 - Set up an Inbound **(the first one will be used)** for adding clients.
 - Enable the subscription service with port `2096` and path `/user/`.
-    > **Don’t forget to specify certificates for the subscription.**
+    > **Don’t forget to specify certificate for the subscription.**
 - Disabling configuration encryption is recommended.
 
 <a id="bugs-and-feature-requests"></a>

docker-compose.yml

@@ -8,9 +8,6 @@ services:
       - "443:443"
     env_file:
       - .env
-    environment:
-      - CLOUDFLARE_API_KEY=${CF_API_KEY}
-      - CLOUDFLARE_API_EMAIL=${CF_API_EMAIL}
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - "letsencrypt_data:/letsencrypt"
@@ -19,9 +16,9 @@ services:
       - "--entrypoints.websecure.address=:443"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
-      - "--certificatesresolvers.letsencrypt.acme.email=${CF_API_EMAIL}"
+      - "--certificatesresolvers.letsencrypt.acme.email=${LETSENCRYPT_EMAIL}"
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
-      - "--certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare"
+      - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
       - "--log.level=INFO"
     labels:
       - "traefik.enable=true"

scripts/delete_logs.sh

@@ -1,27 +1,54 @@
 #!/bin/bash
-# Script to delete .log files in a specified directory.
 
-# Default directory for logs
+# delete_logs.sh
+# -----------------------------------------------------------------------------
+# Script to delete .log, .zip, and .gz files from a specified directory.
+#
+# Options:
+#     --dir PATH   Specify the directory to clean logs and archives from (default: app/logs).
+#     --help       Display this help message.
+# -----------------------------------------------------------------------------
+
 DEFAULT_LOG_DIR="app/logs"
+LOG_DIR="$DEFAULT_LOG_DIR"
+
+show_help() {
+    grep '^#' "$0" | cut -c 5-
+}
 
-# Use the provided directory path or default to the predefined one
-LOG_DIR="${1:-$DEFAULT_LOG_DIR}"
+while [[ $# -gt 0 ]]; do
+    case "$1" in
+        --dir)
+            shift
+            if [[ -n "$1" ]]; then
+                LOG_DIR="$1"
+                shift
+            else
+                echo "❌ Error: --dir flag requires a directory path." >&2
+                exit 1
+            fi
+            ;;
+        --help)
+            show_help
+            exit 0
+            ;;
+        *)
+            echo "❌ Error: Unknown option '$1'. Use --help for usage information." >&2
+            exit 1
+            ;;
+    esac
+done
 
-# Check if the directory exists
-if [ -d "$LOG_DIR" ]; then
-    echo "Looking for .log files in: $LOG_DIR"
-    
-    # Find and delete all .log files
-    find "$LOG_DIR" -type f -name "*.log" -exec rm -f {} +
+if [[ -d "$LOG_DIR" ]]; then
+    echo "🔍 Searching for .log, .zip, and .gz files in: $LOG_DIR"
 
-    # Verify if deletion succeeded
-    if [ $? -eq 0 ]; then
-        echo "All .log files were successfully deleted from: $LOG_DIR"
+    if find "$LOG_DIR" -type f \( -name "*.log" -o -name "*.zip" -o -name "*.gz" \) -exec rm -f {} +; then
+        echo "✅ All .log, .zip, and .gz files were successfully deleted from: $LOG_DIR"
     else
-        echo "Error: Failed to delete some .log files." >&2
+        echo "❌ Failed to delete some files." >&2
         exit 1
     fi
 else
-    echo "Error: Directory '$LOG_DIR' does not exist." >&2
+    echo "❌ Directory '$LOG_DIR' does not exist." >&2
     exit 1
 fi