From 1c5f54f8daa0f68bd6cd2c10cfd2922b52f84113 Mon Sep 17 00:00:00 2001
From: qtwrk <qtwrk555@gmail.com>
Date: Tue, 10 Mar 2020 04:09:22 +0100
Subject: [PATCH] make self-signed cert more compatible with MacOS

---
 cyberpanel.sh | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/cyberpanel.sh b/cyberpanel.sh
index 6bae318d7..d4ce5caf9 100644
--- a/cyberpanel.sh
+++ b/cyberpanel.sh
@@ -1102,6 +1102,41 @@ cd cyberpanel/install
 curl https://cyberpanel.sh/?version
 }
 
+regenerate_cert() {
+cat << EOF > /root/cyberpanel/cert_conf
+[req]
+prompt=no
+distinguished_name=cyberpanel
+[cyberpanel]
+commonName = www.example.com
+countryName = CP
+localityName = CyberPanel
+organizationName = CyberPanel
+organizationalUnitName = CyberPanel
+stateOrProvinceName = CP
+emailAddress = mail@example.com
+name = CyberPanel
+surname = CyberPanel
+givenName = CyberPanel
+initials = CP
+dnQualifier = CyberPanel
+[server_exts]
+extendedKeyUsage = 1.3.6.1.5.5.7.3.1
+EOF
+openssl req -x509 -config /root/cyberpanel/cert_conf -extensions 'server_exts' -nodes -days 820 -newkey rsa:3072 -keyout /usr/local/lscp/conf/key.pem -out /usr/local/lscp/conf/cert.pem
+
+if [[ $VERSION == "OLS" ]] ; then
+	key_path="/usr/local/lsws/admin/conf/webadmin.key"
+	cert_path="/usr/local/lsws/admin/conf/webadmin.crt"
+else
+	key_path="/usr/local/lsws/admin/conf/cert/admin.key"
+	cert_path="/usr/local/lsws/admin/conf/cert/admin.crt"
+fi
+
+openssl req -x509 -config /root/cyberpanel/cert_conf -extensions 'server_exts' -nodes -days 820 -newkey rsa:3072 -keyout $key_path -out $cert_path
+rm -f /root/cyberpanel/cert_conf
+}
+
 after_install() {
 if [ ! -d "/var/lib/php" ]; then
 	mkdir /var/lib/php
@@ -1201,6 +1236,9 @@ MYSQLPASSWD=$(cat /etc/cyberpanel/mysqlPassword)
 echo "$ADMIN_PASS" > /etc/cyberpanel/adminPass
 /usr/local/CyberPanel/bin/python /usr/local/CyberCP/plogical/adminPass.py --password $ADMIN_PASS
 mkdir -p /etc/opendkim
+
+regenerate_cert
+
 systemctl restart lscpd
 systemctl restart lsws
 echo "/usr/local/CyberPanel/bin/python /usr/local/CyberCP/plogical/adminPass.py --password \$@" > /usr/bin/adminPass