release rc2.1.18

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

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

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
+PROXY_VERSION=2.11.3-rc9

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

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

version.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.1.17",
+  "version": "2.1.18-rc1",
   "plugins": {
     "portainer": "0.1.3",
     "nginx": "0.1.0",