v2.5.0: maintenance and bot user management

lib/backup.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# GoTelegram v2.4 — backup and restore (i18n-aware)
+# GoTelegram v2.5.0 — backup and restore (i18n-aware)
 
 # ── Создание бекапа ──────────────────────────────────────────────────────────
 create_backup() {
@@ -35,13 +35,16 @@ create_backup() {
         cp "$NGINX_SITE_CONF" "$tmp_dir/nginx.conf"
     fi
 
-    # SSL сертификаты
+    # SSL сертификаты и renewal metadata для переносов между VPS
     local domain
     domain=$(config_get domain 2>/dev/null)
     if [ -n "$domain" ] && [ -d "/etc/letsencrypt/live/$domain" ]; then
-        mkdir -p "$tmp_dir/certs"
-        cp "/etc/letsencrypt/live/$domain/fullchain.pem" "$tmp_dir/certs/" 2>/dev/null
-        cp "/etc/letsencrypt/live/$domain/privkey.pem" "$tmp_dir/certs/" 2>/dev/null
+        mkdir -p "$tmp_dir/letsencrypt/live" "$tmp_dir/letsencrypt/archive" "$tmp_dir/letsencrypt/renewal"
+        cp -a "/etc/letsencrypt/live/$domain" "$tmp_dir/letsencrypt/live/" 2>/dev/null
+        [ -d "/etc/letsencrypt/archive/$domain" ] && \
+            cp -a "/etc/letsencrypt/archive/$domain" "$tmp_dir/letsencrypt/archive/" 2>/dev/null
+        [ -f "/etc/letsencrypt/renewal/$domain.conf" ] && \
+            cp -a "/etc/letsencrypt/renewal/$domain.conf" "$tmp_dir/letsencrypt/renewal/" 2>/dev/null
         log_dim "SSL сертификаты включены"
     fi
 
@@ -52,6 +55,28 @@ create_backup() {
         log_dim "$(_t_or backup_site_included 'Шаблон сайта включён')"
     fi
 
+    # Custom templates and catalog
+    if [ -d "$GOTELEGRAM_DIR/custom_templates" ]; then
+        mkdir -p "$tmp_dir/custom_templates"
+        cp -a "$GOTELEGRAM_DIR/custom_templates/." "$tmp_dir/custom_templates/" 2>/dev/null
+    fi
+    if [ -f "$GOTELEGRAM_DIR/templates_catalog.json" ]; then
+        cp "$GOTELEGRAM_DIR/templates_catalog.json" "$tmp_dir/templates_catalog.json" 2>/dev/null
+    fi
+
+    # Bot state (.env has BotFather token, so encrypted backups are strongly recommended)
+    if [ -d "$BOT_DIR" ]; then
+        mkdir -p "$tmp_dir/bot"
+        [ -f "$BOT_DIR/.env" ] && cp "$BOT_DIR/.env" "$tmp_dir/bot/.env" 2>/dev/null
+        [ -f "$BOT_DIR/i18n.py" ] && cp "$BOT_DIR/i18n.py" "$tmp_dir/bot/i18n.py" 2>/dev/null
+        [ -d "$BOT_DIR/lang" ] && cp -a "$BOT_DIR/lang" "$tmp_dir/bot/" 2>/dev/null
+    fi
+
+    # Traffic history
+    if [ -f "$GOTELEGRAM_DIR/stats_history.csv" ]; then
+        cp "$GOTELEGRAM_DIR/stats_history.csv" "$tmp_dir/stats_history.csv" 2>/dev/null
+    fi
+
     # Метаданные
     local ip mode engine lang port domain
     ip=$(get_server_ip)
@@ -65,7 +90,7 @@ create_backup() {
 
     cat > "$tmp_dir/metadata.json" << EOMETA
 {
-    "backup_version": "1.1",
+    "backup_version": "1.2",
     "gotelegram_version": "$GOTELEGRAM_VERSION",
     "created_at": "$(date -Iseconds)",
     "hostname": "$(hostname)",
@@ -231,8 +256,14 @@ restore_backup() {
         log_success "$(_t_or backup_restored_nginx 'nginx конфиг восстановлен')"
     fi
 
-    # Восстанавливаем SSL
-    if [ -d "$backup_dir/certs" ]; then
+    # Восстанавливаем SSL / Let's Encrypt structure
+    if [ -d "$backup_dir/letsencrypt" ]; then
+        mkdir -p /etc/letsencrypt/live /etc/letsencrypt/archive /etc/letsencrypt/renewal
+        [ -d "$backup_dir/letsencrypt/live" ] && cp -a "$backup_dir/letsencrypt/live/." /etc/letsencrypt/live/ 2>/dev/null
+        [ -d "$backup_dir/letsencrypt/archive" ] && cp -a "$backup_dir/letsencrypt/archive/." /etc/letsencrypt/archive/ 2>/dev/null
+        [ -d "$backup_dir/letsencrypt/renewal" ] && cp -a "$backup_dir/letsencrypt/renewal/." /etc/letsencrypt/renewal/ 2>/dev/null
+        log_success "$(_t_or backup_restored_ssl 'SSL сертификаты восстановлены')"
+    elif [ -d "$backup_dir/certs" ]; then
         local domain
         domain=$(config_get domain 2>/dev/null)
         if [ -n "$domain" ]; then
@@ -251,11 +282,38 @@ restore_backup() {
         log_success "$(_t_or backup_restored_site 'Шаблон сайта восстановлен')"
     fi
 
+    # Восстанавливаем custom templates/catalog/statistics
+    if [ -d "$backup_dir/custom_templates" ]; then
+        mkdir -p "$GOTELEGRAM_DIR/custom_templates"
+        cp -a "$backup_dir/custom_templates/." "$GOTELEGRAM_DIR/custom_templates/" 2>/dev/null
+        log_success "Пользовательские шаблоны восстановлены"
+    fi
+    if [ -f "$backup_dir/templates_catalog.json" ]; then
+        cp "$backup_dir/templates_catalog.json" "$GOTELEGRAM_DIR/templates_catalog.json" 2>/dev/null
+    fi
+    if [ -f "$backup_dir/stats_history.csv" ]; then
+        cp "$backup_dir/stats_history.csv" "$GOTELEGRAM_DIR/stats_history.csv" 2>/dev/null
+        log_success "История статистики восстановлена"
+    fi
+
+    # Восстанавливаем состояние бота
+    if [ -d "$backup_dir/bot" ]; then
+        mkdir -p "$BOT_DIR"
+        [ -f "$backup_dir/bot/.env" ] && cp "$backup_dir/bot/.env" "$BOT_DIR/.env" 2>/dev/null && chmod 600 "$BOT_DIR/.env"
+        [ -d "$backup_dir/bot/lang" ] && cp -a "$backup_dir/bot/lang" "$BOT_DIR/" 2>/dev/null
+        [ -f "$backup_dir/bot/i18n.py" ] && cp "$backup_dir/bot/i18n.py" "$BOT_DIR/i18n.py" 2>/dev/null
+        log_success "Конфигурация Telegram-бота восстановлена"
+    fi
+
     # Запускаем сервисы
+    if is_telemt_installed && [ ! -f "/etc/systemd/system/${TELEMT_SERVICE}.service" ]; then
+        install_telemt_service
+    fi
     if is_telemt_installed; then
         start_telemt
     fi
-    systemctl start nginx 2>/dev/null
+    command -v nginx &>/dev/null && systemctl start nginx 2>/dev/null
+    systemctl restart gotelegram-bot 2>/dev/null || true
 
     # Очистка
     rm -rf "$tmp_dir"