Renombrar FlotillasGPS a ADAN en todo el proyecto
This commit is contained in:
FlotillasGPS Developer
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Script de Backup
|
||||
# Sistema de ADAN - Script de Backup
|
||||
# ============================================
|
||||
# Realiza backup de base de datos y configuracion
|
||||
#
|
||||
@@ -27,8 +27,8 @@ NC='\033[0m'
|
||||
# ---------------------------------------------
|
||||
# Variables de Configuracion
|
||||
# ---------------------------------------------
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/flotillas}"
|
||||
BACKUP_DIR="${BACKUP_DIR:-/var/backups/flotillas}"
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/adan}"
|
||||
BACKUP_DIR="${BACKUP_DIR:-/var/backups/adan}"
|
||||
RETENTION_DAYS="${BACKUP_RETENTION_DAYS:-7}"
|
||||
|
||||
# Cargar variables de entorno
|
||||
@@ -39,8 +39,8 @@ fi
|
||||
# Base de datos
|
||||
DB_HOST="${POSTGRES_HOST:-localhost}"
|
||||
DB_PORT="${POSTGRES_PORT:-5432}"
|
||||
DB_NAME="${POSTGRES_DB:-flotillas}"
|
||||
DB_USER="${POSTGRES_USER:-flotillas}"
|
||||
DB_NAME="${POSTGRES_DB:-adan}"
|
||||
DB_USER="${POSTGRES_USER:-adan}"
|
||||
DB_PASSWORD="${POSTGRES_PASSWORD:-}"
|
||||
|
||||
# S3 (opcional)
|
||||
@@ -50,7 +50,7 @@ S3_ENDPOINT="${S3_ENDPOINT:-https://s3.amazonaws.com}"
|
||||
|
||||
# Timestamp para este backup
|
||||
TIMESTAMP=$(date +%Y%m%d_%H%M%S)
|
||||
BACKUP_NAME="flotillas_${TIMESTAMP}"
|
||||
BACKUP_NAME="adan_${TIMESTAMP}"
|
||||
|
||||
# Flags
|
||||
FULL_BACKUP=false
|
||||
@@ -228,8 +228,8 @@ backup_config() {
|
||||
"$INSTALL_DIR/deploy"
|
||||
"/opt/traccar/conf/traccar.xml"
|
||||
"/opt/mediamtx/mediamtx.yml"
|
||||
"/etc/mosquitto/conf.d/flotillas.conf"
|
||||
"/etc/systemd/system/flotillas-*.service"
|
||||
"/etc/mosquitto/conf.d/adan.conf"
|
||||
"/etc/systemd/system/adan-*.service"
|
||||
"/etc/systemd/system/mediamtx.service"
|
||||
)
|
||||
|
||||
@@ -290,7 +290,7 @@ rotate_backups() {
|
||||
while IFS= read -r -d '' file; do
|
||||
rm -f "$file"
|
||||
((deleted++))
|
||||
done < <(find "$BACKUP_DIR/daily" -type f -name "flotillas_*.gz" -mtime +${RETENTION_DAYS} -print0 2>/dev/null)
|
||||
done < <(find "$BACKUP_DIR/daily" -type f -name "adan_*.gz" -mtime +${RETENTION_DAYS} -print0 2>/dev/null)
|
||||
|
||||
if [[ $deleted -gt 0 ]]; then
|
||||
log_info "Eliminados $deleted backups antiguos"
|
||||
@@ -356,7 +356,7 @@ create_backup_index() {
|
||||
|
||||
# Cabecera
|
||||
cat > "$index_file" <<EOF
|
||||
# Indice de Backups - Sistema de Flotillas
|
||||
# Indice de Backups - Sistema de ADAN
|
||||
# Generado: $(date)
|
||||
# Retencion: ${RETENTION_DAYS} dias
|
||||
#
|
||||
@@ -426,7 +426,7 @@ send_notification() {
|
||||
curl -s -X POST \
|
||||
"https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN}/sendMessage" \
|
||||
-d chat_id="${TELEGRAM_CHAT_ID}" \
|
||||
-d text="${emoji} Backup Flotillas: ${message}" \
|
||||
-d text="${emoji} Backup ADAN: ${message}" \
|
||||
> /dev/null 2>&1
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Health Check
|
||||
# Sistema de ADAN - Health Check
|
||||
# ============================================
|
||||
# Verifica el estado de todos los servicios
|
||||
#
|
||||
@@ -19,7 +19,7 @@ BLUE='\033[0;34m'
|
||||
NC='\033[0m'
|
||||
|
||||
# Variables
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/flotillas}"
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/adan}"
|
||||
VERBOSE=false
|
||||
JSON_OUTPUT=false
|
||||
EXIT_CODE=0
|
||||
@@ -81,8 +81,8 @@ check_url() {
|
||||
check_db() {
|
||||
local host="${POSTGRES_HOST:-localhost}"
|
||||
local port="${POSTGRES_PORT:-5432}"
|
||||
local db="${POSTGRES_DB:-flotillas}"
|
||||
local user="${POSTGRES_USER:-flotillas}"
|
||||
local db="${POSTGRES_DB:-adan}"
|
||||
local user="${POSTGRES_USER:-adan}"
|
||||
|
||||
if PGPASSWORD="${POSTGRES_PASSWORD}" psql -h "$host" -p "$port" -U "$user" -d "$db" -c "SELECT 1" > /dev/null 2>&1; then
|
||||
echo "ok"
|
||||
@@ -142,18 +142,18 @@ main() {
|
||||
if [[ "$JSON_OUTPUT" != "true" ]]; then
|
||||
echo ""
|
||||
echo -e "${BLUE}========================================${NC}"
|
||||
echo -e "${BLUE} HEALTH CHECK - Sistema de Flotillas${NC}"
|
||||
echo -e "${BLUE} HEALTH CHECK - Sistema de ADAN${NC}"
|
||||
echo -e "${BLUE}========================================${NC}"
|
||||
echo ""
|
||||
echo -e "${BLUE}Servicios Systemd:${NC}"
|
||||
fi
|
||||
|
||||
# Servicios systemd
|
||||
results[flotillas_api]=$(check_service "flotillas-api" "API Backend")
|
||||
print_status "flotillas-api" "${results[flotillas_api]}"
|
||||
results[adan_api]=$(check_service "adan-api" "API Backend")
|
||||
print_status "adan-api" "${results[adan_api]}"
|
||||
|
||||
results[flotillas_web]=$(check_service "flotillas-web" "Frontend Web")
|
||||
print_status "flotillas-web" "${results[flotillas_web]}"
|
||||
results[adan_web]=$(check_service "adan-web" "Frontend Web")
|
||||
print_status "adan-web" "${results[adan_web]}"
|
||||
|
||||
results[postgresql]=$(check_service "postgresql" "PostgreSQL")
|
||||
print_status "postgresql" "${results[postgresql]}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Script de Instalacion
|
||||
# Sistema de ADAN - Script de Instalacion
|
||||
# ============================================
|
||||
# Este script instala y configura todo el sistema
|
||||
# Ejecutar como root en Ubuntu 22.04 LTS
|
||||
@@ -28,10 +28,10 @@ NC='\033[0m' # No Color
|
||||
# ---------------------------------------------
|
||||
# Variables de Configuracion
|
||||
# ---------------------------------------------
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/flotillas}"
|
||||
REPO_URL="${REPO_URL:-https://github.com/tuorganizacion/flotillas.git}"
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/adan}"
|
||||
REPO_URL="${REPO_URL:-https://github.com/tuorganizacion/adan.git}"
|
||||
REPO_BRANCH="${REPO_BRANCH:-main}"
|
||||
BACKUP_DIR="${BACKUP_DIR:-/var/backups/flotillas}"
|
||||
BACKUP_DIR="${BACKUP_DIR:-/var/backups/adan}"
|
||||
|
||||
# Versiones
|
||||
POSTGRES_VERSION="15"
|
||||
@@ -51,7 +51,7 @@ SKIP_TRACCAR=false
|
||||
DEV_MODE=false
|
||||
|
||||
# Archivo de credenciales generadas
|
||||
CREDENTIALS_FILE="/root/flotillas-credentials.txt"
|
||||
CREDENTIALS_FILE="/root/adan-credentials.txt"
|
||||
|
||||
# ---------------------------------------------
|
||||
# Funciones de utilidad
|
||||
@@ -478,8 +478,8 @@ configure_database() {
|
||||
DB_PASSWORD=$(generate_password 24)
|
||||
fi
|
||||
|
||||
DB_NAME="${POSTGRES_DB:-flotillas}"
|
||||
DB_USER="${POSTGRES_USER:-flotillas}"
|
||||
DB_NAME="${POSTGRES_DB:-adan}"
|
||||
DB_USER="${POSTGRES_USER:-adan}"
|
||||
|
||||
log_info "Creando usuario y base de datos..."
|
||||
|
||||
@@ -611,7 +611,7 @@ generate_credentials() {
|
||||
# Guardar en archivo seguro
|
||||
cat > "$CREDENTIALS_FILE" <<EOF
|
||||
# ============================================
|
||||
# Credenciales del Sistema de Flotillas
|
||||
# Credenciales del Sistema de ADAN
|
||||
# Generadas: $(date)
|
||||
# IMPORTANTE: Guardar en lugar seguro y eliminar este archivo
|
||||
# ============================================
|
||||
@@ -619,10 +619,10 @@ generate_credentials() {
|
||||
# PostgreSQL
|
||||
POSTGRES_HOST=localhost
|
||||
POSTGRES_PORT=5432
|
||||
POSTGRES_DB=flotillas
|
||||
POSTGRES_USER=flotillas
|
||||
POSTGRES_DB=adan
|
||||
POSTGRES_USER=adan
|
||||
POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
DATABASE_URL=postgresql://flotillas:${DB_PASSWORD}@localhost:5432/flotillas
|
||||
DATABASE_URL=postgresql://adan:${DB_PASSWORD}@localhost:5432/adan
|
||||
|
||||
# Redis
|
||||
REDIS_PASSWORD=${REDIS_PASSWORD}
|
||||
@@ -633,11 +633,11 @@ SECRET_KEY=${SECRET_KEY}
|
||||
API_PORT=${API_PORT}
|
||||
|
||||
# MQTT
|
||||
MQTT_USER=flotillas
|
||||
MQTT_USER=adan
|
||||
MQTT_PASSWORD=${MQTT_PASSWORD}
|
||||
|
||||
# Admin inicial
|
||||
ADMIN_EMAIL=admin@flotillas.local
|
||||
ADMIN_EMAIL=admin@adan.local
|
||||
ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
|
||||
# Puertos
|
||||
@@ -665,10 +665,10 @@ create_env_file() {
|
||||
# Base de Datos
|
||||
POSTGRES_HOST=localhost
|
||||
POSTGRES_PORT=5432
|
||||
POSTGRES_DB=flotillas
|
||||
POSTGRES_USER=flotillas
|
||||
POSTGRES_DB=adan
|
||||
POSTGRES_USER=adan
|
||||
POSTGRES_PASSWORD=${DB_PASSWORD}
|
||||
DATABASE_URL=postgresql://flotillas:${DB_PASSWORD}@localhost:5432/flotillas
|
||||
DATABASE_URL=postgresql://adan:${DB_PASSWORD}@localhost:5432/adan
|
||||
|
||||
# Redis
|
||||
REDIS_HOST=localhost
|
||||
@@ -697,7 +697,7 @@ TRACCAR_FORWARD_URL=http://localhost:${API_PORT}/api/v1/traccar/position
|
||||
# MQTT
|
||||
MQTT_HOST=localhost
|
||||
MQTT_PORT=1883
|
||||
MQTT_USER=flotillas
|
||||
MQTT_USER=adan
|
||||
MQTT_PASSWORD=${MQTT_PASSWORD}
|
||||
|
||||
# MediaMTX
|
||||
@@ -771,11 +771,11 @@ configure_mosquitto() {
|
||||
|
||||
# Crear archivo de passwords
|
||||
touch /etc/mosquitto/passwd
|
||||
mosquitto_passwd -b /etc/mosquitto/passwd flotillas "${MQTT_PASSWORD}"
|
||||
mosquitto_passwd -b /etc/mosquitto/passwd adan "${MQTT_PASSWORD}"
|
||||
|
||||
# Configuracion
|
||||
cat > /etc/mosquitto/conf.d/flotillas.conf <<EOF
|
||||
# Configuracion para Sistema de Flotillas
|
||||
cat > /etc/mosquitto/conf.d/adan.conf <<EOF
|
||||
# Configuracion para Sistema de ADAN
|
||||
|
||||
listener 1883 localhost
|
||||
listener 9001
|
||||
@@ -819,7 +819,7 @@ install_services() {
|
||||
SERVICES_DIR="$INSTALL_DIR/deploy/services"
|
||||
|
||||
# Copiar servicios
|
||||
for service in flotillas-api flotillas-web mediamtx cloudflared; do
|
||||
for service in adan-api adan-web mediamtx cloudflared; do
|
||||
if [[ -f "$SERVICES_DIR/${service}.service" ]]; then
|
||||
log_info "Instalando servicio: ${service}"
|
||||
cp "$SERVICES_DIR/${service}.service" /etc/systemd/system/
|
||||
@@ -830,14 +830,14 @@ install_services() {
|
||||
systemctl daemon-reload
|
||||
|
||||
# Habilitar servicios
|
||||
systemctl enable flotillas-api 2>/dev/null || true
|
||||
systemctl enable flotillas-web 2>/dev/null || true
|
||||
systemctl enable adan-api 2>/dev/null || true
|
||||
systemctl enable adan-web 2>/dev/null || true
|
||||
systemctl enable mediamtx 2>/dev/null || true
|
||||
|
||||
# Iniciar servicios
|
||||
log_info "Iniciando servicios..."
|
||||
systemctl start flotillas-api 2>/dev/null || log_warn "flotillas-api no pudo iniciar (puede requerir configuracion adicional)"
|
||||
systemctl start flotillas-web 2>/dev/null || log_warn "flotillas-web no pudo iniciar"
|
||||
systemctl start adan-api 2>/dev/null || log_warn "adan-api no pudo iniciar (puede requerir configuracion adicional)"
|
||||
systemctl start adan-web 2>/dev/null || log_warn "adan-web no pudo iniciar"
|
||||
systemctl start mediamtx 2>/dev/null || log_warn "mediamtx no pudo iniciar"
|
||||
|
||||
log_success "Servicios instalados"
|
||||
@@ -864,7 +864,7 @@ run_migrations() {
|
||||
# Ejecutar init.sql si existe y no hay migraciones
|
||||
if [[ ! -d "alembic" ]] && [[ -f "$INSTALL_DIR/deploy/postgres/init.sql" ]]; then
|
||||
log_info "Ejecutando script init.sql..."
|
||||
PGPASSWORD="${DB_PASSWORD}" psql -h localhost -U flotillas -d flotillas -f "$INSTALL_DIR/deploy/postgres/init.sql" || true
|
||||
PGPASSWORD="${DB_PASSWORD}" psql -h localhost -U adan -d adan -f "$INSTALL_DIR/deploy/postgres/init.sql" || true
|
||||
fi
|
||||
|
||||
deactivate
|
||||
@@ -936,8 +936,8 @@ EOF
|
||||
configure_logrotate() {
|
||||
log_section "Configurando Logrotate"
|
||||
|
||||
cat > /etc/logrotate.d/flotillas <<EOF
|
||||
/var/log/flotillas/*.log {
|
||||
cat > /etc/logrotate.d/adan <<EOF
|
||||
/var/log/adan/*.log {
|
||||
daily
|
||||
missingok
|
||||
rotate 14
|
||||
@@ -947,12 +947,12 @@ configure_logrotate() {
|
||||
create 0640 root root
|
||||
sharedscripts
|
||||
postrotate
|
||||
systemctl reload flotillas-api > /dev/null 2>&1 || true
|
||||
systemctl reload adan-api > /dev/null 2>&1 || true
|
||||
endscript
|
||||
}
|
||||
EOF
|
||||
|
||||
mkdir -p /var/log/flotillas
|
||||
mkdir -p /var/log/adan
|
||||
|
||||
log_success "Logrotate configurado"
|
||||
}
|
||||
@@ -964,7 +964,7 @@ configure_cron() {
|
||||
log_section "Configurando Backups Automaticos"
|
||||
|
||||
# Crear cron para backup diario a las 3 AM
|
||||
CRON_JOB="0 3 * * * $INSTALL_DIR/deploy/scripts/backup.sh >> /var/log/flotillas/backup.log 2>&1"
|
||||
CRON_JOB="0 3 * * * $INSTALL_DIR/deploy/scripts/backup.sh >> /var/log/adan/backup.log 2>&1"
|
||||
|
||||
# Agregar si no existe
|
||||
(crontab -l 2>/dev/null | grep -v "backup.sh"; echo "$CRON_JOB") | crontab -
|
||||
@@ -980,7 +980,7 @@ show_summary() {
|
||||
|
||||
echo ""
|
||||
echo -e "${GREEN}============================================${NC}"
|
||||
echo -e "${GREEN} SISTEMA DE FLOTILLAS INSTALADO ${NC}"
|
||||
echo -e "${GREEN} SISTEMA DE ADAN INSTALADO ${NC}"
|
||||
echo -e "${GREEN}============================================${NC}"
|
||||
echo ""
|
||||
echo -e "${BLUE}Servicios:${NC}"
|
||||
@@ -992,8 +992,8 @@ show_summary() {
|
||||
echo ""
|
||||
echo -e "${BLUE}Base de Datos:${NC}"
|
||||
echo " - PostgreSQL: localhost:5432"
|
||||
echo " - Database: flotillas"
|
||||
echo " - Usuario: flotillas"
|
||||
echo " - Database: adan"
|
||||
echo " - Usuario: adan"
|
||||
echo ""
|
||||
echo -e "${BLUE}Credenciales:${NC}"
|
||||
echo " - Guardadas en: ${CREDENTIALS_FILE}"
|
||||
@@ -1004,8 +1004,8 @@ show_summary() {
|
||||
echo " 3. El unico puerto publico es ${TRACCAR_PORT} (GPS)"
|
||||
echo ""
|
||||
echo -e "${BLUE}Comandos utiles:${NC}"
|
||||
echo " - Ver logs API: journalctl -u flotillas-api -f"
|
||||
echo " - Reiniciar API: systemctl restart flotillas-api"
|
||||
echo " - Ver logs API: journalctl -u adan-api -f"
|
||||
echo " - Reiniciar API: systemctl restart adan-api"
|
||||
echo " - Backup manual: ${INSTALL_DIR}/deploy/scripts/backup.sh"
|
||||
echo " - Actualizar: ${INSTALL_DIR}/deploy/scripts/update.sh"
|
||||
echo ""
|
||||
@@ -1026,7 +1026,7 @@ main() {
|
||||
|
||||
echo ""
|
||||
echo -e "${GREEN}============================================${NC}"
|
||||
echo -e "${GREEN} INSTALADOR SISTEMA DE FLOTILLAS ${NC}"
|
||||
echo -e "${GREEN} INSTALADOR SISTEMA DE ADAN ${NC}"
|
||||
echo -e "${GREEN}============================================${NC}"
|
||||
echo ""
|
||||
echo "Directorio instalacion: $INSTALL_DIR"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Visor de Logs
|
||||
# Sistema de ADAN - Visor de Logs
|
||||
# ============================================
|
||||
# Muestra logs de los diferentes servicios
|
||||
#
|
||||
@@ -39,7 +39,7 @@ while [[ $# -gt 0 ]]; do
|
||||
shift 2
|
||||
;;
|
||||
--help|-h)
|
||||
echo "Sistema de Flotillas - Visor de Logs"
|
||||
echo "Sistema de ADAN - Visor de Logs"
|
||||
echo ""
|
||||
echo "Uso: $0 [servicio] [opciones]"
|
||||
echo ""
|
||||
@@ -91,10 +91,10 @@ show_logs() {
|
||||
|
||||
case $SERVICE in
|
||||
api)
|
||||
show_logs "flotillas-api" "API Backend"
|
||||
show_logs "adan-api" "API Backend"
|
||||
;;
|
||||
web)
|
||||
show_logs "flotillas-web" "Frontend"
|
||||
show_logs "adan-web" "Frontend"
|
||||
;;
|
||||
traccar)
|
||||
show_logs "traccar" "Traccar GPS"
|
||||
@@ -121,10 +121,10 @@ case $SERVICE in
|
||||
echo "Mostrando todos los logs en tiempo real..."
|
||||
echo "Presiona Ctrl+C para salir"
|
||||
echo ""
|
||||
journalctl -u flotillas-api -u flotillas-web -u traccar -u mediamtx -u mosquitto -f
|
||||
journalctl -u adan-api -u adan-web -u traccar -u mediamtx -u mosquitto -f
|
||||
else
|
||||
show_logs "flotillas-api" "API Backend"
|
||||
show_logs "flotillas-web" "Frontend"
|
||||
show_logs "adan-api" "API Backend"
|
||||
show_logs "adan-web" "Frontend"
|
||||
show_logs "traccar" "Traccar GPS"
|
||||
show_logs "mediamtx" "MediaMTX"
|
||||
show_logs "mosquitto" "Mosquitto MQTT"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Script de Restauracion
|
||||
# Sistema de ADAN - Script de Restauracion
|
||||
# ============================================
|
||||
# Restaura backups de base de datos y configuracion
|
||||
#
|
||||
@@ -29,8 +29,8 @@ NC='\033[0m'
|
||||
# ---------------------------------------------
|
||||
# Variables
|
||||
# ---------------------------------------------
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/flotillas}"
|
||||
BACKUP_DIR="${BACKUP_DIR:-/var/backups/flotillas}"
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/adan}"
|
||||
BACKUP_DIR="${BACKUP_DIR:-/var/backups/adan}"
|
||||
|
||||
# Cargar variables de entorno
|
||||
if [[ -f "$INSTALL_DIR/.env" ]]; then
|
||||
@@ -40,8 +40,8 @@ fi
|
||||
# Base de datos
|
||||
DB_HOST="${POSTGRES_HOST:-localhost}"
|
||||
DB_PORT="${POSTGRES_PORT:-5432}"
|
||||
DB_NAME="${POSTGRES_DB:-flotillas}"
|
||||
DB_USER="${POSTGRES_USER:-flotillas}"
|
||||
DB_NAME="${POSTGRES_DB:-adan}"
|
||||
DB_USER="${POSTGRES_USER:-adan}"
|
||||
DB_PASSWORD="${POSTGRES_PASSWORD:-}"
|
||||
|
||||
# Opciones
|
||||
@@ -109,7 +109,7 @@ parse_args() {
|
||||
}
|
||||
|
||||
show_help() {
|
||||
echo "Sistema de Flotillas - Restauracion de Backup"
|
||||
echo "Sistema de ADAN - Restauracion de Backup"
|
||||
echo ""
|
||||
echo "Uso: $0 [opciones]"
|
||||
echo ""
|
||||
@@ -124,7 +124,7 @@ show_help() {
|
||||
echo " $0 --list"
|
||||
echo " $0 --latest"
|
||||
echo " $0 --date 20240115"
|
||||
echo " $0 --db /var/backups/flotillas/daily/flotillas_20240115_030000_db.sql.gz"
|
||||
echo " $0 --db /var/backups/adan/daily/adan_20240115_030000_db.sql.gz"
|
||||
}
|
||||
|
||||
# ---------------------------------------------
|
||||
@@ -204,7 +204,7 @@ find_backup_by_date() {
|
||||
local type="$1"
|
||||
local date="$2"
|
||||
|
||||
local pattern="flotillas_${date}*_${type}.*gz"
|
||||
local pattern="adan_${date}*_${type}.*gz"
|
||||
|
||||
local found=$(ls -t "$BACKUP_DIR/daily"/$pattern 2>/dev/null | head -1)
|
||||
|
||||
@@ -222,8 +222,8 @@ find_backup_by_date() {
|
||||
stop_services() {
|
||||
log_info "Deteniendo servicios..."
|
||||
|
||||
systemctl stop flotillas-api 2>/dev/null || true
|
||||
systemctl stop flotillas-web 2>/dev/null || true
|
||||
systemctl stop adan-api 2>/dev/null || true
|
||||
systemctl stop adan-web 2>/dev/null || true
|
||||
|
||||
# Esperar a que se detengan
|
||||
sleep 2
|
||||
@@ -237,8 +237,8 @@ stop_services() {
|
||||
start_services() {
|
||||
log_info "Iniciando servicios..."
|
||||
|
||||
systemctl start flotillas-api 2>/dev/null || true
|
||||
systemctl start flotillas-web 2>/dev/null || true
|
||||
systemctl start adan-api 2>/dev/null || true
|
||||
systemctl start adan-web 2>/dev/null || true
|
||||
|
||||
log_success "Servicios iniciados"
|
||||
}
|
||||
@@ -389,7 +389,7 @@ restore_config() {
|
||||
fi
|
||||
|
||||
# Servicios systemd
|
||||
for service in $temp_dir/etc/systemd/system/flotillas-*.service; do
|
||||
for service in $temp_dir/etc/systemd/system/adan-*.service; do
|
||||
if [[ -f "$service" ]]; then
|
||||
cp "$service" /etc/systemd/system/
|
||||
log_info "Restaurado: $(basename "$service")"
|
||||
@@ -472,7 +472,7 @@ main() {
|
||||
# Modo interactivo si no se especificaron opciones
|
||||
if [[ -z "$DB_BACKUP" ]] && [[ -z "$CONFIG_BACKUP" ]] && [[ "$USE_LATEST" != "true" ]] && [[ -z "$RESTORE_DATE" ]]; then
|
||||
echo ""
|
||||
echo "Sistema de Flotillas - Restauracion"
|
||||
echo "Sistema de ADAN - Restauracion"
|
||||
echo "===================================="
|
||||
echo ""
|
||||
echo "Selecciona una opcion:"
|
||||
@@ -540,8 +540,8 @@ main() {
|
||||
log_success "=========================================="
|
||||
echo ""
|
||||
echo "Verifica que los servicios esten funcionando:"
|
||||
echo " systemctl status flotillas-api"
|
||||
echo " systemctl status flotillas-web"
|
||||
echo " systemctl status adan-api"
|
||||
echo " systemctl status adan-web"
|
||||
echo ""
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Estado del Sistema
|
||||
# Sistema de ADAN - Estado del Sistema
|
||||
# ============================================
|
||||
# Muestra informacion completa del estado
|
||||
# ============================================
|
||||
@@ -13,7 +13,7 @@ BLUE='\033[0;34m'
|
||||
CYAN='\033[0;36m'
|
||||
NC='\033[0m'
|
||||
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/flotillas}"
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/adan}"
|
||||
|
||||
# Cargar variables
|
||||
if [[ -f "$INSTALL_DIR/.env" ]]; then
|
||||
@@ -24,7 +24,7 @@ clear
|
||||
|
||||
echo ""
|
||||
echo -e "${CYAN}╔══════════════════════════════════════════════════════════════╗${NC}"
|
||||
echo -e "${CYAN}║ SISTEMA DE FLOTILLAS - ESTADO DEL SISTEMA ║${NC}"
|
||||
echo -e "${CYAN}║ SISTEMA DE ADAN - ESTADO DEL SISTEMA ║${NC}"
|
||||
echo -e "${CYAN}╚══════════════════════════════════════════════════════════════╝${NC}"
|
||||
echo ""
|
||||
|
||||
@@ -84,8 +84,8 @@ check_service() {
|
||||
printf "│ %-14s %s\n" "$name:" "$status"
|
||||
}
|
||||
|
||||
check_service "flotillas-api" "API Backend" "${API_PORT:-8000}"
|
||||
check_service "flotillas-web" "Frontend" "${FRONTEND_PORT:-3000}"
|
||||
check_service "adan-api" "API Backend" "${API_PORT:-8000}"
|
||||
check_service "adan-web" "Frontend" "${FRONTEND_PORT:-3000}"
|
||||
check_service "postgresql" "PostgreSQL" "5432"
|
||||
check_service "redis-server" "Redis" "6379"
|
||||
check_service "traccar" "Traccar GPS" "${TRACCAR_PORT:-5055}"
|
||||
@@ -103,15 +103,15 @@ echo -e "${BLUE}┌─ Base de Datos ──────────────
|
||||
|
||||
if systemctl is-active --quiet postgresql; then
|
||||
# Tamanio de BD
|
||||
DB_SIZE=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-flotillas}" -d "${POSTGRES_DB:-flotillas}" -t -c "SELECT pg_size_pretty(pg_database_size(current_database()));" 2>/dev/null | xargs)
|
||||
DB_SIZE=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-adan}" -d "${POSTGRES_DB:-adan}" -t -c "SELECT pg_size_pretty(pg_database_size(current_database()));" 2>/dev/null | xargs)
|
||||
echo -e "│ Tamanio BD: ${DB_SIZE:-N/A}"
|
||||
|
||||
# Conexiones activas
|
||||
CONNECTIONS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-flotillas}" -d "${POSTGRES_DB:-flotillas}" -t -c "SELECT count(*) FROM pg_stat_activity WHERE datname = current_database();" 2>/dev/null | xargs)
|
||||
CONNECTIONS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-adan}" -d "${POSTGRES_DB:-adan}" -t -c "SELECT count(*) FROM pg_stat_activity WHERE datname = current_database();" 2>/dev/null | xargs)
|
||||
echo -e "│ Conexiones: ${CONNECTIONS:-N/A} activas"
|
||||
|
||||
# Posiciones (si existe la tabla)
|
||||
POSITIONS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-flotillas}" -d "${POSTGRES_DB:-flotillas}" -t -c "SELECT COUNT(*) FROM positions;" 2>/dev/null | xargs)
|
||||
POSITIONS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-adan}" -d "${POSTGRES_DB:-adan}" -t -c "SELECT COUNT(*) FROM positions;" 2>/dev/null | xargs)
|
||||
if [[ -n "$POSITIONS" ]]; then
|
||||
echo -e "│ Posiciones: ${POSITIONS} registros"
|
||||
fi
|
||||
@@ -150,10 +150,10 @@ echo -e "${BLUE}┌─ GPS / Unidades ──────────────
|
||||
|
||||
if systemctl is-active --quiet postgresql; then
|
||||
# Total de unidades
|
||||
TOTAL_UNITS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-flotillas}" -d "${POSTGRES_DB:-flotillas}" -t -c "SELECT COUNT(*) FROM units;" 2>/dev/null | xargs)
|
||||
TOTAL_UNITS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-adan}" -d "${POSTGRES_DB:-adan}" -t -c "SELECT COUNT(*) FROM units;" 2>/dev/null | xargs)
|
||||
|
||||
# Unidades activas (con posicion en ultimos 5 min)
|
||||
ACTIVE_UNITS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-flotillas}" -d "${POSTGRES_DB:-flotillas}" -t -c "SELECT COUNT(DISTINCT unit_id) FROM positions WHERE device_time > NOW() - INTERVAL '5 minutes';" 2>/dev/null | xargs)
|
||||
ACTIVE_UNITS=$(PGPASSWORD="${POSTGRES_PASSWORD}" psql -h localhost -U "${POSTGRES_USER:-adan}" -d "${POSTGRES_DB:-adan}" -t -c "SELECT COUNT(DISTINCT unit_id) FROM positions WHERE device_time > NOW() - INTERVAL '5 minutes';" 2>/dev/null | xargs)
|
||||
|
||||
echo -e "│ Total: ${TOTAL_UNITS:-0} unidades"
|
||||
echo -e "│ Activas: ${ACTIVE_UNITS:-0} (ultimo 5 min)"
|
||||
@@ -190,7 +190,7 @@ echo ""
|
||||
# ---------------------------------------------
|
||||
echo -e "${BLUE}┌─ Ultimos Errores (API) ────────────────────────────────────┐${NC}"
|
||||
|
||||
ERRORS=$(journalctl -u flotillas-api --since "1 hour ago" -p err --no-pager -q 2>/dev/null | tail -3)
|
||||
ERRORS=$(journalctl -u adan-api --since "1 hour ago" -p err --no-pager -q 2>/dev/null | tail -3)
|
||||
|
||||
if [[ -z "$ERRORS" ]]; then
|
||||
echo -e "│ ${GREEN}Sin errores en la ultima hora${NC}"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
# ============================================
|
||||
# Sistema de Flotillas - Script de Actualizacion
|
||||
# Sistema de ADAN - Script de Actualizacion
|
||||
# ============================================
|
||||
# Actualiza la aplicacion a la ultima version
|
||||
#
|
||||
@@ -29,7 +29,7 @@ NC='\033[0m'
|
||||
# ---------------------------------------------
|
||||
# Variables
|
||||
# ---------------------------------------------
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/flotillas}"
|
||||
INSTALL_DIR="${INSTALL_DIR:-/opt/adan}"
|
||||
REPO_BRANCH="${REPO_BRANCH:-main}"
|
||||
BACKUP_BEFORE_UPDATE=true
|
||||
FORCE_UPDATE=false
|
||||
@@ -308,11 +308,11 @@ restart_services() {
|
||||
log_info "Reiniciando servicios..."
|
||||
|
||||
if [[ "$UPDATE_BACKEND" == "true" ]]; then
|
||||
systemctl restart flotillas-api 2>/dev/null && log_success "flotillas-api reiniciado" || log_warn "flotillas-api no existe"
|
||||
systemctl restart adan-api 2>/dev/null && log_success "adan-api reiniciado" || log_warn "adan-api no existe"
|
||||
fi
|
||||
|
||||
if [[ "$UPDATE_FRONTEND" == "true" ]]; then
|
||||
systemctl restart flotillas-web 2>/dev/null && log_success "flotillas-web reiniciado" || log_warn "flotillas-web no existe"
|
||||
systemctl restart adan-web 2>/dev/null && log_success "adan-web reiniciado" || log_warn "adan-web no existe"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -328,19 +328,19 @@ verify_services() {
|
||||
sleep 3
|
||||
|
||||
if [[ "$UPDATE_BACKEND" == "true" ]]; then
|
||||
if systemctl is-active --quiet flotillas-api; then
|
||||
log_success "flotillas-api: activo"
|
||||
if systemctl is-active --quiet adan-api; then
|
||||
log_success "adan-api: activo"
|
||||
else
|
||||
log_error "flotillas-api: inactivo"
|
||||
log_error "adan-api: inactivo"
|
||||
all_ok=false
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$UPDATE_FRONTEND" == "true" ]]; then
|
||||
if systemctl is-active --quiet flotillas-web; then
|
||||
log_success "flotillas-web: activo"
|
||||
if systemctl is-active --quiet adan-web; then
|
||||
log_success "adan-web: activo"
|
||||
else
|
||||
log_error "flotillas-web: inactivo"
|
||||
log_error "adan-web: inactivo"
|
||||
all_ok=false
|
||||
fi
|
||||
fi
|
||||
@@ -357,8 +357,8 @@ verify_services() {
|
||||
|
||||
if [[ "$all_ok" == "false" ]]; then
|
||||
log_error "Algunos servicios fallaron. Revisa los logs:"
|
||||
echo " journalctl -u flotillas-api -n 50"
|
||||
echo " journalctl -u flotillas-web -n 50"
|
||||
echo " journalctl -u adan-api -n 50"
|
||||
echo " journalctl -u adan-web -n 50"
|
||||
return 1
|
||||
fi
|
||||
|
||||
@@ -412,8 +412,8 @@ show_summary() {
|
||||
echo "Branch: $REPO_BRANCH"
|
||||
echo ""
|
||||
echo "Servicios:"
|
||||
systemctl is-active flotillas-api 2>/dev/null && echo " - flotillas-api: activo" || echo " - flotillas-api: inactivo"
|
||||
systemctl is-active flotillas-web 2>/dev/null && echo " - flotillas-web: activo" || echo " - flotillas-web: inactivo"
|
||||
systemctl is-active adan-api 2>/dev/null && echo " - adan-api: activo" || echo " - adan-api: inactivo"
|
||||
systemctl is-active adan-web 2>/dev/null && echo " - adan-web: activo" || echo " - adan-web: inactivo"
|
||||
echo ""
|
||||
}
|
||||
|
||||
@@ -425,7 +425,7 @@ main() {
|
||||
|
||||
echo ""
|
||||
echo -e "${BLUE}========================================${NC}"
|
||||
echo -e "${BLUE} ACTUALIZANDO SISTEMA DE FLOTILLAS${NC}"
|
||||
echo -e "${BLUE} ACTUALIZANDO SISTEMA DE ADAN${NC}"
|
||||
echo -e "${BLUE}========================================${NC}"
|
||||
echo ""
|
||||
echo "Branch: $REPO_BRANCH"
|
||||
|
||||
Reference in New Issue
Block a user