smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-bz12069-24syntax.patch

diff -Nur --no-dereference smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder
--- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder      2022-08-01 00:26:08.196000000 -0400
+++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder  2022-08-01 01:24:16.409000000 -0400
@@ -1,14 +1,28 @@
+#
+# ZoneMinder Apache configuration file
+# With SSLRequire and HTTPS auto redirect
+# Modify this configuration to suit your requirements
+#
+
+<Directory "/var/cache/zoneminder">
+    SSLRequireSSL
+    Options -Indexes +MultiViews +FollowSymLinks
+    AllowOverride None
+    Require all granted
+</Directory>
+
 
-Alias /zm "/usr/share/zoneminder/www"
 <Directory "/usr/share/zoneminder/www">
-    Options -Indexes -MultiViews -FollowSymLinks
+    # explicitly set index.php as the only directoryindex
+    DirectoryIndex disabled
+    DirectoryIndex index.php
+    SSLRequireSSL
+    Options -Indexes +MultiViews +FollowSymLinks
     #AddType application/x-httpd-php .php
     <FilesMatch .php>
         SetHandler "proxy:unix:/var/run/php-fpm/php74.sock|fcgi://localhost"
     </FilesMatch>
     AllowOverride All
-    Order allow,deny
-    Allow from all
     AuthName "Zoneminder"
     AuthType Basic
     AuthBasicProvider external
@@ -17,8 +31,34 @@
 </Directory>
 
 <Directory "/usr/libexec/zoneminder/cgi-bin">
-    AllowOverride All
-    Options ExecCGI FollowSymLinks
-    Order allow,deny
-    Allow from all
+    SSLRequireSSL
+    AllowOverride None
+    Options +ExecCGI +FollowSymLinks
+    Require all granted
+</Directory>
+
+# For better visibility, the following directives have been migrated from the
+# default .htaccess files included with the CakePHP project.
+# Parameters not set here are inherited from the parent directive above.
+<Directory "/usr/share/zoneminder/www/api">
+   RewriteEngine on
+   RewriteRule ^$ app/webroot/ [L]
+   RewriteRule (.*) app/webroot/$1 [L]
+   RewriteBase /zm/api
 </Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app">
+   RewriteEngine on
+   RewriteRule ^$ webroot/ [L]
+   RewriteRule (.*) webroot/$1 [L]
+   RewriteBase /zm/api
+</Directory>
+
+<Directory "/usr/share/zoneminder/www/api/app/webroot">
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ index.php [L]
+    RewriteBase /zm/api
+</Directory>
+
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,12 @@
-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"
1	jpp	1.2	diff -Nur --no-dereference smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder
2			--- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2022-08-01 00:26:08.196000000 -0400
3			+++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2022-08-01 01:24:16.409000000 -0400
4			@@ -1,14 +1,28 @@
5			+#
6			+# ZoneMinder Apache configuration file
7			+# With SSLRequire and HTTPS auto redirect
8			+# Modify this configuration to suit your requirements
9			+#
10			+
11			+<Directory "/var/cache/zoneminder">
12			+ SSLRequireSSL
13			+ Options -Indexes +MultiViews +FollowSymLinks
14			+ AllowOverride None
15			+ Require all granted
16			+</Directory>
17			+
18
19			-Alias /zm "/usr/share/zoneminder/www"
20			<Directory "/usr/share/zoneminder/www">
21			- Options -Indexes -MultiViews -FollowSymLinks
22			+ # explicitly set index.php as the only directoryindex
23			+ DirectoryIndex disabled
24			+ DirectoryIndex index.php
25			+ SSLRequireSSL
26			+ Options -Indexes +MultiViews +FollowSymLinks
27			#AddType application/x-httpd-php .php
28			<FilesMatch .php>
29	jpp	1.1	SetHandler "proxy:unix:/var/run/php-fpm/php74.sock\|fcgi://localhost"
30			</FilesMatch>
31			AllowOverride All
32			- Order allow,deny
33			- Allow from all
34			AuthName "Zoneminder"
35			AuthType Basic
36			AuthBasicProvider external
37	jpp	1.2	@@ -17,8 +31,34 @@
38			</Directory>
39
40	jpp	1.1	<Directory "/usr/libexec/zoneminder/cgi-bin">
41	jpp	1.2	- AllowOverride All
42			- Options ExecCGI FollowSymLinks
43	jpp	1.1	- Order allow,deny
44			- Allow from all
45	jpp	1.2	+ SSLRequireSSL
46			+ AllowOverride None
47			+ Options +ExecCGI +FollowSymLinks
48	jpp	1.1	+ Require all granted
49	jpp	1.2	+</Directory>
50			+
51			+# For better visibility, the following directives have been migrated from the
52			+# default .htaccess files included with the CakePHP project.
53			+# Parameters not set here are inherited from the parent directive above.
54			+<Directory "/usr/share/zoneminder/www/api">
55			+ RewriteEngine on
56			+ RewriteRule ^$ app/webroot/ [L]
57			+ RewriteRule (.*) app/webroot/$1 [L]
58			+ RewriteBase /zm/api
59	jpp	1.1	</Directory>
60	jpp	1.2	+
61			+<Directory "/usr/share/zoneminder/www/api/app">
62			+ RewriteEngine on
63			+ RewriteRule ^$ webroot/ [L]
64			+ RewriteRule (.*) webroot/$1 [L]
65			+ RewriteBase /zm/api
66			+</Directory>
67			+
68			+<Directory "/usr/share/zoneminder/www/api/app/webroot">
69			+ RewriteEngine On
70			+ RewriteCond %{REQUEST_FILENAME} !-d
71			+ RewriteCond %{REQUEST_FILENAME} !-f
72			+ RewriteRule ^ index.php [L]
73			+ RewriteBase /zm/api
74			+</Directory>
75			+
76			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
77			--- 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
78			+++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/23zoneminder 2022-08-01 01:24:37.446000000 -0400
79	jpp	1.3	@@ -1 +1,12 @@
80	jpp	1.2	-ScriptAlias /cgi-bin-zm /usr/libexec/zoneminder/cgi-bin
81	jpp	1.3	+ #Zoneminder
82			+{
83			+$OUT="";
84			+if ( $port ne $SSLPort ) {
85			+ $OUT .= "RewriteEngine On\n";
86			+ $OUT .= 'RewriteCond %{HTTPS} !=on'."\n";
87			+ $OUT .= 'RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]'."\n";}
88			+}
89			+ # Order matters. This alias must come first.
90			+ Alias /zm/cache "/var/cache/zoneminder"
91			+ Alias /zm "/usr/share/zoneminder/www"
92			+ ScriptAlias /cgi-bin-zm "/usr/libexec/zoneminder/cgi-bin"