From 0d734655fecac07920d1eae155d5c8b0e51b3bbe Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Thu, 8 Jul 2021 02:15:49 +0200
Subject: [PATCH] wip

---
 bundles/nginx/files/nginx.conf | 9 ++++++++-
 bundles/nginx/items.py         | 1 +
 data/nextcloud/vhost.conf      | 4 ----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/bundles/nginx/files/nginx.conf b/bundles/nginx/files/nginx.conf
index fa5a94e..23c342e 100644
--- a/bundles/nginx/files/nginx.conf
+++ b/bundles/nginx/files/nginx.conf
@@ -11,8 +11,15 @@ http {
     default_type application/octet-stream;
     error_log /var/log/nginx/error.log;
     include /etc/nginx/mime.types;
-    include /etc/nginx/sites/*;
     sendfile on;
     server_names_hash_bucket_size 128;
     tcp_nopush on;
+    
+    % if node.has_bundle('php'):
+    upstream php-handler {
+        server unix:/var/run/php/php${node.metadata.get('php/version')}-fpm.sock;
+    }
+
+    % endif
+    include /etc/nginx/sites/*;
 }
diff --git a/bundles/nginx/items.py b/bundles/nginx/items.py
index b8c334a..add852e 100644
--- a/bundles/nginx/items.py
+++ b/bundles/nginx/items.py
@@ -20,6 +20,7 @@ directories = {
 
 files = {
     '/etc/nginx/nginx.conf': {
+        'content_type': 'mako',
         'triggers': {
             'svc_systemd:nginx:restart',
         },
diff --git a/data/nextcloud/vhost.conf b/data/nextcloud/vhost.conf
index 9c0c663..de4259f 100644
--- a/data/nextcloud/vhost.conf
+++ b/data/nextcloud/vhost.conf
@@ -1,7 +1,3 @@
-upstream php-handler {
-    server unix:/var/run/php/php7.3-fpm.sock;
-}
-
 server {
     listen 443      ssl http2;
     listen [::]:443 ssl http2;