ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1127 from SteveGilvarry/feature-h264-videostorage 

Merging master to feature-h264-videostorage
This commit is contained in:
Steve Gilvarry 2015-10-28 08:36:49 +11:00
parent f5fedde139 d45cf9607b
commit ef18714687
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/zm_update-1.28.108.sql
View File

@ -10,7 +10,7 @@ SET @s = (SELECT IF(
FROM INFORMATION_SCHEMA.STATISTICS FROM INFORMATION_SCHEMA.STATISTICS
WHERE table_name = 'Frames' WHERE table_name = 'Frames'
AND table_schema = DATABASE() AND table_schema = DATABASE()
AND index_name='EventId_idx'; AND index_name = 'EventId_idx'
) > 0, ) > 0,
"SELECT 'EventId Index already exists on Frames table'", "SELECT 'EventId Index already exists on Frames table'",
"CREATE INDEX `EventId_idx` ON `Frames` (`EventId`)" "CREATE INDEX `EventId_idx` ON `Frames` (`EventId`)"

4
distros/debian/apache.conf
View File

@ -1,6 +1,6 @@
Alias /zm /usr/share/zoneminder Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder> <Directory /usr/share/zoneminder/www>
php_flag register_globals off php_flag register_globals off
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>

4
distros/debian8/apache.conf
View File

@ -1,6 +1,6 @@
Alias /zm /usr/share/zoneminder Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder> <Directory /usr/share/zoneminder/www>
php_flag register_globals off php_flag register_globals off
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>

4
distros/debian_cmake/apache.conf
View File

@ -1,6 +1,6 @@
Alias /zm /usr/share/zoneminder Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder> <Directory /usr/share/zoneminder/www>
php_flag register_globals off php_flag register_globals off
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>

4
distros/ubuntu1204/apache.conf
View File

@ -1,6 +1,6 @@
Alias /zm /usr/share/zoneminder Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder> <Directory /usr/share/zoneminder/www>
php_flag register_globals off php_flag register_globals off
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>

2
distros/ubuntu1504/apache.conf
View File

@ -1,6 +1,6 @@
Alias /zm /usr/share/zoneminder/www Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder> <Directory /usr/share/zoneminder/www>
php_flag register_globals off php_flag register_globals off
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>

4
distros/ubuntu1504_cmake_split_packages/apache.conf
View File

@ -1,6 +1,6 @@
Alias /zm /usr/share/zoneminder Alias /zm /usr/share/zoneminder/www
<Directory /usr/share/zoneminder> <Directory /usr/share/zoneminder/www>
php_flag register_globals off php_flag register_globals off
Options Indexes FollowSymLinks Options Indexes FollowSymLinks
<IfModule mod_dir.c> <IfModule mod_dir.c>

2
scripts/zmupdate.pl.in
View File

@ -170,7 +170,7 @@ if ( $check && $Config{ZM_CHECK_FOR_UPDATES} )
if ( $Config{ZM_UPDATE_CHECK_PROXY} ) { if ( $Config{ZM_UPDATE_CHECK_PROXY} ) {
$ua->proxy( "http", $Config{ZM_UPDATE_CHECK_PROXY} ); $ua->proxy( "http", $Config{ZM_UPDATE_CHECK_PROXY} );
} }
my $req = HTTP::Request->new( GET=>'http://zoneminder.github.io/ZoneMinder/version.txt' ); my $req = HTTP::Request->new( GET=>'https://update.zoneminder.com/version.txt' );
my $res = $ua->request($req); my $res = $ua->request($req);
if ( $res->is_success ) if ( $res->is_success )

3
src/CMakeLists.txt
View File

@ -30,5 +30,6 @@ ENDFOREACH(CBINARY zma zmc zmf zmu zmstreamer)
install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY \"\$ENV{DESTDIR}${ZM_CGIDIR}\")") install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")