From 6a1c86d88a3db42ef755d30f999e31d723e3d784 Mon Sep 17 00:00:00 2001 From: nickpons666 Date: Mon, 19 Jan 2026 17:10:54 -0600 Subject: [PATCH] Add Docker configuration and fix paths --- .env | 3 --- 000-default.conf | 24 ++++++++++++++++++++++++ Dockerfile | 25 +++++++++++++++++++++++++ apache2.conf | 20 ++++++++++++++++++++ bot/webhook.php | 2 +- config.yaml | 15 +++++++++++++++ config/error_logging.php | 2 +- docker-compose.yml | 16 ++++++++++++++++ docker/contenedor-ibiza.conf | 30 ++++++++++++++++++++++++++++++ public/partials/navbar.php | 2 +- scripts/.env | 7 +++++++ scripts/generate-env.php | 12 ++++++++++++ 12 files changed, 152 insertions(+), 6 deletions(-) mode change 100755 => 100644 .env create mode 100644 000-default.conf create mode 100644 Dockerfile create mode 100644 apache2.conf create mode 100644 config.yaml create mode 100644 docker-compose.yml create mode 100644 docker/contenedor-ibiza.conf create mode 100644 scripts/.env create mode 100644 scripts/generate-env.php diff --git a/.env b/.env old mode 100755 new mode 100644 index 8fcc155..9fd108d --- a/.env +++ b/.env @@ -2,9 +2,6 @@ DB_HOST=10.10.4.17:3391 DB_NAME=contenedor_ibiza DB_USER=nickpons666 DB_PASS=MiPo6425@@ - SITE_URL=https://contenedor-ibiza.ddns.net - TELEGRAM_BOT_TOKEN=8589698394:AAFSphFBEy1DQmOIUDyEKCMAwksTaYlatYE - SESSION_NAME=contenedor_session diff --git a/000-default.conf b/000-default.conf new file mode 100644 index 0000000..8519637 --- /dev/null +++ b/000-default.conf @@ -0,0 +1,24 @@ +server { + listen 80; + server_name localhost; + root /var/www/html/public; + index index.php; + + error_log /var/log/apache2/error.log; + access_log /var/log/apache2/access.log; + + location / { + try_files $uri $uri/ /index.php?$query_string; + } + + location ~ \.php$ { + include /etc/apache2/mods-enabled/fastcgi.conf; + fastcgi_pass unix:/var/run/php/php8.2-fpm.sock; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_index index.php; + } + + location ~ /\.ht { + deny all; + } +} diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..6ad9b13 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +FROM php:8.2-apache + +RUN apt-get update && apt-get install -y \ + cron \ + nano \ + libzip-dev \ + zip \ + unzip \ + && docker-php-ext-install pdo pdo_mysql \ + && a2enmod rewrite + +COPY docker/contenedor-ibiza.conf /etc/apache2/sites-available/ + +WORKDIR /var/www/html + +COPY . . + +RUN chmod +x /var/www/html/scripts/*.php \ + && a2ensite contenedor-ibiza.conf \ + && a2dissite 000-default.conf \ + && crontab -l | { cat; echo "0 0 * * 0 /usr/bin/php /var/www/html/scripts/rotar_automatico.php >> /var/log/rotacion.log 2>&1"; } | crontab - + +EXPOSE 80 + +CMD ["sh", "-c", "php /var/www/html/scripts/generate-env.php && apache2-foreground"] diff --git a/apache2.conf b/apache2.conf new file mode 100644 index 0000000..14fa36d --- /dev/null +++ b/apache2.conf @@ -0,0 +1,20 @@ +Mutex file posix-is-default +Timeout 300 +ServerRoot "/etc/apache2" +PidFile /var/run/apache2/apache2.pid +Listen 80 + +LoadModule mpm_prefork_module /usr/lib/apache2/modules/mod_mpm_prefork.so +LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so +LoadModule authz_user_module /usr/lib/apache2/modules/mod_authz_user.so +LoadModule dir_module /usr/lib/apache2/modules/mod_dir.so +LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so +LoadModule mime_magic_module /usr/lib/apache2/modules/mod_mime_magic.so +LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so +LoadModule php_module /usr/lib/apache2/modules/libphp.so +LoadModule alias_module /usr/lib/apache2/modules/mod_alias.so + +TypesConfig /etc/mime.types + +ErrorLog /var/log/apache2/error.log +LogLevel warn diff --git a/bot/webhook.php b/bot/webhook.php index f3ae82f..d12c51d 100755 --- a/bot/webhook.php +++ b/bot/webhook.php @@ -3,7 +3,7 @@ // Configurar logging de errores error_reporting(E_ALL); ini_set('log_errors', 1); -ini_set('error_log', __DIR__ . '/../logs/bot_error.log'); +ini_set('error_log', __DIR__ . '/../public/logs/bot_error.log'); require_once __DIR__ . '/../config/config.php'; require_once __DIR__ . '/TelegramBot.php'; diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..c1bc486 --- /dev/null +++ b/config.yaml @@ -0,0 +1,15 @@ +# Database Configuration +database: + host: "10.10.4.17:3391" + name: "contenedor_ibiza" + user: "nickpons666" + password: "MiPo6425@@" + +# Application Configuration +app: + url: "https://contenedor-ibiza.ddns.net" + session: "contenedor_session" + +# Telegram Bot Configuration +telegram: + token: "8589698394:AAFSphFBEy1DQmOIUDyEKCMAwksTaYlatYE" diff --git a/config/error_logging.php b/config/error_logging.php index ccc2e99..cb77dfe 100755 --- a/config/error_logging.php +++ b/config/error_logging.php @@ -4,7 +4,7 @@ error_reporting(E_ALL); ini_set('display_errors', 0); ini_set('log_errors', 1); -$logFile = __DIR__ . '/../logs/error.log'; +$logFile = __DIR__ . '/../public/logs/error.log'; if (!file_exists(dirname($logFile))) { mkdir(dirname($logFile), 0755, true); diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e39575f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ +services: + contenedor: + image: 10.10.4.3:5000/contenedor_ibiza:latest + container_name: contenedor_ibiza + ports: + - "8087:80" + environment: + - DB_HOST=10.10.4.17:3391 + - DB_NAME=contenedor_ibiza + - DB_USER=nickpons666 + - DB_PASS=MiPo6425@@ + - SITE_URL=https://contenedor-ibiza.ddns.net + - TELEGRAM_BOT_TOKEN=8589698394:AAFSphFBEy1DQmOIUDyEKCMAwksTaYlatYE + - SESSION_NAME=contenedor_session + volumes: + - ./logs:/var/log/apache2 diff --git a/docker/contenedor-ibiza.conf b/docker/contenedor-ibiza.conf new file mode 100644 index 0000000..28081a3 --- /dev/null +++ b/docker/contenedor-ibiza.conf @@ -0,0 +1,30 @@ + + ServerName contenedor-ibiza.ddns.net + DocumentRoot /var/www/html/public + + Alias /bot /var/www/html/bot + + + Options +FollowSymLinks + AllowOverride All + Require all granted + + + php_flag display_errors on + php_flag log_errors on + php_value error_reporting E_ALL + + + + + Options +FollowSymLinks + AllowOverride All + Require all granted + + + php_admin_value upload_max_filesize 20M + php_admin_value post_max_size 20M + + ErrorLog ${APACHE_LOG_DIR}/error.log + CustomLog ${APACHE_LOG_DIR}/access.log combined + diff --git a/public/partials/navbar.php b/public/partials/navbar.php index f1fa3b1..bd651dc 100755 --- a/public/partials/navbar.php +++ b/public/partials/navbar.php @@ -1,5 +1,5 @@ getCurrentUser(); $currentPage = $currentPage ?? ''; diff --git a/scripts/.env b/scripts/.env new file mode 100644 index 0000000..0db2d90 --- /dev/null +++ b/scripts/.env @@ -0,0 +1,7 @@ +DB_HOST=10.10.4.17:3391 +DB_NAME= +DB_USER= +DB_PASS= +SITE_URL= +TELEGRAM_BOT_TOKEN= +SESSION_NAME= diff --git a/scripts/generate-env.php b/scripts/generate-env.php new file mode 100644 index 0000000..b0f0eff --- /dev/null +++ b/scripts/generate-env.php @@ -0,0 +1,12 @@ +