diff --git a/bash/nginx.conf b/bash/nginx.conf index 41e6516..809c71f 100755 --- a/bash/nginx.conf +++ b/bash/nginx.conf @@ -5,7 +5,6 @@ server { root /var/www/public; - location /hub/ { proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; @@ -14,53 +13,18 @@ server { proxy_pass http://mercure/; } + location / { # try to serve file directly, fallback to index.php try_files $uri /index.php$is_args$args; } - # optionally disable falling back to PHP script for the asset directories; - # nginx will return a 404 error when files are not found instead of passing the - # request to Symfony (improves performance but Symfony's 404 page is not displayed) - # location /bundles { - # try_files $uri =404; - # } - - location ~ ^/index\.php(/|$) { + location ~ \.php$ { fastcgi_pass app:9000; - fastcgi_split_path_info ^(.+\.php)(/.*)$; include fastcgi_params; - - # optionally set the value of the environment variables used in the application - # fastcgi_param APP_ENV prod; - # fastcgi_param APP_SECRET ; - # fastcgi_param DATABASE_URL "mysql://db_user:db_pass@host:3306/db_name"; - - # When you are using symlinks to link the document root to the - # current version of your application, you should pass the real - # application path instead of the path to the symlink to PHP - # FPM. - # Otherwise, PHP's OPcache may not properly detect changes to - # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126 - # for more information). - # Caveat: When PHP-FPM is hosted on a different machine from nginx - # $realpath_root may not resolve as you expect! In this case try using - # $document_root instead. fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param DOCUMENT_ROOT $document_root; - # Prevents URIs that include the front controller. This will 404: - # http://example.com/index.php/some-path - # Remove the internal directive to allow URIs like this internal; } - - # return 404 for all other php files not matching the front controller - # this prevents access to other php files you don't want to be accessible. - location ~ \.php$ { - return 404; - } - - error_log /var/log/nginx/project_error.log; - access_log /var/log/nginx/project_access.log; } \ No newline at end of file diff --git a/compose.yml b/compose.yml index bed9343..32342d2 100755 --- a/compose.yml +++ b/compose.yml @@ -13,9 +13,10 @@ services: - $PWD/bash/certs:/etc/ssl web: - build: - dockerfile: docker/Dockerfile.web - context: . +# build: +# dockerfile: docker/Dockerfile.web +# context: . + image: code.caldwell.digital/home/torsearch-web:latest depends_on: app: condition: service_healthy @@ -28,7 +29,10 @@ services: restart: unless-stopped app: - build: . +# build: +# dockerfile: docker/Dockerfile.app +# context: . + image: code.caldwell.digital/home/torsearch-app:latest volumes: - ./:/var/www depends_on: diff --git a/docs/examples/.env b/docs/examples/.env index 700e0c5..6049a7c 100644 --- a/docs/examples/.env +++ b/docs/examples/.env @@ -5,6 +5,7 @@ # used to generate the Mercure URL behind the scenes. APP_URL="https://torsearch.idocode.io" APP_SECRET="70169beadfbc8101c393cbfbba27a313" +APP_ENV=prod # Use the DATABASE_URL below to use the MariaDB container # provided in the example.compose.yml file, or remove this