MERMS/MermsMedia
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Environmant fix

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2026-01-04 07:51:30 -05:00
parent 9d360a74ad
commit 9723a18a35
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Controllers/Home.php
+4 -1
View File
@@ -7,7 +7,10 @@ class Home extends BaseController
public function index(): string public function index(): string
{ {
$data["config_name"] = $_ENV['CONFIG_NAME']; $data["config_name"] = $_ENV['CONFIG_NAME'];
/// return view('welcome_message',$data); if ($_ENV['CI_ENV'] === 'production') {
return view('live_welcome_message', $data); return view('live_welcome_message', $data);
} else {
return view('welcome_message', $data);
}
} }
} }
app/Controllers/Media.php
-1
View File
@@ -9,7 +9,6 @@ class Media extends BaseController
public function index(): void public function index(): void
{ {
$target_file = "/var/www/html/SITEFILES/TEST/test.jpg"; $target_file = "/var/www/html/SITEFILES/TEST/test.jpg";
$filename = $target_file; $filename = $target_file;
$file_extension = strtolower(substr(strrchr($filename, "."), 1)); $file_extension = strtolower(substr(strrchr($filename, "."), 1));
app/Views/live_welcome_message.php
+1 -1
View File
@@ -59,7 +59,7 @@
<header> <header>
<div class="heroe"> <div class="heroe">
<h1>MERMS-Media - <?= $data ?? '' ?> </h1> <h1>MERMS-Media - <?= $config_name ?? '' ?> </h1>
</div> </div>
</header> </header>
app/Views/welcome_message.php
+1 -1
View File
@@ -59,7 +59,7 @@
<header> <header>
<div class="heroe"> <div class="heroe">
<h1>MERMS-Media - <?= $data ?? '' ?> </h1> <h1>MERMS-Media - <?= $config_name ?? '' ?> </h1>
</div> </div>
</header> </header>
docker-compose.production.yml
+2 -1
View File
@@ -10,7 +10,7 @@ services:
- APACHE_RUN_USER=#${UID} - APACHE_RUN_USER=#${UID}
- APACHE_RUN_GROUP=#${UID} - APACHE_RUN_GROUP=#${UID}
- CI_ENVIRONMENT=production - CI_ENVIRONMENT=production
- CI_ENV=${CI_ENV:-production} - CI_ENV=production
- CI_CONFIG - CI_CONFIG
- MAIN_DATABASE_IP=10.13.3.60 - MAIN_DATABASE_IP=10.13.3.60
- MAIN_DATABASE_USERNAME=merms_panel - MAIN_DATABASE_USERNAME=merms_panel
@@ -18,6 +18,7 @@ services:
- MAIN_DATABASE=merms_panel - MAIN_DATABASE=merms_panel
- MAIN_DATABASE_PORT=5432 - MAIN_DATABASE_PORT=5432
- UPLOAD_FOLDER=/var/www/html/uploads/LIVE - UPLOAD_FOLDER=/var/www/html/uploads/LIVE
- CONFIG_NAME='LV'
restart: unless-stopped restart: unless-stopped
image: registry.chiefsoft.net/mermsprovision:latest image: registry.chiefsoft.net/mermsprovision:latest
volumes: volumes:
docker-compose.yml
+2 -1
View File
@@ -10,8 +10,9 @@ services:
- APACHE_RUN_USER=#${UID} - APACHE_RUN_USER=#${UID}
- APACHE_RUN_GROUP=#${UID} - APACHE_RUN_GROUP=#${UID}
- CI_ENVIRONMENT=development - CI_ENVIRONMENT=development
- CI_ENV=${CI_ENV:-development} - CI_ENV=development
- CI_CONFIG - CI_CONFIG
- CONFIG_NAME='DV'
restart: unless-stopped restart: unless-stopped
image: registry.chiefsoft.net/merms-media:latest image: registry.chiefsoft.net/merms-media:latest
volumes: volumes: