ee146acf07
Remove obsolete symlink handling, update README.Debian
2018-03-06 20:35:41 -05:00
4c44c32a62
Allow db username/password setting in conf.d
2018-03-06 19:23:01 -05:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
7a9350c44f
Quick fix for mistake
2018-03-05 20:24:40 -05:00
6194977697
Revamp postinst to also support MariaDB and use systemd to check service status, not /etc/init.d.
2018-03-05 19:38:42 -05:00
17c5028312
Don't install init.d script
...
Despite not being specified in the --with parameter to dh, dh_installinit still seems to be run. Since most distros use systemd now, it seems like a bad idea to install services to /etc/init.d.
2018-03-05 19:17:11 -05:00
c750db91b5
Make sure a2enmod is available before calling it in postinst
...
The user may be using zm with e.g. nginx since apache is not a dependency.
2018-03-05 19:11:53 -05:00
49a2065f34
Allow packaging with libx264-152, allow packaging with MariaDB instead of MySQL
2018-03-05 19:06:38 -05:00
d13335358f
Copy ubuntu1604 to ubuntu1804
2018-03-05 18:39:29 -05:00
ab11e9ec38
Update zoneminder.spec
2018-02-23 11:48:35 -06:00
3aa31fd524
Merge branch 'master' into storageareas
2018-02-23 10:23:35 -05:00
a888dac834
source files in /etc/zm/conf.d as well
2018-02-23 09:30:47 -05:00
c7aa45c4ce
libmysqlclient-dev debian package name changes
2018-02-19 20:21:21 -06:00
7074681e60
Need drop permissions
2018-01-29 11:44:29 -05:00
525749c11a
Need drop permissions
2018-01-29 11:44:03 -05:00
0bd1ee5992
Merge branch 'master' into m
2018-01-25 08:43:31 -05:00
2427a5bf63
sync up .service file to match 1604.
2018-01-08 16:13:11 -05:00
3e31203a22
default service start timeout to 5 minutes. THe default of 1.5 minutes is too short on some larger systems
2018-01-08 16:11:54 -05:00
2cc185fd45
Move Updating Storage stats to a trigger. Remove the code from zmwatch that did it before
2018-01-04 13:06:28 -05:00
bc096bcc3d
make zoneminder rpm depend on zip package
2017-12-14 14:14:31 -06:00
dd69bc3d7b
Merge branch 'master' into storageareas
2017-12-11 11:39:42 -05:00
0d9f330356
call zmcamtool during postinst ( #2021 )
2017-12-10 14:14:39 -05:00
bbe75762e7
remove boost
2017-12-07 09:40:00 -05:00
004a41b122
remove boost dependency.
2017-12-04 22:59:50 -05:00
00e963eba4
remove the dependency on boost
2017-11-28 07:17:26 -05:00
1392c1dfc2
put back missing test for if db is local
2017-11-22 12:36:04 -08:00
3c55daaf36
Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla
2017-11-22 12:10:54 -08:00
dae2a6ae0a
fixup the .postinst file which got some duplicate lines
2017-11-20 11:56:05 -05:00
2570869aa0
bring back libvlc
2017-11-08 11:18:54 -05:00
b6548ba137
put curl back, we use it's decoding function for urls
2017-11-07 15:54:13 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
92917809b8
add creating /usr/share/zoneminder/www/cache
2017-11-01 12:49:38 -07:00
fc3934c8bb
kill off curl and libvlc
2017-10-25 13:20:18 -07:00
ca17d9dba4
change the systemd zoneminder.server to always restart zoneminder with a 10 second wait
2017-10-24 16:24:23 -07:00
199f90868a
add libsys-cpuload-perl as a dependency
2017-10-24 15:17:09 -07:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
7b1142bee6
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-09-12 11:03:16 -04:00
edb7762cf3
Merge branch 'master' into storageareas
2017-09-11 16:57:08 -04:00
a8cf384be9
rpm spcfile change
...
use %{_buildshell} macro rather than hard code path to shell interpreter
2017-08-23 08:48:11 -05:00
7520f4ddb5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-26 10:39:28 -04:00
cfbfc0dd44
Merge branch 'master' into storageareas
2017-07-21 11:04:32 -04:00
91ccba137f
Don't create symlinks in ZoneMinder webroot ( #1923 )
...
* don't create symlinks during rpm packaging
* don't use symlinks when pacakging debs
* change default values for zm_dir_events and zm_dir_images
* remove zm_contentdir cmake var from debian packaging
* change default for zm_config_subdir
* update INSTALL documentation
2017-07-21 08:18:13 -04:00
d931945619
Update zoneminder.spec
...
we have to tell rpm what permission zmcustom.conf has to prevent the build from failing on el6
2017-07-20 17:53:06 -05:00
4bca799d43
reorganize zm config files ( #1937 )
...
* reogranize config files
* process 01-system-paths.conf.in
* exclude .in files in install directive
2017-07-17 09:11:36 -04:00
4cf28267e3
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-14 12:30:10 -04:00
2002e863a9
Update zoneminder.service.in
2017-07-14 10:26:41 -05:00
1822510909
rpm packaging - consolidate zoneminder apache config file
2017-07-14 10:15:12 -05:00
b3984ea2da
Merge branch 'master' into storageareas
2017-07-14 10:38:20 -04:00
99bb12dcc9
Update zoneminder.spec
...
changes from rpmfusion feedback
2017-07-14 08:33:08 -05:00
c294e25dbc
rpm packaging - migrate cakephp htaccess parms into main apache config
2017-07-14 07:23:35 -05:00
0048908071
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-07-13 11:18:28 -04:00
0df6ac2895
Merge branch 'master' into storageareas
2017-07-13 11:04:51 -04:00
5e74fd2e53
Update zoneminder.spec
...
rpmspecfile change. zmsystemctl.pl is only installed on distros w/ systemd (i.e. all current distros except el6)
2017-07-12 14:23:43 -05:00
cfcf7363ea
Don't test the symlinks anymore
2017-07-11 11:18:47 -04:00
c3c6459052
Merge branch 'montagereview_rework' into storageareas
2017-07-05 15:34:02 -04:00
9be0e43618
Update README.Redhat7
2017-06-30 07:36:22 -05:00
69509689e0
debian stretch prefers libmariadbclient-dev and libgcrypt11-dev
2017-06-29 08:41:18 -04:00
323cd3540d
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-28 11:58:23 -04:00
a656f4a6cd
Update zoneminder.conf.in
...
rpm specfile - make el6 script alias match el7 & f25
2017-06-28 10:04:28 -05:00
90696331a9
Merge branch 'master' into storageareas
2017-06-26 21:58:11 -04:00
043b382bdd
include conf.d folder contents in debian packaging ( #1934 )
2017-06-26 14:44:33 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5ee230a141
always restart zoneminder on upgrade, not just when doing a db update
2017-06-21 17:20:50 -04:00
c33b179a59
:Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-06-21 17:18:49 -04:00
36683d15d2
Update zoneminder.spec
...
bump zm version in rpm specfile
2017-06-20 11:41:53 -05:00
2e60864e99
always stop and start zm on upgrade, not just if doing a db update
2017-06-20 09:44:18 -04:00
f78e720db3
add /etc/zm and /etc/zm/conf.d to install dirs
2017-06-20 09:41:35 -04:00
42a022d15b
always stop and start zoneminder on upgrade
2017-06-20 09:41:02 -04:00
db68d3e0a2
use restart instead of start
2017-06-19 13:57:00 -04:00
91a070b835
Merge branch 'master' into storageareas
2017-06-15 13:13:08 -04:00
119f8fc86c
Fix version checks to fix build on yaketty
2017-06-15 13:02:54 -04:00
734f099b4a
remove content from changelog
2017-06-15 12:15:15 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bacf65ae9a
Migrate values from Options -> Paths to zm.conf ( #1908 )
...
* initial commit to migrate contents of Options->Paths to zm.conf
* remove paths items from configdata.pm
* remove paths tab from options
* update deb packaging scripts with new cmake vars
* remove extraneous file
* save custom paths variables to config file before dB is freshened
* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
617cdd5fd3
revert wip config backup
2017-06-09 15:28:01 -04:00
62429a55a8
why did git decide to delete these synlinks???
2017-06-09 12:58:15 -05:00
07d9d35e39
minimize Travis log output
2017-06-09 12:52:00 -05:00
3bfac9faff
Merge branch 'master' into storageareas
2017-06-09 13:00:24 -04:00
371b86300a
Merge branch 'master' into storageareas
2017-06-08 14:23:40 -04:00
02b2d8a968
put in ffmpeg version test
2017-06-08 12:22:28 -04:00
f67584ebf9
remove references to incomplete icon work
2017-06-08 08:39:49 -04:00
2bc6f1627e
Add support for conf.d subfolder ( #1902 )
...
* cmake changes to support conf.d
* php changes to support conf.d
* perl changes to support conf.d
* C changes to support conf.d
* add conf.d support to rpmspecfile
* fix typo
* specify ZM_CONFIG_SUBDIR in relevant target distros
* put back my config_file perl definition
* remove quotes from ZM macros
* fix snprintf
* add README to conf.d folder
* adjust rpm specfile
* remove custom permissions from README in rpmspecfile
* modify rpm README documentation to reflect conf.d support
* set ZM_CONFIG_SUBDIR in debian rules file
2017-06-05 16:39:19 -04:00
451714a403
Merge branch 'master' into storageareas
2017-06-04 21:42:56 -04:00
44eba78e40
put back empty files
2017-06-02 20:42:55 -04:00
b5c0a0eae2
the contents of these are not being maintained and should be generated by scripts
2017-06-02 12:40:32 -04:00
c93e13868e
change to quilt frmo native. Remove patches. We are upstream.
2017-06-01 12:41:10 -04:00
0e643f0f93
Merge branch 'master' into storageareas
2017-05-30 11:58:38 -04:00
8b0b938fc8
Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder
2017-05-30 10:51:15 -04:00
77d068fc48
merge updates from SA relating to building debian packages
2017-05-26 22:25:59 -04:00
9d464dfa24
remove errant comma
2017-05-26 22:24:57 -04:00
94151b0318
put back changelog
2017-05-26 14:30:21 -04:00
766d5b7dcc
fix merge
2017-05-25 16:33:09 -04:00
7cfa0b12ec
Merge branch 'dragndrop_monitor_sorting' into storageareas
2017-05-25 15:26:04 -04:00
1bd3369909
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2017-05-25 14:13:37 -04:00
9cbafde1ac
add libboost to build-depends
2017-05-25 13:54:43 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
242c8fc0ab
fix options, to remove indexes
2017-05-23 15:01:22 -04:00
b92f05672a
No reason to watch upstream, when we are upstream
2017-05-23 14:56:53 -04:00
099e099352
We need boost for the packetqueue
2017-05-23 14:51:25 -04:00
392ade2e1a
change default logrotate policy to rotate daily and compress
2017-05-23 14:51:09 -04:00
Matthew Trescott
Isaac Connor
Andrew Bauer
Isaac Connor
APHW2 MFGENG
Isaac Connor
Isaac Connor
Andrew Bauer