ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,841 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

563 Commits

Author SHA1 Message Date
Isaac Connor 818cd614eb Merge branch 'multi-server' into storageareas 2016-01-08 10:17:37 -05:00
Isaac Connor 5ce26ac4df Change logrotate defaults to daily/rotate 7, which works better with logcheck 2016-01-08 09:59:03 -05:00
Isaac Connor 3066f66f25 add sphinx-rtd-theme 2016-01-05 13:21:54 -05:00
Isaac Connor 5c3c8b68a3 Add sphinx rtd theme as a dependency 2016-01-05 09:40:31 -05:00
Isaac Connor 1918b9b576 bump 2016-01-04 14:44:36 -05:00
Isaac Connor b1205bcaa9 Merge branch 'multi-server' into storageareas 
Conflicts:
	CMakeLists.txt
	configure.ac
	scripts/zmaudit.pl.in
	version
 2016-01-02 14:45:24 -05:00
Andy Bauer a93f78b7e6 Bump rpm specfiles to 1.29.0 2016-01-02 10:35:52 -06:00
Isaac Connor 1da87332b7 blah 2016-01-01 21:22:12 -05:00
Isaac Connor 93dbc3f0c1 Merge multi-server updates and bump version 2016-01-01 16:31:02 -05:00
Andrew Bauer d5ec34889e Merge pull request #1211 from SteveGilvarry/multiserver-docs 
Adding multiserver documentation
 2016-01-01 09:01:31 -06:00
Isaac Connor f38f216f59 Merge branch 'master' into storageareas 2015-12-29 14:59:44 -05:00
Isaac Connor 13689d7a7d Merge branch 'storageareas' into newpointone 
Conflicts:
	web/lang/en_gb.php
	web/skins/classic/views/filter.php
 2015-12-28 13:13:49 -05:00
Isaac Connor 63352ac7c9 changelog update 2015-12-28 13:10:27 -05:00
Andrew Bauer e6e8a75b64 Update zoneminder.f23.spec 2015-12-27 11:48:53 -06:00
Isaac Connor 33a3661958 cleanup, revent to openprint style objects 2015-12-23 14:03:40 -05:00
Isaac Connor 769b1f713c Merge branch 'multi-server' into storageareas 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-23 13:13:25 -05:00
Isaac Connor 962d74f6a7 blah 2015-12-22 11:38:36 -05:00
Isaac Connor eccfced6d4 Merge branch 'multi-server' into newpointone 
Conflicts:
	distros/ubuntu1204/apache.conf
 2015-12-22 09:54:13 -05:00
Isaac Connor 64f1475058 blah 2015-12-22 09:47:35 -05:00
Isaac Connor b33c0764fe update to new cgi-bin path 2015-12-21 12:59:52 -05:00
Isaac Connor dfd7986c01 Merge branch 'master' into multi-server 
Conflicts:
	distros/debian_cmake/links
	distros/ubuntu1504_cmake/zoneminder.postinst
 2015-12-21 12:57:45 -05:00
Isaac Connor f6fd4671fe make zmfilter aware of StorageAreas 2015-12-21 12:40:39 -05:00
Isaac Connor fc981e063e snap release adding zmvideo 2015-12-21 10:01:55 -05:00
Isaac Connor f4debc203d Only run zmupdate.pl if the mysql db is located here 2015-12-20 12:23:40 -05:00
Isaac Connor 9743bad13f Add a valid config if a person is using mod_fcgid instead of mod_php 2015-12-20 12:21:18 -05:00
Isaac Connor 4ef35c8c70 No need for a cgi-bin link 2015-12-20 11:23:01 -05:00
Isaac Connor 9c2707deba update paths to /usr/share/zoneminder/www and /usr/lib/zoneminder/cgi-bin 2015-12-20 11:22:12 -05:00
Isaac Connor 623c8a14b0 add multi-package build for 14.04 2015-12-18 14:16:45 -05:00
Isaac Connor 14cde582cf Merge branch 'multi-server' into multiserverplusstorage 
Conflicts:
	src/zm_monitor.h
 2015-12-14 16:55:26 -05:00
