Merge branch 'prod' into dev

pillars/roles/nginx/jellyfin.sls

@@ -4,6 +4,11 @@ nginx:
     https:
       port: 8096
       prot: http
+    proxy_headers:
+      X-Forwarded-Protocol: $scheme
+      Upgrade: $http_upgrade
+      Connection: upgrade
+
 
 portal:
   Media:

pillars/roles/nginx/nextcloud.sls

@@ -1,10 +1,3 @@
-nginx:
-  cloud:
-    auth: none
-    https:
-      port: 8080
-      prot: http
-
 portal:
   Misc:
     cloud:

states/roles/maintain/nextcloud.old/nextcloud-php.ini

@@ -928,7 +928,7 @@ extension=intl
 ;extension=odbc
 ;zend_extension=opcache
 ;extension=pdo_dblib
-;extension=pdo_mysql
+extension=pdo_mysql
 ;extension=pdo_odbc
 ;extension=pdo_pgsql
 ;extension=pdo_sqlite

states/roles/maintain/nginx-proxy/local.conf

@@ -38,6 +38,11 @@ server {
     proxy_set_header X-Forwarded-For $remote_addr;
     proxy_set_header X-Forwarded-Ssl on;
 
+{%- if pillar['nginx'][server]['proxy_headers'] is defined -%}
+  {%- for header in pillar['nginx'][server]['proxy_headers'] %}
+    proxy_set_header {{header}} {{pillar['nginx'][server]['proxy_headers'][header]}};
+  {%- endfor %}
+{%- endif %}
 
     # re-write redirects to http as to https, example: /home
     proxy_redirect http:// https://;

states/roles/maintain/nginx-proxy/remote.conf

@@ -37,8 +37,17 @@ server {
     {% set location="2" %}{% include 'roles/maintain/nginx-proxy/auth.conf' %}
     proxy_pass $backend;
     proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_set_header X-Forwarded-Port 443;
     proxy_set_header X-Real-IP  $remote_addr;
     proxy_set_header X-Forwarded-For $remote_addr;
+    proxy_set_header X-Forwarded-Ssl on;
+
+{%- if pillar['nginx'][server]['proxy_headers'] is defined -%}
+  {%- for header in pillar['nginx'][server]['proxy_headers'] %}
+    proxy_set_header {{header}} {{pillar['nginx'][server]['proxy_headers'][header]}};
+  {%- endfor %}
+{%- endif %}
 
     # re-write redirects to http as to https, example: /home
     proxy_redirect http:// https://;