Introduced pub/ folder structure for webserver home folder mapping (O…

…penMage#1210)

Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Co-authored-by: Colin Mollenhour <colin@mollenhour.com>

dev/openmage/apache/Dockerfile

@@ -0,0 +1,6 @@
+FROM ghcr.io/colinmollenhour/docker-openmage-dev:8.2-apache
+
+ENV APACHE_DOCUMENT_ROOT /var/www/html/pub/default
+
+RUN sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf
+RUN sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf

dev/openmage/docker-compose.yml

@@ -2,7 +2,7 @@ version: "3.7"
 
 services:
   apache:
-    image: ghcr.io/colinmollenhour/docker-openmage-dev:8.2-apache
+    build: apache
     hostname: ${HOST_NAME:-openmage-7f000001.nip.io}
     ports:
       - "${HOST_PORT:-80}:80"

errors/processor.php

@@ -111,8 +111,8 @@ public function __construct()
         $this->_root  = is_dir($this->_indexDir.'app');
 
         $this->_prepareConfig();
-        if (isset($_GET['skin'])) {
-            $this->_setSkin($_GET['skin']);
+        if (isset($_SERVER['MAGE_ERRORS_SKIN']) || isset($_GET['skin'])) {
+            $this->_setSkin($_SERVER['MAGE_ERRORS_SKIN'] ?? $_GET['skin']);
         }
     }
 
@@ -208,7 +208,7 @@ public function getBaseUrl(bool $param = false): string
      */
     protected function _getClientIp(): string
     {
-        return $_SERVER['REMOTE_ADDR'] ?? 'undefined';
+        return $_SERVER['HTTP_X_FORWARDED_FOR'] ?? $_SERVER['REMOTE_ADDR'] ?? 'undefined';
     }
 
     protected function _getIndexDir(): string

pub/default/.htaccess

@@ -0,0 +1 @@
+../../.htaccess

pub/default/api.php

@@ -0,0 +1,5 @@
+<?php
+
+chdir(dirname(__DIR__, 2));
+
+require 'api.php';

pub/default/errors

@@ -0,0 +1 @@
+../../errors

pub/default/get.php

@@ -0,0 +1,5 @@
+<?php
+
+chdir(dirname(__DIR__, 2));
+
+require 'get.php';

pub/default/index.php

@@ -0,0 +1,25 @@
+<?php
+//
+// This file is the entrypoint for the default OpenMage store.
+// Create a separate subdirectory of pub/ to add more virtual hosts for different stores
+// with different root directories and assign the run code and run type variables below as appropriate.
+//
+
+chdir(dirname(__DIR__, 2));
+
+/* Store or website code */
+if (empty($_SERVER['MAGE_RUN_CODE'])) {
+    $_SERVER['MAGE_RUN_CODE'] = '';
+}
+
+/* Run store or run website */
+if (empty($_SERVER['MAGE_RUN_TYPE'])) {
+    $_SERVER['MAGE_RUN_TYPE'] = 'store';
+}
+
+/* Errors pages skin */
+if (empty($_SERVER['MAGE_ERRORS_SKIN'])) {
+    $_SERVER['MAGE_ERRORS_SKIN'] = 'default';
+}
+
+require 'index.php';

pub/default/install.php

@@ -0,0 +1,9 @@
+<?php
+
+chdir(dirname(__DIR__, 2));
+
+if (file_exists('app/etc/local.xml')) {
+    require 'errors/404.php';
+} else {
+    require 'install.php';
+}

pub/default/js

@@ -0,0 +1 @@
+../../js

pub/default/media

@@ -0,0 +1 @@
+../../media

pub/default/skin

@@ -0,0 +1 @@
+../../skin