More detailed .env.example file, use env variable for logs directory, rename webhook secrets envs.

Author: noplanman

.env.example

@@ -1,4 +1,14 @@
-TG_ENV='development"
+# Environment
+TG_ENV='development'
+
+# Directories
+TG_BASE_DIR='/var/www/tg-support-bot'
+TG_CACHE_DIR='${TG_BASE_DIR}/cache'
+TG_COMMANDS_DIR='${TG_BASE_DIR}/commands'
+TG_LOGS_DIR='${TG_BASE_DIR}/logs'
+TG_PUBLIC_DIR='${TG_BASE_DIR}/public'
+TG_DOWNLOADS_DIR='${TG_BASE_DIR}/downloads'
+TG_UPLOADS_DIR='${TG_BASE_DIR}/uploads'
 
 # Bot vitals
 TG_API_KEY='12345:api_key'
@@ -8,6 +18,7 @@ TG_SECRET='super-secret'
 # Bot extras
 TG_WEBHOOK='{"url": "https://bot.com/manager.php"}'
 TG_ADMINS='[123,456]'
+TG_LOGGING='{"error": "${TG_LOGS_DIR}/error.log", "update": "${TG_LOGS_DIR}/update.log"}'
 
 # Database
 TG_DB_HOST='localhost'
@@ -16,4 +27,8 @@ TG_DB_PASSWORD='root'
 TG_DB_DATABASE='tgbot'
 
 # Paths
-TG_PATHS='{"download": "/var/www/tgbot/downloads","upload": "/var/www/tgbot/uploads"}'
+TG_COMMANDS='{"paths": ["${TG_COMMANDS_DIR}"]}'
+TG_PATHS='{"download": "${TG_DOWNLOADS_DIR}", "upload": "${TG_UPLOADS_DIR}"}'
+
+# Webhook secrets
+TG_WEBHOOK_SECRET_GITHUB='github-secret'

public/webhooks/github.php

@@ -16,11 +16,11 @@
 require_once __DIR__ . '/../../vendor/autoload.php';
 Dotenv\Dotenv::create(__DIR__ . '/../..')->load();
 
-$webhook = new GitHubHandler(getenv('SB_WEBHOOK_SECRET_GITHUB'));
+$webhook = new GitHubHandler(getenv('TG_WEBHOOK_SECRET_GITHUB'));
 if (!$webhook->validate()) {
     http_response_code(404);
     die;
 }
 
 // Save all incoming data to a log file for future reference.
-Utils::logWebhookData(__DIR__ . '/../../logs/' . getenv('SB_BOT_USERNAME') . '_webhook_github.log');
+Utils::logWebhookData(getenv('TG_LOGS_DIR') . '/' . getenv('TG_BOT_USERNAME') . '_webhook_github.log');

public/webhooks/travis-ci.php

@@ -23,4 +23,4 @@
 }
 
 // Save all incoming data to a log file for future reference.
-Utils::logWebhookData(__DIR__ . '/../../logs/' . getenv('SB_BOT_USERNAME') . '_webhook_travis-ci.log');
+Utils::logWebhookData(getenv('TG_LOGS_DIR') . '/' . getenv('TG_BOT_USERNAME') . '_webhook_travis-ci.log');