Update webserver config

docker/.env

@@ -8,8 +8,8 @@ APP_FOLDER="../project"
 #
 # APACHE
 #
-HTTPD_SERVER_NAME=_
-HTTPD_LISTEN_PORT=80
+HTTP_SERVER_NAME=_
+API_LISTEN_PORT=80
 
 #
 # Adminer

docker/apache/vhosts/000-default.conf

@@ -1,23 +1,32 @@
-<VirtualHost *:80>
-  #
-  # Following lines need to be updated to your needs
-	#
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
 
-  #ServerName www.example.com
+<VirtualHost *:80>
+  ServerName _
 
 	ServerAdmin webmaster@localhost
-	DocumentRoot /var/www/html/public
-  DirectoryIndex /index.php
+	DocumentRoot /var/www/html/
+
+  <Directory /var/www/html/api/public>
+    RewriteEngine On
+    RewriteBase /var/www/html/api/public
 
-  <Directory /var/www/html/public>
     AllowOverride None
     Order Allow,Deny
     Allow from All
 
-    FallbackResource /index.php
+    FallbackResource /api/public/index.php
+  </Directory>
+
+  <Directory /var/www/html/app>
+    AllowOverride None
+    Order Allow,Deny
+    Allow from All
+
+    DirectoryIndex index.html
   </Directory>
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
 	CustomLog ${APACHE_LOG_DIR}/access.log combined
 
 </VirtualHost>
+

docker/docker-compose.yml

@@ -6,26 +6,6 @@ networks:
     name: "${APP_NAME}-net"
 
 services:
-  # apache:
-  #   container_name: "${APP_NAME}-apache"
-  #   labels:
-  #     local.project: "${APP_NAME}"
-  #   build:
-  #     context: .
-  #     dockerfile: apache/Dockerfile
-  #   restart: always
-  #   ports:
-  #     - "${HTTPD_LISTEN_PORT}:80"
-  #   volumes:
-  #     - "${APP_FOLDER}:/usr/local/apache2/htdocs"
-  #     - ./apache/vhosts:/etc/apache2/sites-enabled
-  #     - ./tmp:/tmp
-  #     - ./apache/logs:/var/log/httpd:cached
-  #   depends_on:
-  #     - php
-  #   networks:
-  #     - mynetwork
-
   php:
     container_name: "${APP_NAME}-php"
     labels:
@@ -35,12 +15,14 @@ services:
       dockerfile: php/Dockerfile
     restart: always
     ports:
-      - "${HTTPD_LISTEN_PORT}:80"
+      - "${API_LISTEN_PORT}:80"
     volumes:
       - "${APP_FOLDER}:/var/www/html"
       - ./apache/vhosts:/etc/apache2/sites-enabled
       - ./apache/logs:/var/log/apache2:cached
       - ./tmp:/tmp
+    environment:
+      serverMail: "localhost"
     networks:
       - mynetwork
 
@@ -54,7 +36,7 @@ services:
       - "${MARIADB_PORT}:3306"
     volumes:
       - db_data:/var/lib/mysql
-      # - ./mariadb:/etc/mysql
+      - ./mariadb:/etc/mysql
     environment:
       MARIADB_ROOT_PASSWORD: "${MARIADB_ROOT_PASSWORD}"
       MARIADB_USER: "${MARIADB_USER}"
@@ -104,7 +86,7 @@ services:
       - "${POSTGRES_PORT}:5432"
     volumes:
       - db_data:/var/lib/postgresql/data
-      # - ./postgresql:/etc/postgresql
+      - ./postgresql:/etc/postgresql
     environment:
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"
       POSTGRES_USER: "${POSTGRES_USER}"
@@ -131,7 +113,6 @@ services:
     ports:
       - "${ADMINER_PORT}:8080"
     depends_on:
-      # - apache
       - php
     networks:
       - mynetwork