hostname.

UtrechtUniversity · Dec 24, 2024 · 25bfd39 · 25bfd39
1 parent dd877c1
commit 25bfd39
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/docker-image-Laravel.yml b/.github/workflows/docker-image-Laravel.yml
@@ -3,7 +3,7 @@ on:
   push:
     branches: [ "master", "develop", "feature/*"]
   pull_request:
-    branches: [ "master", "develop"]
+    branches: [ "master"]
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}

diff --git a/.github/workflows/docker-image-Nginx.yml b/.github/workflows/docker-image-Nginx.yml
@@ -10,7 +10,7 @@ on:
   push:
     branches: [ "master", "develop", "feature/*"]
   pull_request:
-    branches: [ "master", "develop"]
+    branches: [ "master"]
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/openshift/vhost.conf b/openshift/vhost.conf
@@ -1,9 +1,10 @@
 server {
     listen 8080;
     listen [::]:8080;
-    server_name app.openshift.fss.uu.nl;
+    ## server_name app.openshift.fss.uu.nl;
+    server_name sample-app;
 
-    root /;
+    root /var/www/public;
     index index.php index.html;
 
     access_log /var/log/nginx/access.log;
@@ -16,9 +17,10 @@ server {
     location ~ \.php$ {
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_index index.php;
         fastcgi_pass sample-app:9000;
-        fastcgi_param SCRIPT_FILENAME $request_filename;
+        fastcgi_index index.php;
         include fastcgi_params;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
     }
 }