From c9ef887b4d3b1dc80d9db6cb29cc44f467a6fb3a Mon Sep 17 00:00:00 2001
From: qiaofeng1227 <76487013@qq.com>
Date: Tue, 17 Dec 2024 14:21:43 +0800
Subject: [PATCH] release rc2.1.18

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

diff --git a/changelog_latest.md b/changelog_latest.md
index 2148ecc5..c2c756f6 100644
--- a/changelog_latest.md
+++ b/changelog_latest.md
@@ -1,4 +1,5 @@
 ### enhancement:
+- Upgrade access to the Websoft9 platform from HTTP to HTTPS #566
 - cockpit upgrade，port change to 9090 when linux upgrage #556
 - upgrade error at CentOS Stream #554
 - Optimize install_docker.sh #547
diff --git a/cockpit/cockpit.conf b/cockpit/cockpit.conf
index bdf155a1..f55d7f3d 100644
--- a/cockpit/cockpit.conf
+++ b/cockpit/cockpit.conf
@@ -1,5 +1,5 @@
 # docs: https://cockpit-project.org/guide/latest/cockpit.conf.5.html
 
 [WebService]
-AllowUnencrypted = true
+#AllowUnencrypted = true
 LoginTitle= Websoft9 - Linux AppStore
\ No newline at end of file
diff --git a/docker/.env b/docker/.env
index f2644b5c..8d56becd 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
\ No newline at end of file
+PROXY_VERSION=2.11.3-rc9
\ No newline at end of file
diff --git a/docker/proxy/Dockerfile b/docker/proxy/Dockerfile
index 634e7040..75340eac 100644
--- a/docker/proxy/Dockerfile
+++ b/docker/proxy/Dockerfile
@@ -5,7 +5,7 @@
 FROM jc21/nginx-proxy-manager:2.11.3
 
 LABEL maintainer="Websoft9<help@websoft9.com>"
-LABEL version="2.11.3"
+LABEL version="2.11.3-rc9"
 
 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 b20acbbf..24b7b4d9 100644
--- a/systemd/script/crontab.sh
+++ b/systemd/script/crontab.sh
@@ -58,12 +58,19 @@ set_Firewalld(){
     firewall-cmd --reload 2>/dev/nul
 }
 
-# when websoft9 restart, sync cockpit port
+# when websoft9 restart, sync cockpit port and ssl
 on_change
+cp -r /etc/cockpit/ws-certs.d/* /var/lib/docker/volumes/websoft9_nginx_data/_data/custom_ssl/
 
 # monitor /lib/systemd/system/cockpit.socket and config.ini, make sure config.ini port is the same with cockpit.socket
 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
+done
+
+# monitor /etc/cockpit/ws-certs.d and copy files to /var/lib/docker/volumes/websoft9_nginx_data/_data/custom_ssl
+inotifywait -e create,modify,delete -m /etc/cockpit/ws-certs.d | while read PATH EVENT FILE; do
+    echo "Copying files from /etc/cockpit/ws-certs.d to /var/lib/docker/volumes/websoft9_nginx_data/_data/custom_ssl..."
+    cp -r /etc/cockpit/ws-certs.d/* /var/lib/docker/volumes/websoft9_nginx_data/_data/custom_ssl/
 done
\ No newline at end of file
diff --git a/version.json b/version.json
index 313bad2f..f8e779b1 100644
--- a/version.json
+++ b/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.1.17",
+  "version": "2.1.18-rc1",
   "plugins": {
     "portainer": "0.1.3",
     "nginx": "0.1.0",