diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index 5934333..5327c96 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -6,6 +6,8 @@ class Home extends BaseController { public function index(): string { - return view('welcome_message'); + $data["config_name"] = $_ENV['CONFIG_NAME']; + /// return view('welcome_message',$data); + return view('live_welcome_message',$data); } } diff --git a/app/Views/live_welcome_message.php b/app/Views/live_welcome_message.php new file mode 100644 index 0000000..c7825c2 --- /dev/null +++ b/app/Views/live_welcome_message.php @@ -0,0 +1,70 @@ + + + + + MERMS-GENERAL MEDIA + + + + + + + + + + +
+
+

MERMS-Media -

+
+ +
+ + + diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index 85dd214..519553a 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -59,7 +59,7 @@
-

MERMS-Media

+

MERMS-Media -

diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 29fc44f..79bd4ca 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -12,6 +12,12 @@ services: - CI_ENVIRONMENT=production - CI_ENV=${CI_ENV:-production} - CI_CONFIG + - MAIN_DATABASE_IP=10.13.3.60 + - MAIN_DATABASE_USERNAME=merms_panel + - MAIN_DATABASE_PASSWORD=merms_panel + - MAIN_DATABASE=merms_panel + - MAIN_DATABASE_PORT=5432 + - UPLOAD_FOLDER=/var/www/html/uploads/LIVE restart: unless-stopped image: registry.chiefsoft.net/mermsprovision:latest volumes: