From b38d78ead3d3ef71587b01b2d92396d245822f6f Mon Sep 17 00:00:00 2001 From: qiaofeng1227 <76487013@qq.com> Date: Sat, 12 Aug 2023 16:36:28 +0800 Subject: [PATCH] init config edit --- docker/w9nginxproxymanager/initproxy.conf | 7 ++++--- install/install.sh | 2 +- version.json | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/w9nginxproxymanager/initproxy.conf b/docker/w9nginxproxymanager/initproxy.conf index f2176b25..9f2773be 100644 --- a/docker/w9nginxproxymanager/initproxy.conf +++ b/docker/w9nginxproxymanager/initproxy.conf @@ -17,7 +17,7 @@ server { rewrite ^/locales/(.*) /portainer/locales/$1 break; } - location /portainer/ { + location /portainer/ { proxy_set_header Host $host; proxy_set_header X-Forwarded-Scheme $scheme; proxy_set_header X-Forwarded-Proto $scheme; @@ -35,9 +35,10 @@ server { return 204; } set $quot_tmp "\""; - set $portainer_jwt "${quot_tmp}${arg_portainer_jwt}${quot_tmp}"; + # set $portainer_jwt "${quot_tmp}${arg_portainer_jwt}${quot_tmp}"; + set $portainer_jwt "${quot_tmp}${cookie_portainerJWT}${quot_tmp}"; sub_filter '' ""; - sub_filter_once off; + sub_filter_once on; sub_filter_types *; } diff --git a/install/install.sh b/install/install.sh index a1afeb28..7d015685 100644 --- a/install/install.sh +++ b/install/install.sh @@ -455,7 +455,7 @@ EditMenu(){ echo "Start to Edit Cockpit Menu ..." # uninstall plugins -rm -rf /usr/share/cockpit/apps /usr/share/cockpit/selinux /usr/share/cockpit/kdump /usr/share/cockpit/sosreport /usr/share/cockpit/packagekit +rm -rf /usr/share/cockpit/apps /usr/share/cockpit/selinux /usr/share/cockpit/kdump /usr/share/cockpit/sosreport cp -r /data/apps/websoft9/cockpit/menu_override/* /etc/cockpit echo "---------------------------------- Install success! When installation completed, you can access it by: http://Internet IP:9000 and using Linux user for login to install a app by websoft9's appstore. -------------------------------------------------------" diff --git a/version.json b/version.json index e46befef..e414f130 100644 --- a/version.json +++ b/version.json @@ -19,6 +19,7 @@ "37" ], "RedHat": [ + "9", "8", "7" ],