deployment, linting and infra configuration

scripts/deploy-to-production.sh

@@ -7,9 +7,9 @@ set -e
 
 # Configuration
 REMOTE_HOST="deploy@141.136.35.199"
-REMOTE_PATH="/opt/compose/ai-tax-agent"
-LOCAL_COMPOSE_PATH="infra/compose/production"
-ENV_FILE="infra/compose/.env.production"
+REMOTE_PATH="/opt/ai-tax-agent"
+LOCAL_COMPOSE_PATH="infra/base"
+ENV_FILE="infra/environments/production/.env"
 
 # Colors for output
 RED='\033[0;31m'
@@ -66,13 +66,15 @@ backup_remote() {
     ssh $REMOTE_HOST << 'EOF'
         set -e
         mkdir -p ~/backups
-        cd /opt/compose
+        cd /opt
         
-        # Backup compose directory (exclude large cert files)
-        tar -czf ~/backups/backup-$(date +%Y%m%d-%H%M%S).tar.gz \
-            --exclude='./traefik/certs/godaddy-acme.json' \
-            --exclude='./*/node_modules' \
-            .
+        # Backup application directory (exclude large cert files)
+        if [ -d ai-tax-agent ]; then
+            tar -czf ~/backups/backup-$(date +%Y%m%d-%H%M%S).tar.gz \
+                --exclude='./traefik/certs/godaddy-acme.json' \
+                --exclude='./*/node_modules' \
+                ai-tax-agent
+        fi
         
         # Document current state
         docker ps > ~/backups/current-services-$(date +%Y%m%d-%H%M%S).txt
@@ -100,6 +102,9 @@ prepare_remote() {
         mkdir -p $REMOTE_PATH/grafana/provisioning
         mkdir -p $REMOTE_PATH/grafana/dashboards
         mkdir -p $REMOTE_PATH/loki
+        mkdir -p $REMOTE_PATH/promtail
+        mkdir -p $REMOTE_PATH/traefik/config
+        mkdir -p $REMOTE_PATH/authentik
         
         echo "Directory structure created"
         ls -la $REMOTE_PATH
@@ -110,7 +115,7 @@ EOF
 
 # Copy files to remote server
 copy_files() {
-    log_info "Copying compose files to remote server..."
+    log_info "Copying base compose files and configs to remote server..."
     
     # Copy compose files
     scp $LOCAL_COMPOSE_PATH/infrastructure.yaml $REMOTE_HOST:$REMOTE_PATH/
@@ -121,10 +126,13 @@ copy_files() {
     scp $ENV_FILE $REMOTE_HOST:$REMOTE_PATH/.env
     
     # Copy configuration files
-    scp -r infra/compose/prometheus/* $REMOTE_HOST:$REMOTE_PATH/prometheus/
-    scp -r infra/compose/grafana/provisioning/* $REMOTE_HOST:$REMOTE_PATH/grafana/provisioning/
-    scp -r infra/compose/grafana/dashboards/* $REMOTE_HOST:$REMOTE_PATH/grafana/dashboards/
-    scp -r infra/compose/loki/* $REMOTE_HOST:$REMOTE_PATH/loki/
+    scp -r $LOCAL_COMPOSE_PATH/prometheus/* $REMOTE_HOST:$REMOTE_PATH/prometheus/
+    scp -r $LOCAL_COMPOSE_PATH/grafana/provisioning/* $REMOTE_HOST:$REMOTE_PATH/grafana/provisioning/
+    scp -r $LOCAL_COMPOSE_PATH/grafana/dashboards/* $REMOTE_HOST:$REMOTE_PATH/grafana/dashboards/
+    scp -r $LOCAL_COMPOSE_PATH/loki/* $REMOTE_HOST:$REMOTE_PATH/loki/
+    scp -r $LOCAL_COMPOSE_PATH/promtail/* $REMOTE_HOST:$REMOTE_PATH/promtail/ 2>/dev/null || true
+    scp -r $LOCAL_COMPOSE_PATH/traefik/config/* $REMOTE_HOST:$REMOTE_PATH/traefik/config/ 2>/dev/null || true
+    scp -r $LOCAL_COMPOSE_PATH/authentik/* $REMOTE_HOST:$REMOTE_PATH/authentik/ 2>/dev/null || true
     
     log_success "Files copied to remote server"
 }