Isaac Connor
9027c0ee06
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-04-12 16:20:09 -04:00
Isaac Connor
c9482d8ae8
add extra quotes where neccessary, fix the release case
2017-04-12 16:20:04 -04:00
Isaac Connor
d039227f79
Merge branch 'master' into storageareas
2017-04-12 13:51:10 -04:00
Isaac Connor
e4a20caf24
put quotes around
2017-04-10 21:55:11 -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
c36872daa5
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-02-21 09:48:12 -05:00
Isaac Connor
186e5ba866
Merge branch 'master' into storageareas
2017-02-21 09:48:00 -05:00
Andrew Bauer
33e8afa0e0
only patch packpack if it is not already patched
2017-02-17 13:25:17 -06:00
Isaac Connor
d139623ed5
change where binary packages get uploaded to
2017-02-17 09:42:30 -05:00
Andrew Bauer
dc76a876a1
packpack rpm specfile - ensure Crud submodule folder is empty
2017-02-17 07:07:17 -06:00
Andrew Bauer
4809a5d7de
patch packpack to remove "bebian" from the tarball filename
2017-02-16 15:59:43 -06:00
Isaac Connor
63d92323eb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2017-02-15 11:18:49 -05:00
Isaac Connor
d135216ac7
Merge branch 'master' into storageareas
2017-02-15 09:30:35 -05:00
Isaac Connor
cfb18a05ba
build in auto snapshot from date
2017-02-14 12:14:28 -05:00
Michaël Arnauts
c3da373b1b
Disable SSH
2017-02-14 10:52:00 +01:00
Isaac Connor
b2657409a1
update with option release
2017-02-12 15:12:36 -05: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
Andrew Bauer
fbb8375a1a
check if crud plugin exists before unpacking
2017-01-25 10:49:58 -06:00
Isaac Connor
1f3644f6bd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-16 21:14:39 -05:00
Isaac Connor
0e8d1baebb
add an urgency flag
2017-01-16 21:13:56 -05:00
Andrew Bauer
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
Andrew Bauer
000ba2300a
packpack - initial support for debian distros
2017-01-15 20:43:03 -06:00
Isaac Connor
5db6e8cbb3
add auto-uploading to zmrepo for jessie
2017-01-15 17:20:40 -05:00
Andy Bauer
4325e8f7ea
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-01-15 15:49:46 -06:00
Andy Bauer
49c35d5733
packpack - f24,f25,el7 confirmed working
2017-01-15 15:48:57 -06:00
Isaac Connor
a30af05bcf
change parameters to use -o= or --option= and add interactive flag
2017-01-15 12:18:51 -05:00
Andrew Bauer
b3ee97ad11
Merge pull request #1753 from jbehrends/docker_apache_fix
...
Docker - Fixed broken cgi-bin path in apache site conf.
2017-01-14 20:38:33 -06:00
Josh Behrends
41f5ee5032
Fixed broken cgi-bin path
2017-01-14 16:35:46 -08:00
Andy Bauer
08d4d0c5c2
packpack - auto retrieve zmrepo rpm
2017-01-14 16:35:56 -06:00
Andy Bauer
7d91b4cdc7
minor changes to packpack patch
2017-01-14 16:24:55 -06:00
Andrew Bauer
3ae7038e3b
make the build script executable
2017-01-14 14:15:54 -06:00
Andrew Bauer
105e43fafd
initial commit for packpack support
2017-01-14 14:14:41 -06:00
Isaac Connor
d7f81393a8
fixes to detect and use environment variables for AUTHOR and debsign keys
2017-01-14 10:53:05 -05:00
Isaac Connor
b8dcebadd5
remove iconnor references
2017-01-14 10:01:55 -05:00
Isaac Connor
e3f073b275
update to add binary options, dput to ppa and use alternate fork. Also support newer distros and wheezy.
2017-01-14 09:58:36 -05:00
Josh Behrends
2104561eca
Fixed apache documentroot, and fixed permissions for "/"
2017-01-11 19:49:29 -08:00
klemens
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
Andy Bauer
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
Andy Bauer
1bdcd39a50
add quotes to handle values with spaces
2016-10-31 20:37:58 -05:00
Andrew Bauer
9f84aaa537
surround variables w/quotes to process data with spaces
2016-10-31 08:46:05 -05:00
Steve Gilvarry
3994de1b91
Merge pull request #1583 from zhuykovkb/fix_wrong_doc_root
...
fixed wrong doc root
2016-10-20 05:31:21 +11:00
Vikas Kedia
31ca095445
Update README.md
2016-08-15 04:39:04 -07:00
Zhuykov Kirill
52ba284357
fixed wrong doc root
2016-08-06 16:20:30 +03:00
Toby
6a097393ba
Run Docker db/apache setup once, not on every startup; kill mysql cleanly
2016-06-02 12:06:21 +10:00
Toby
d2e83d197d
Improve Docker build; reduce image size & layer count
...
Reducing layer count improves Docker performance, and is best-practice.
Avoid packing & sending .git tree into Docker build system.
Clean up apt archives to reduce image size.
2016-06-02 10:51:41 +10:00
Steve Gilvarry
97a4cf0852
Add the changes...doh
2016-05-01 15:06:45 +10:00
Isaac Connor
7645e29913
fix distro dirs, because the cmake versions have been renamed to not have cmake in them
2016-04-06 12:27:24 -04:00
Andrew Bauer
2fc1fc4380
use debian control file to auto-install deps
2016-02-22 09:18:46 -06:00
Robin Daermann
b28224cacb
Added copyright information to mk_bigfont.pl
2016-02-11 07:35:21 +01:00
Robin Daermann
226b77bb63
Added script to generate src/zm_bigfont.h
...
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
2016-02-10 11:28:56 +01:00