Isaac Connor b2b1afa8ad Merge master 2015-12-14 15:49:32 -05:00
Isaac Connor b21b26a41b remove requirment for mysql. Mysql could be on another machine 2015-12-09 12:34:16 -05:00
Isaac Connor af59dbee2e == should be = 2015-12-04 10:40:55 -05:00
Isaac Connor 70fb6a6786 output message when not doing dbupdate. put quotes in to fix bash error when ZM_DB_HOST is not defined 2015-12-02 11:17:23 -05:00
Isaac Connor 7514f43ef4 only update db if db is local 2015-11-27 13:54:31 -05:00
Isaac Connor f7cc2fb44f Merge branch 'master' into multi-server 
Conflicts:
	src/zm_monitor.cpp
 2015-11-23 10:42:14 -05:00
Isaac Connor 7d97ecb9c9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-11-23 10:40:08 -05:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Isaac Connor 4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
Isaac Connor 37b041b561 add index to recommended default permissions on zmuser 2015-11-20 16:00:57 -05:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00
Isaac Connor e00049f17a change format to native 2015-11-16 09:30:09 -05:00
Isaac Connor d5cc602bfa Merge branch 'master' into multi-server 2015-11-09 12:36:34 -05:00
Isaac Connor 16274e46bc grant create,index to zmuser when updating 2015-11-09 12:36:26 -05:00
Isaac Connor ac76d224b8 grant create,index to zmuser when updating 2015-11-09 12:36:23 -05:00
Isaac Connor 82edfc2f16 grant create,index to zmuser when updating 2015-11-09 12:34:24 -05:00
Isaac Connor 6b994132f1 grant create,index to zmuser when updating 2015-11-09 12:34:11 -05:00
Isaac Connor b28a562f1b Merge branch 'master' into multi-server 2015-10-30 12:32:42 -04:00
Isaac Connor 920bea8deb split up depends into multiple lines 2015-10-30 12:19:43 -04:00
Isaac Connor 589ee2f37b split up depends into multiple lines 2015-10-30 12:19:35 -04:00
Isaac Connor a45a52601d change format to native, which makes building packages so much easier 2015-10-30 12:19:12 -04:00
Isaac Connor 029044bca3 merge master, bump version 2015-10-23 16:14:49 -04:00
Isaac Connor e37cf0e218 append /www to docroot for all debian/ubuntu dists 2015-10-23 16:08:32 -04:00
Isaac Connor d0e5dd62b5 Merge pull request #1103 from seebaer1976/patch-6 
Update preinst
 2015-10-16 12:06:44 -04:00
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
seebaer1976 7ebf3de8a2 Update preinst 
korrektur
 2015-10-09 18:13:13 +02:00
Isaac Connor 8db4c22192 Merge pull request #1100 from seebaer1976/patch-2 
Update links
 2015-10-09 09:23:32 -04:00
Isaac Connor 729e9536d7 Merge pull request #1101 from seebaer1976/patch-4 
Update rules
 2015-10-09 09:23:13 -04:00
Isaac Connor 79078f8308 Merge pull request #1102 from seebaer1976/patch-5 
Update apache.conf
 2015-10-09 09:22:55 -04:00
seebaer1976 b17819d181 Update apache.conf 
Update links
 2015-10-09 13:50:15 +02:00
seebaer1976 b042152694 Update rules 
update links
 2015-10-09 13:48:26 +02:00
seebaer1976 4284f8b089 Update preinst 
Update links
 2015-10-09 13:45:19 +02:00
seebaer1976 23a6000380 Update links 
Update links
 2015-10-09 13:41:02 +02:00
Andy Bauer b74abe88c9 minor centos 7 specfile change 2015-10-03 17:07:22 -05:00
Andrew Bauer 3242cde0bf move zm.conf under /etc/zm for Fedora 2015-10-03 13:38:51 -05:00
Andrew Bauer 4fb2bcb393 Fedora specfile changes 2015-10-03 13:21:58 -05:00
Andrew Bauer e8c4adbcca Use make macros inside Fedora config files rather than hardcode 2015-10-03 12:54:18 -05:00
Andrew Bauer 6861ea00d2 Add Fedora 22 Target Distro 2015-10-03 12:40:34 -05:00
Andrew Bauer 269e9bd475 Configure Fedora packages for HTTPS 2015-10-03 12:35:22 -05:00
Andrew Bauer a79d0fc502 update README.fedora 2015-10-03 11:04:58 -05:00
Andrew Bauer 9fae2bdf67 symlink README.https into Fedora folder 2015-10-03 10:45:41 -05:00
Andrew Bauer d6667100b4 Merge pull request #1084 from ZoneMinder/tz 
Tz
 2015-10-13 07:19:45 -05:00
