--- rpms/smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-bz12069-24syntax.patch	2022/08/01 05:26:29	1.2
+++ rpms/smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-bz12069-24syntax.patch	2022/08/01 05:55:18	1.3
@@ -76,16 +76,17 @@ diff -Nur --no-dereference smeserver-zon
 diff -Nur --no-dereference smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder
 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder	2022-08-01 00:26:08.189000000 -0400
 +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder	2022-08-01 01:24:37.446000000 -0400
-@@ -1 +1,11 @@
+@@ -1 +1,12 @@
 -ScriptAlias /cgi-bin-zm /usr/libexec/zoneminder/cgi-bin
-+#Zoneminder
-+
-+# Auto Redirect HTTP requests to HTTPS
-+RewriteEngine On
-+RewriteCond %{HTTPS} !=on
-+RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]
-+
-+# Order matters. This alias must come first.
-+Alias /zm/cache "/var/cache/zoneminder"
-+Alias /zm "/usr/share/zoneminder/www"
-+ScriptAlias /cgi-bin-zm "/usr/libexec/zoneminder/cgi-bin"
++    #Zoneminder
++{
++$OUT="";
++if ( $port ne $SSLPort ) {
++    $OUT .=  "RewriteEngine On\n";
++    $OUT .=  'RewriteCond %{HTTPS} !=on'."\n";
++    $OUT .=  'RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]'."\n";}
++}
++    # Order matters. This alias must come first.
++    Alias /zm/cache "/var/cache/zoneminder"
++    Alias /zm "/usr/share/zoneminder/www"
++    ScriptAlias /cgi-bin-zm "/usr/libexec/zoneminder/cgi-bin"