Andy Bauer
|
f66408b998
|
update the path to zm.conf
|
2017-03-05 10:50:09 -06:00 |
|
Andy Bauer
|
cfeb12fc73
|
fix permissions on zm.conf in deb pkg scripts
|
2017-03-05 10:37:44 -06:00 |
Isaac Connor
|
78612e3925
|
use format 1.0
|
2017-02-15 11:25:11 -05:00 |
|
Isaac Connor
|
d135216ac7
|
Merge branch 'master' into storageareas
|
2017-02-15 09:30:35 -05:00 |
|
Isaac Connor
|
c58b44bd9e
|
try out the git format
|
2017-02-14 11:45:13 -05:00 |
Steve Gilvarry
|
bf99d132c7
|
Add the missing F back in.
|
2017-02-13 22:15:10 +11:00 |
Andrew Bauer
|
91dd2105d2
|
rpmspecfile - use %{_sysconfdir} macro
|
2017-02-08 20:44:00 -06:00 |
|
Andrew Bauer
|
bd4aea0385
|
rpm specfile - php requires was listed twice
|
2017-02-08 20:21:23 -06:00 |
|
Andrew Bauer
|
9c8c87f591
|
rpm specfile - require php-mysqli, bump to 1.30.2
|
2017-02-08 20:12:54 -06:00 |
|
Isaac Connor
|
7ab6818fa0
|
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
|
2017-01-25 17:14:30 -05:00 |
|
Andy Bauer
|
3882b74766
|
rpm specfile - el6 buildrequires epel-rpm-macros
|
2017-01-15 16:39:38 -06:00 |
|
Andrew Bauer
|
418995df84
|
rpm specfile changes
need to put this back in to maintain compatibility with packpack
|
2017-01-15 09:59:17 -06:00 |
Isaac Connor
|
babe4f07fb
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-14 10:53:49 -05:00 |
|
Isaac Connor
|
3074263e06
|
Merge branch 'control_fixes' into storageareas
|
2017-01-10 12:54:46 -05:00 |
|
Andrew Bauer
|
06fd760a2a
|
rpm specfile- use %{_localstatedir} macro
|
2017-01-09 09:07:05 -06:00 |
Andrew Bauer
|
dc6b2ed114
|
clean up unnessary requires
|
2017-01-08 18:17:28 -06:00 |
|
Andrew Bauer
|
6b7e3a1b61
|
rpm specfile changes
|
2017-01-08 17:37:03 -06:00 |
|
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
|
Andrew Bauer
|
0d7e1bcbc5
|
add php as a dependency only when we aren't using nginx
|
2017-01-04 10:49:22 -06:00 |
|
Andrew Bauer
|
8ea4bdca1d
|
explicity set index.php as the only directoryindex
|
2017-01-04 10:45:36 -06:00 |
|
Andy Bauer
|
7e7ef46420
|
rpm packaging - remove rundir from tmpfiles.d
|
2017-01-03 16:42:12 -06:00 |
|
Andy Bauer
|
b4f537c5d3
|
rpm build tweaks based on rpmfusion feedback
|
2017-01-03 13:12:12 -06:00 |
|
Isaac Connor
|
84183c819c
|
Merge branch 'master' into storageareas
|
2017-01-03 09:53:09 -05:00 |
|
Andrew Bauer
|
3042b39672
|
Update zoneminder.spec
rpmspecfile don't glob zoneminder's binaries
|
2017-01-02 11:41:14 -06:00 |
|
Andy Bauer
|
c594ad8be7
|
rpmspec - remove quotes from pidfile path
|
2017-01-02 10:37:23 -06:00 |
|
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
klemens
|
0d549f1db3
|
spelling fixes
|
2016-12-29 10:31:05 +01:00 |
|
Andrew Bauer
|
76db2e811d
|
more rpm specfile changes
|
2016-12-28 09:27:30 -06:00 |
|
Andrew Bauer
|
ea0cfad37c
|
update rpm specfile
|
2016-12-27 09:06:50 -06:00 |
|
Andrew Bauer
|
56277bce09
|
minor rpm specfile changes
|
2016-12-26 10:07:38 -06:00 |
|
Andrew Bauer
|
0d1dbf1745
|
fix rpm specfile versioning in changelog
|
2016-12-26 09:31:11 -06:00 |
|
Andrew Bauer
|
0dd6f4916e
|
rpm specfile - move tmpfile config under /usr/lib
|
2016-12-26 08:31:21 -06:00 |
|
Andrew Bauer
|
eb0b85ec13
|
changes based on feedback from rpmlint
|
2016-12-23 14:02:39 -06:00 |
|
Andrew Bauer
|
3d15ac315b
|
Update CMakeLists.txt
minor whitespace change
|
2016-12-23 13:11:06 -06:00 |
|
Andrew Bauer
|
1b81d790b2
|
rpm specfile consolidation
|
2016-12-23 13:06:44 -06:00 |
|
Isaac Connor
|
ed618ff7b0
|
Merge branch 'master' into storageareas
|
2016-12-20 11:29:31 -05:00 |
|
Andrew Bauer
|
68cd4c2ce5
|
Update zoneminder.el7.spec
minor specfile change
|
2016-12-15 08:28:37 -06:00 |
|
Isaac Connor
|
708f52beda
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-12-13 13:36:18 -05:00 |
|
Andrew Bauer
|
6fe88adc02
|
Update zoneminder.f25.spec
|
2016-12-12 20:50:53 -06:00 |
|
Andrew Bauer
|
e72a76fe33
|
Update control
|
2016-12-12 12:09:47 -06:00 |
|
Isaac Connor
|
1cb8d6baba
|
enable apache cgi
|
2016-11-28 11:45:30 -05:00 |
|
Isaac Connor
|
859d361373
|
turn off libswresample
|
2016-11-27 17:06:12 -05:00 |
|
Isaac Connor
|
921205216d
|
turn off libswresample
|
2016-11-27 17:00:16 -05:00 |
|
Andy Bauer
|
9a694541ba
|
repm specfile maintenance: retire fc23, add fc25
|
2016-11-26 08:20:03 -06:00 |
|
Andy Bauer
|
bf85791e4c
|
improvements to fedora nginx rpm support
|
2016-11-22 13:02:02 -06:00 |
|
Andy Bauer
|
c2b1638a3e
|
rpm changes - set TZ var in systemd service file
|
2016-11-22 12:43:56 -06:00 |
|
Andy Bauer
|
a96ab604ec
|
rpm changes - set TZ var in systemd service file
|
2016-11-22 12:42:48 -06:00 |
|
Andrew Bauer
|
71898df756
|
Merge pull request #1697 from connortechnology/apache_indexes
Apache indexes
|
2016-11-22 12:33:55 -06:00 |
Isaac Connor
|
b3f2b13718
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:29:30 -05:00 |
|
Isaac Connor
|
9cc1b23460
|
put back mizzing F
|
2016-11-22 13:25:52 -05:00 |
|
Isaac Connor
|
b059ca83da
|
Rremove Index from options to prevent directory listings
|
2016-11-22 13:25:52 -05:00 |
|
Isaac Connor
|
aa0a4d1f5a
|
put back mizzing F
|
2016-11-22 13:13:09 -05:00 |
|
Isaac Connor
|
e8da04df56
|
Merge branch 'apache_indexes' into storageareas
|
2016-11-22 13:09:44 -05:00 |
|
Isaac Connor
|
cf49a234b3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-22 13:05:03 -05:00 |
|
Andrew Bauer
|
b67450b8ae
|
Update zoneminder.php-fpm.conf.in
|
2016-11-17 19:48:35 -06:00 |
|
Isaac Connor
|
c360e27b02
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-11-17 13:13:47 -05:00 |
Andrew Bauer
|
bcc5a57b02
|
prelimniary support for nginx on fedora
|
2016-11-15 18:34:25 -06:00 |
|
Isaac Connor
|
2df6cd17fa
|
add libswresample to build depends
|
2016-11-11 22:30:35 -05:00 |
|
Isaac Connor
|
6361f14387
|
Rremove Index from options to prevent directory listings
|
2016-11-08 09:30:24 -05:00 |
|
Isaac Connor
|
a6c77f08d2
|
use generic libboost-dev
|
2016-10-02 15:22:52 -04:00 |
|
Isaac Connor
|
056e560b70
|
Merge ../ZoneMinder.master into storageareas
|
2016-10-02 12:25:51 -04:00 |
|
Isaac Connor
|
07d6e1303b
|
Merge branch 'compress_logs' into storageareas
|
2016-10-02 12:22:46 -04:00 |
|
Isaac Connor
|
9e3f6226ed
|
add compress and delaycompress to the zoneminder logrotate settings
|
2016-10-02 10:05:07 -04:00 |
|
Isaac Connor
|
f09c6c92e8
|
blah
|
2016-09-30 12:22:35 -04:00 |
|
Isaac Connor
|
e11ded83ba
|
get rid of watch:
|
2016-09-30 12:15:23 -04:00 |
|
Isaac Connor
|
bf013cd88e
|
remove libswsresample
|
2016-09-30 11:58:55 -04:00 |
Isaac Connor
|
53d3e063e8
|
smal re-order
|
2016-09-30 09:35:52 -04:00 |
|
Isaac Connor
|
603d903297
|
add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line
|
2016-09-29 14:24:49 -04:00 |
|
Isaac Connor
|
3dfe1185ff
|
add ffmpeg as option to libav-tols
|
2016-09-13 10:11:50 -04:00 |
|
Andy Bauer
|
4895942308
|
update fedora rpm readme
|
2016-08-16 09:49:45 -05:00 |
|
Isaac Connor
|
1058796374
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:35 -04:00 |
|
Isaac Connor
|
bdcc53d309
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:10 -04:00 |
|
Isaac Connor
|
c1d2407ed3
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:02:15 -04:00 |
|
Isaac Connor
|
6b70ff964b
|
fix path in cake api cleanup rules
|
2016-08-10 09:06:15 -04:00 |
|
Andrew Bauer
|
6c8001f362
|
Merge pull request #1549 from SteveGilvarry/initd_sql_wait
Implement suggested wait for MySQL start
|
2016-08-06 09:14:58 -05:00 |
|
Andrew Bauer
|
004b651d61
|
RPM specfile config change
use make macros, rather than hard coded values
|
2016-07-31 15:06:39 -05:00 |
|
Andrew Bauer
|
3c6692d0d5
|
RPM specfile config change
fix logrotate script
|
2016-07-31 07:29:37 -05:00 |
|
Andrew Bauer
|
477c02382b
|
Update CMakeLists.txt
Minor change for fedora rpmbuild
|
2016-07-06 19:06:28 -05:00 |
|
Andrew Bauer
|
1f060f1938
|
Update zoneminder.init
Remove my initials
|
2016-07-05 11:35:08 -05:00 |
|
Steve Gilvarry
|
1f53377d8a
|
Implement suggested wait for MySQL start
|
2016-07-05 07:28:52 +10:00 |
|
Andy Bauer
|
980d3f6e7f
|
rpm housecleaning, change the way jscalendar is installed
|
2016-07-03 11:34:35 -05:00 |
|
Andrew Bauer
|
f3583e5707
|
rpm specfile - add support for f24, remove support for f22
|
2016-06-24 15:39:57 -05:00 |
|
Andy Bauer
|
58e1a9ac4a
|
rpm README changes
|
2016-06-01 07:30:41 -05:00 |
Disassembler
|
8eee25795a
|
Remove deprecated register_globals from Apache/PHP configs
|
2016-05-30 14:02:46 +02:00 |
Isaac Connor
|
b3fd156c11
|
add boost to build depends
|
2016-05-25 20:01:42 -04:00 |
|
Isaac Connor
|
abd43bdc9f
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-29 14:25:11 -04:00 |
|
Isaac Connor
|
f9fd715657
|
Merge branch 'master' into storageareas
|
2016-09-29 14:25:02 -04:00 |
|
Isaac Connor
|
f1012f60ec
|
add libswresample to build depends
|
2016-09-29 12:31:02 -04:00 |
|
Isaac Connor
|
441020e8b8
|
fix_type
|
2016-09-29 10:49:40 -04:00 |
|
Isaac Connor
|
ce2c52c07d
|
allow libavdevice55 and 57
|
2016-09-27 16:15:24 -04:00 |
|
Isaac Connor
|
da5bad7ec2
|
Merge ../ZoneMinder.connortechnology into storageareas
|
2016-09-27 15:09:14 -04:00 |
|
Isaac Connor
|
24e33fec7f
|
allow libvlccore8
|
2016-09-27 15:08:00 -04:00 |
|
Isaac Connor
|
730d7a648d
|
add -f to rm
|
2016-09-27 14:15:38 -04:00 |
|
Isaac Connor
|
ee93424bf9
|
update jpeh deps to match official debian repo
|
2016-09-27 12:33:50 -04:00 |
|
Isaac Connor
|
a03d2a393f
|
add ffmpeg as an option to libav-tools
|
2016-09-20 13:22:49 -04:00 |
|
Isaac Connor
|
2b4bad86cb
|
Merge branch 'master' into storageareas
|
2016-09-13 10:21:10 -04:00 |
|
Isaac Connor
|
2bc5742aec
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-09-13 09:53:39 -04:00 |
|
Isaac Connor
|
fb35f5c48a
|
Merge ../ZoneMinder.master into feature-h264-videostorage
|
2016-08-31 10:58:19 -04:00 |
|
Isaac Connor
|
eafe3d7748
|
Merge branch 'master' into storageareas
|
2016-08-17 10:31:55 -04:00 |
|
Isaac Connor
|
b36694ad8b
|
Merge branch 'master' into storageareas
|
2016-08-12 10:04:52 -04:00 |
|
Steve Gilvarry
|
5d8159462c
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-08-11 00:51:46 +10:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |
|
Steve Gilvarry
|
ea1ae815f1
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-08-05 23:03:06 +10:00 |
|
Isaac Connor
|
208337635a
|
Merge branch 'master' into storageareas
|
2016-08-01 19:30:01 -04:00 |
|
Steve Gilvarry
|
3543c37f5e
|
Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.
|
2016-07-31 08:24:52 +10:00 |
|
Isaac Connor
|
a30610fbda
|
Merge branch 'master' into storageareas
|
2016-07-12 10:31:10 -04:00 |
|
Isaac Connor
|
b8c406f969
|
Merge branch 'master' into storageareas
|
2016-06-03 09:32:55 -04:00 |
|
Isaac Connor
|
e62ea454ba
|
Merge branch 'master' into storageareas
|
2016-05-17 10:48:52 -04:00 |
|
Isaac Connor
|
09e4aca0be
|
add libdata-uuid-perl to debian/ubuntu dependencies
|
2016-05-17 09:26:36 -04:00 |
Isaac Connor
|
660ce5bf8c
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-13 10:12:51 -04:00 |
|
Isaac Connor
|
532dc98e9e
|
fix zms
|
2016-05-11 11:38:53 -04:00 |
|
Isaac Connor
|
b44cee4a81
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-05-11 09:16:20 -04:00 |
|
Isaac Connor
|
cfd986de44
|
Merge branch 'master' into storageareas
|
2016-05-10 08:43:46 -04:00 |
|
Isaac Connor
|
4d20d35f8d
|
add back missing depends for perl modules which are needed both for building and installing
|
2016-05-10 08:43:38 -04:00 |
|
Isaac Connor
|
f609b838cd
|
Merge branch 'master' into storageareas
|
2016-05-09 21:34:25 -04:00 |
|
Isaac Connor
|
5566d1881d
|
add perl dbd mysql to build depends. Seems to need it.
|
2016-05-09 21:34:12 -04:00 |
|
Isaac Connor
|
566f18c9ae
|
bump
|
2016-05-09 21:09:43 -04:00 |
|
Isaac Connor
|
b88861e145
|
add back ffmpeg libs
|
2016-05-09 19:42:14 -04:00 |
|
Isaac Connor
|
beebe74e7b
|
Merge branch 'merge_db_connects' into storageareas
|
2016-05-09 12:26:17 -04:00 |
|
Isaac Connor
|
5b8f713037
|
fix libavutils -> libavutil
|
2016-05-07 11:28:53 -04:00 |
|
Isaac Connor
|
5158bbc670
|
add non-ffmpeg versions of libraries to depends list. ubunutu1604 doesn't seem to list them with the ffmpeg specification
|
2016-05-07 09:43:30 -04:00 |
|
Isaac Connor
|
f9a24d7171
|
bump today's release
|
2016-05-05 14:51:57 -04:00 |
|
Isaac Connor
|
79572270d3
|
bump version
|
2016-05-02 10:46:23 -04:00 |
|
Isaac Connor
|
00f38cdd1b
|
version bump
|
2016-05-02 10:39:41 -04:00 |
|
Steve Gilvarry
|
97a4cf0852
|
Add the changes...doh
|
2016-05-01 15:06:45 +10:00 |
|
Steve Gilvarry
|
d7f7a0f074
|
Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
|
2016-05-01 13:46:09 +10:00 |
|
Isaac Connor
|
d06a0cf2a4
|
2016042801 build
|
2016-04-28 12:58:09 -04:00 |
|
Steve Gilvarry
|
6549f7bf29
|
Merge pull request #1403 from ZoneMinder/fix_grant
Fix grant
|
2016-04-28 21:49:21 +10:00 |
|
Isaac Connor
|
386afc3546
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-26 20:02:04 -04:00 |
|
Isaac Connor
|
6a31966781
|
shift to match debian
|
2016-04-22 13:35:20 -04:00 |
|
Isaac Connor
|
8b96872efe
|
shoudl be php-mysql for php7
|
2016-04-20 15:04:50 -04:00 |
|
Isaac Connor
|
e218e91e24
|
add php7 versions for 1604
|
2016-04-20 14:58:18 -04:00 |
|
Isaac Connor
|
c626baae14
|
Merge branch 'fix_grant' into storageareas
|
2016-04-20 14:39:06 -04:00 |
|
Isaac Connor
|
02a56b811b
|
Don't be recursive when chowning /var/cache/zoneminder
|
2016-04-20 14:38:51 -04:00 |
|
Isaac Connor
|
060df90ff3
|
bump versions
|
2016-04-20 09:38:07 -04:00 |
|
Isaac Connor
|
7e1a80658b
|
Merge branch 'master' into storageareas
|
2016-04-17 09:30:33 -04:00 |
|
Isaac Connor
|
d424a297c4
|
need php5-gd
|
2016-04-17 09:29:55 -04:00 |
|
Isaac Connor
|
3f27f4893c
|
Merge branch 'fix_grant' into storageareas
|
2016-04-15 12:55:13 -04:00 |
|
Isaac Connor
|
78c6e14e0c
|
Merge branch 'master' into storageareas
|
2016-04-09 14:52:28 -04:00 |
|
Andy Bauer
|
dafdf1a289
|
rpm specfile changes
|
2016-04-08 19:22:27 -05:00 |
|
Isaac Connor
|
e473839704
|
substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults
|
2016-04-06 15:50:51 -04:00 |
|
Isaac Connor
|
3dd010b40a
|
User and and instead of defaults
|
2016-04-06 15:44:56 -04:00 |
|
Isaac Connor
|
6cdbcfc9e6
|
add back identified by
|
2016-04-06 13:55:18 -04:00 |
|
Isaac Connor
|
6199a54838
|
more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504
|
2016-04-06 13:45:46 -04:00 |
|
Isaac Connor
|
699b6458d5
|
bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate.
|
2016-04-06 13:08:30 -04:00 |
|
Isaac Connor
|
cf76360ecb
|
bring up to date with the one in debian
|
2016-04-06 13:03:24 -04:00 |
|
Isaac Connor
|
fb05e1baad
|
grant requires rights regardless of password
|
2016-04-06 13:01:20 -04:00 |
|
Isaac Connor
|
59a8b37df2
|
Merge branch 'master' into storageareas
|
2016-04-06 11:47:20 -04:00 |
|
Isaac Connor
|
765f79a87f
|
Merge branch 'icon_video' into storageareas
|
2016-04-06 11:16:38 -04:00 |
|
Isaac Connor
|
3e5a4b6481
|
remove autotools builds, replace them with cmake versions
|
2016-04-06 08:43:20 -04:00 |