Commit Graph

52 Commits

Author SHA1 Message Date
Isaac Connor 3acbf1551d add zm-sudo.in 2019-05-27 13:26:29 -04:00
Isaac Connor c4d76f03c9 Introduce ZM_PATH_SHUTDOWN to cmake config 2019-05-27 12:09:32 -04:00
Andrew Bauer dbb51e9857 add generic nginx config file 2018-12-02 09:40:15 -06:00
Pliable Pixels 940ad3fe68
made message generic 2018-09-26 14:47:20 -04:00
Pliable Pixels 6bca9415e8
added note to make sure headers is on 2018-09-26 10:17:16 -04:00
Andrew Bauer 49993210d6
Create apache-cors.conf 2018-09-24 08:36:50 -05:00
Andrew Bauer 3c225c9f1c Migrate Webcache out of webroot (#2083)
* migrate webcache folder out of webroot, migrate htaccess files

* rpm specfile - add missing reference to cache folder

* fix submodule mixup
2018-04-19 15:01:46 -04:00
Andrew Bauer 17fbb49025
cannot assign categories when type=link
RPM packaging calls the freedesktop tool "desktop-file-install", which fails with: 
```
error: key "Categories" is present in group "Desktop Entry", but the type is "Link" while this key is only valid for type "Application"
```
@connortechnology This fails the build so I'm removing the categories. Let me know if you've got any other ideas.
2018-04-17 15:50:30 -05:00
Isaac Connor 460b0b0ab9 add an example monit config 2018-02-21 13:12:25 -05:00
Isaac Connor 0bd1ee5992 Merge branch 'master' into m 2018-01-25 08:43:31 -05:00
Andrew Bauer 617331ef32
fix apache alias 2018-01-17 10:38:20 -06:00
Isaac Connor 6db9a78dab add compressing options to the sample logrotate config 2017-06-26 12:17:49 -04:00
Isaac Connor fd44ff4e60 Merge branch 'master' into storageareas 2017-05-10 13:16:08 -04:00
Andrew Bauer 0d6a20fa9b only install polkit rules on systems with systemd 2017-05-10 10:54:56 -05:00
Isaac Connor 4360431e98 fix line that generates .desktop 2017-04-26 16:46:11 -04:00
Isaac Connor 8bc8a17554 use a substitution to generate zoneminder.desktop 2017-04-26 16:40:17 -04:00
Isaac Connor 9d3e2a7b0f test 2017-04-26 16:31:30 -04:00
Isaac Connor 948aceee30 move the line that installs zoneminder.desktop into the misc/CMakeLists.txt 2017-04-26 16:11:45 -04:00
Isaac Connor 20345df3eb Merge branch 'icon' into storageareas 2017-04-26 15:58:26 -04:00
Isaac Connor e39a757c46 add an icon made from favicon.ico and a .desktop file to be install in /usr/share/applications/ 2017-04-26 15:21:28 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor b4ac277ecb Merge pull request #1846 from mnoorenberghe/docker_vhost
Use misc/apache.conf instead of utils/docker/apache-vhost in docker
2017-04-06 08:41:21 -04:00
Matthew Noorenberghe a1f0ec3ecf Use misc/apache.conf instead of utils/docker/apache-vhost in docker
This avoids duplication and fixes a few things that were missing in the Docker version for modern Apache:
* AllowOverride All
* Require all granted

Deleted `ServerName @WEB_HOST@` since `WEB_HOST` was never defined in ZM code so it would give an Apache error.
2017-04-02 21:54:49 -07:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Andrew Bauer fe5fe63254 Update zoneminder.service.in
This was a typo. Quotes are not needed.
2017-03-29 07:53:15 -05:00
Isaac Connor e8da04df56 Merge branch 'apache_indexes' into storageareas 2016-11-22 13:09:44 -05:00
Isaac Connor 6361f14387 Rremove Index from options to prevent directory listings 2016-11-08 09:30:24 -05: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 8d6217f19d Add a line to set the TZ variable in the env before spawning zoneminder. This prevents /etc/localtime from being stat'd on every logging call. 2016-09-29 14:06:12 -04:00
Isaac Connor abd43bdc9f Merge ../ZoneMinder.master into storageareas 2016-09-29 14:25:11 -04:00
Isaac Connor af0af70732 filter successful logins 2016-09-29 12:35:10 -04:00
Andy Bauer 4e9a925933 Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete 2016-04-04 20:52:49 -05:00
Isaac Connor 56301b77e9 Add an example rules file for logcheck 2016-03-23 09:51:28 -04:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Andrew Bauer 800d7dd33a Update apache.conf.in
Keep apache.conf backwards compatible with Apache 2.2
2015-08-22 08:56:47 -05:00
SteveGilvarry bc47d01971 Fix apache logging options to only one of two choices 2015-07-28 08:15:18 +10:00
Andrew Bauer 7802089b82 Use tmpfiles.d to manage tmpdir and sockdir 2015-03-31 20:30:27 -05:00
clipo1979 0c257405b0 Update Makefile.am 2015-02-08 16:22:19 +00:00
clipo1979 33fef42233 Update zoneminder-tmpfiles.conf.in 2015-02-08 16:11:07 +00:00
clipo1979 6c86811ff0 Update CMakeLists.txt 2015-02-08 13:09:01 +00:00
clipo1979 efa760a3fa Create zoneminder-tmpfiles.conf.in 2015-02-08 13:07:53 +00:00
Andrew Bauer 966767e346 Update zoneminder.service.in
Fix restart issue when using systemd
2014-11-06 17:42:40 -06:00
Andrew Bauer 887fe24b98 Update zoneminder.service.in 2014-09-11 19:20:09 -05:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
Kfir Itzhak 9d5ac7ae8c Fix cmake installing wrong files in an out-of-source build 2013-11-04 09:56:40 +02:00
Kfir Itzhak c2bd7c97ec First attempt at enabling out-of-source building for zm with cmake 2013-10-31 18:10:00 +02:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00