Isaac Connor 4edf997791 change docroot to /usr/share/zoneminder/www and cgi-bin to /usr/lib/zoneminder/cgi-bin 2015-10-02 12:32:12 +00:00
Isaac Connor c9d7087c91 Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone 2015-10-01 11:47:12 -04:00
Isaac Connor 2d749f0b66 Setting the TZ ENV variable prevents every gettimeofday call from reading /etc/timezone 2015-10-01 11:46:51 -04:00
Isaac Connor 07348d4321 don't need apache patch anymore 2015-09-29 08:50:50 -04:00
Andrew Bauer e97341ced5 Merge pull request #1054 from knnniggett/cambozola 
link to cambozola pacakge, rather than download during build
 2015-09-14 14:02:10 -05:00
Isaac Connor e88d63cb35 need to check the case of having a / at the end 2015-09-14 14:55:37 -04:00
Andrew Bauer 03172af921 link to cambozola pacakge, rather than download during build 2015-09-14 13:51:48 -05:00
Isaac Connor 3f3c637227 don't need apache patch anymore 2015-09-14 14:36:19 -04:00
Isaac Connor 407ed7ec66 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-09-14 14:14:23 -04:00
Isaac Connor 6e47812669 This patch is no longer needed 2015-09-14 14:14:13 -04:00
Andrew Bauer c8fecee68b Update CMakeLists.txt 
nbtelecom was returning http 403. switching to skylineservers. In the future, I will add jscalendar packages to zmreop as that is better practice.
 2015-09-12 18:03:20 -05:00
Andrew Bauer 0ff14008b3 Update zoneminder.el6.conf.in 
ScriptAlias should point to ZM_CGIDIR instead of ZM_WEBDIR
 2015-09-12 17:49:03 -05:00
Andrew Bauer ebb6e7158a rpm packaging changes for centos 6 2015-09-08 18:16:19 -05:00
Andrew Bauer 427c71f5e8 Update README.Centos7 2015-09-07 16:54:13 -05:00
Andrew Bauer 41cfadbcb1 Update zoneminder.el7.spec 
typo
 2015-09-07 16:14:58 -05:00
Andrew Bauer dc9a5b13fe redhat rpm packaging modifications 2015-09-07 15:50:42 -05:00
Andy Bauer 9320efdd45 rpm specfile - modify symlinks 2015-08-29 18:04:26 -05:00
Andy Bauer 4ddeddeb32 rpm specfile - correct typo 2015-08-29 17:28:06 -05:00
Andy Bauer 4915b7fc72 rpm spec file - create cakephp tmp folder symlink 2015-08-29 16:52:16 -05:00
Andy Bauer d9c3061b52 Add reference to mysql Create permission in rpm README's 2015-08-29 14:01:45 -05:00
Andrew Bauer ef8830b373 Update zoneminder.el6.spec 
rpm specfile - update location of perl packlist
 2015-08-29 11:12:55 -05:00
Isaac Connor 3ff9c38a2e Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-08-20 20:36:21 -04:00
Isaac Connor 8e01dad828 add the api tmp link 2015-08-20 20:36:09 -04:00
Isaac Connor 6a1bbd2055 remove systemd overrides 2015-08-20 13:49:04 -04:00
Isaac Connor 96a710671d add the api tmp dir link to /tmp/zm 2015-08-19 16:23:36 -04:00
Isaac Connor daba109e7d set AllowOverride All for api dir 2015-08-19 16:09:03 -04:00
Isaac Connor 492cafe08e set AllowOverride All for api dir 2015-08-19 16:08:48 -04:00
Isaac Connor e4f1795fa4 1404 doesn't have 3.9.6, so go back to 3.9.4 2015-08-19 13:35:06 -04:00