From cdfddb7062d1de00aa8b94fb34d861fa70707f14 Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Fri, 13 Dec 2024 14:55:10 +0800
Subject: [PATCH] release rc

---
 changelog_latest.md       | 1 +
 docker/.env               | 2 +-
 docker/proxy/Dockerfile   | 4 ++--
 systemd/script/crontab.sh | 5 ++++-
 version.json              | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/changelog_latest.md b/changelog_latest.md
index d4c9cbfe..2148ecc5 100644
--- a/changelog_latest.md
+++ b/changelog_latest.md
@@ -1,4 +1,5 @@
 ### enhancement:
+- cockpit upgrade，port change to 9090 when linux upgrage #556
 - upgrade error at CentOS Stream #554
 - Optimize install_docker.sh #547
 - Nginxproxymanage add named volume nginx_custom #527
diff --git a/docker/.env b/docker/.env
index 8d56becd..f2644b5c 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,4 +1,4 @@
 APPHUB_VERSION=0.1.6
 DEPLOYMENT_VERSION=2.20.3
 GIT_VERSION=1.21.9
-PROXY_VERSION=2.11.3-rc9
\ No newline at end of file
+PROXY_VERSION=2.11.3
\ No newline at end of file
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index 7f623807..634e7040 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -1,11 +1,11 @@
-# modify time: 202412130835, you can modify here to trigger Docker Build action
+# modify time: 202412131435, you can modify here to trigger Docker Build action
 # from Dockerfile: https://github.com/NginxProxyManager/nginx-proxy-manager/blob/develop/docker/Dockerfile
 # from image: https://hub.docker.com/r/jc21/nginx-proxy-manager
 
 FROM jc21/nginx-proxy-manager:2.11.3
 
 LABEL maintainer="Websoft9<help@websoft9.com>"
-LABEL version="2.11.3-rc9"
+LABEL version="2.11.3"
 
 COPY README.md /data/nginx/README.md
 RUN mkdir /data/nginx/custom
diff --git a/systemd/script/crontab.sh b/systemd/script/crontab.sh
index 20e42d3e..b20acbbf 100644
--- a/systemd/script/crontab.sh
+++ b/systemd/script/crontab.sh
@@ -58,8 +58,11 @@ set_Firewalld(){
     firewall-cmd --reload 2>/dev/nul
 }
 
+# when websoft9 restart, sync cockpit port
+on_change
+
 # monitor /lib/systemd/system/cockpit.socket and config.ini, make sure config.ini port is the same with cockpit.socket
-inotifywait -e modify -m $FILES | while read PATH EVENT FILE; do
+inotifywait -e modify,attrib -m $FILES | while read PATH EVENT FILE; do
     echo "Set cockpit port by config.ini..."
     export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$PATH
     on_change
diff --git a/version.json b/version.json
index ecbf82bc..edff1d5c 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.17-rc1",
+  "version": "2.1.17-rc2",
   "plugins": {
     "portainer": "0.1.3",
     "nginx": "0.1.0",