Changed config structure because we do not want to include shopware.conf automatically / Extracted some locations out of default.conf to be able to reuse it

Author: Tobias Lückel

bin/sdTest.sh

@@ -57,6 +57,7 @@ function init_environment {
     echo "Prepare directories"
     mkdir -p ${PROJECT_DIR}/etc/test
     mkdir -p ${PROJECT_DIR}/etc/test/nginx
+    mkdir -p ${PROJECT_DIR}/etc/test/nginx/conf.d
     mkdir -p ${PROJECT_DIR}/etc/test/php
 
     echo "Copying testing README"
@@ -67,7 +68,7 @@ function init_environment {
 
     echo "Copying config files to be able to easily modify it for special needs"
     cp ${PACKAGE_DIR}/php/* ${PROJECT_DIR}/etc/test/php
-    cp ${PACKAGE_DIR}/nginx/* ${PROJECT_DIR}/etc/test/nginx
+    cp -R ${PACKAGE_DIR}/nginx/* ${PROJECT_DIR}/etc/test/nginx
 
     echo "You can find additional information in the testing README, see 'README.TESTING.md'"
 }

docker-compose.yml

@@ -15,8 +15,8 @@ services:
       - shared_www:/var/www:delegated
       - ${PROJECT_DIR}:/opt/host:delegated
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf
-      - ./nginx/default.conf:/etc/nginx/conf.d/default.conf
-      - ./nginx/shopware.conf:/etc/nginx/conf.d/shopware.conf
+      - ./nginx/include.shopware.conf:/etc/nginx/include.shopware.conf
+      - ./nginx/conf.d/default.conf:/etc/nginx/conf.d/default.conf
     links:
       - shopware546_php72
       - shopware546_php71

nginx/conf.d/default.conf

@@ -0,0 +1,43 @@
+server {
+    server_name localhost;
+    listen 10872;
+
+    #access_log /var/logs/nginx_access.log;
+    root /var/www/shopware54_php72;
+    set $fastcgi_pass shopware546_php72:9000;
+
+    include /etc/nginx/include.shopware.conf;
+}
+
+server {
+    server_name localhost;
+    listen 10871;
+
+    #access_log /var/logs/nginx_access.log;
+    root /var/www/shopware54_php71;
+    set $fastcgi_pass shopware546_php71:9000;
+
+    include /etc/nginx/include.shopware.conf;
+}
+
+server {
+    server_name localhost;
+    listen 10870;
+
+    #access_log /var/logs/nginx_access.log;
+    root /var/www/shopware54_php70;
+    set $fastcgi_pass shopware546_php70:9000;
+
+    include /etc/nginx/include.shopware.conf;
+}
+
+server {
+    server_name localhost;
+    listen 10856;
+
+    #access_log /var/logs/nginx_access.log;
+    root /var/www/shopware54_php56;
+    set $fastcgi_pass shopware546_php56:9000;
+
+    include /etc/nginx/include.shopware.conf;
+}

nginx/default.conf

@@ -0,0 +1,18 @@
+client_max_body_size 128M;
+
+location / {
+    # try to serve file directly, fallback to index.php
+    try_files $uri /shopware.php$is_args$args;
+}
+
+location ~ ^/shopware\.php(/|$) {
+    fastcgi_pass $fastcgi_pass;
+    fastcgi_split_path_info ^(.+\.php)(/.*)$;
+
+    include fastcgi_params;
+
+    fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+    fastcgi_param DOCUMENT_ROOT $realpath_root;
+
+    #internal;
+}