/[smecontribs]/rpms/smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-bz12069-24syntax.patch
ViewVC logotype

Diff of /rpms/smeserver-zoneminder/contribs10/smeserver-zoneminder-1.0-bz12069-24syntax.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

Revision 1.1 by jpp, Mon Aug 1 04:32:52 2022 UTC Revision 1.2 by jpp, Mon Aug 1 05:26:29 2022 UTC
# Line 1  Line 1 
1  diff -urN 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  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-07-22 13:16:11.659203129 +0300  --- 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-07-22 13:28:35.253426318 +0300  +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder  2022-08-01 01:24:16.409000000 -0400
4  @@ -7,8 +7,7 @@  @@ -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           SetHandler "proxy:unix:/var/run/php-fpm/php74.sock|fcgi://localhost"           SetHandler "proxy:unix:/var/run/php-fpm/php74.sock|fcgi://localhost"
30       </FilesMatch>       </FilesMatch>
31       AllowOverride All       AllowOverride All
32  -    Order allow,deny  -    Order allow,deny
33  -    Allow from all  -    Allow from all
 +    Require all granted  
34       AuthName "Zoneminder"       AuthName "Zoneminder"
35       AuthType Basic       AuthType Basic
36       AuthBasicProvider external       AuthBasicProvider external
37  @@ -19,6 +18,5 @@  @@ -17,8 +31,34 @@
38     </Directory>
39    
40   <Directory "/usr/libexec/zoneminder/cgi-bin">   <Directory "/usr/libexec/zoneminder/cgi-bin">
41       AllowOverride All  -    AllowOverride All
42       Options ExecCGI FollowSymLinks  -    Options ExecCGI FollowSymLinks
43  -    Order allow,deny  -    Order allow,deny
44  -    Allow from all  -    Allow from all
45    +    SSLRequireSSL
46    +    AllowOverride None
47    +    Options +ExecCGI +FollowSymLinks
48  +    Require all granted  +    Require all granted
49    +</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   </Directory>   </Directory>
60    +
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    @@ -1 +1,11 @@
80    -ScriptAlias /cgi-bin-zm /usr/libexec/zoneminder/cgi-bin
81    +#Zoneminder
82    +
83    +# Auto Redirect HTTP requests to HTTPS
84    +RewriteEngine On
85    +RewriteCond %{HTTPS} !=on
86    +RewriteRule ^/?(zm)(.*) https://%{SERVER_NAME}/$1$2 [R,L]
87    +
88    +# Order matters. This alias must come first.
89    +Alias /zm/cache "/var/cache/zoneminder"
90    +Alias /zm "/usr/share/zoneminder/www"
91    +ScriptAlias /cgi-bin-zm "/usr/libexec/zoneminder/cgi-bin"

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed