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

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2015-09-14 13:43:13 -04:00
parent 204f2b1e22 c8fecee68b
commit 2fcb5d153f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/redhat/CMakeLists.txt
View File

@ -16,7 +16,7 @@ else(ZM_TARGET_DISTRO STREQUAL "el7")
endif(ZM_TARGET_DISTRO STREQUAL "el7") endif(ZM_TARGET_DISTRO STREQUAL "el7")
# Download jscalendar & move files into position # Download jscalendar & move files into position
file(DOWNLOAD http://nbtelecom.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc) file(DOWNLOAD http://skylineservers.dl.sourceforge.net/project/jscalendar/jscalendar/1.0/jscalendar-1.0.zip ${CMAKE_CURRENT_SOURCE_DIR}/jscalendar-1.0.zip LOG jsc_log STATUS download_jsc)
#message(STATUS "Log of jscalender script was: ${jsc_log}") #message(STATUS "Log of jscalender script was: ${jsc_log}")
if(download_jsc EQUAL 0) if(download_jsc EQUAL 0)
message(STATUS "Jscalander successfully downloaded. Installing...") message(STATUS "Jscalander successfully downloaded. Installing...")

4
distros/redhat/zoneminder.el6.conf.in
View File

@ -18,8 +18,8 @@ Alias /zm "@ZM_WEBDIR@"
Allow from all Allow from all
</Directory> </Directory>
ScriptAlias /cgi-bin/zm "@ZM_WEBDIR@" ScriptAlias /cgi-bin/zm "@ZM_CGIDIR@"
<Directory "@ZM_WEBDIR@"> <Directory "@ZM_CGIDIR@">
SSLRequireSSL SSLRequireSSL
AllowOverride All AllowOverride All
Options ExecCGI FollowSymLinks Options ExecCGI FollowSymLinks