Commit Graph

317 Commits

Author SHA1 Message Date
Isaac Connor 998aa2199b fix message for consistency 2017-04-24 16:55:08 -04:00
Isaac Connor 4d851dc00f Add Distribution guessing 2017-04-24 16:54:01 -04:00
Isaac Connor c5d2652d1b add code to specifically handle a release, and package versions 2017-04-24 16:50:33 -04:00
Andrew Bauer ba3e9a9151 Update rsync_xfer.sh
typo
2017-04-21 18:57:42 -05:00
Andrew Bauer c60c3bf67c Update rsync_xfer.sh
rsync to different folders depending on distro type
2017-04-21 18:57:10 -05:00
Andrew Bauer 6e28955b9a Update rsync_xfer.sh
packpack deploy - change rsync parameters
2017-04-20 18:40:31 -05:00
Andrew Bauer fac47694ed Update rsync_xfer.sh
travis deploy - modify rsync parameters
2017-04-20 12:10:48 -05:00
Andrew Bauer e90e6b13e9 Update rsync_xfer.sh
spelling
2017-04-19 07:22:03 -05:00
Andrew Bauer 6b43deb1e5 Update rsync_xfer.sh
remove set -ev, add a message when the remote filesystem mounted successfully
2017-04-19 07:11:20 -05:00
Andrew Bauer cf4861e08a Update rsync_xfer.sh
Turn on rsync verbose so we can see what files get transferred
2017-04-18 20:02:39 -05:00
Kyle Johnson c4164cda07 packpack, return of the packed. 2017-04-17 19:54:40 -06:00
Kyle Johnson acf12fb0f2 packpack, return of the packpack. 2017-04-17 19:47:34 -06:00
Kyle Johnson 4ad7baf8f9 packpack - fix encrypted key 2017-04-17 13:05:16 -06:00
Kyle Johnson 5904e9b703 packacpk - update encrypted rsa file 2017-04-17 12:55:04 -06:00
Isaac Connor 432a38720a Merge pull request #1788 from knnniggett/travis_test1
packpack nightly builds
2017-04-15 10:21:42 -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
Andrew Bauer 9d6a65abbe have to use ln with -T flag to force overwrite of existing link 2017-03-17 09:32:58 -05:00
Markos Vakondios ed96013605 Mysql starts without upstart/systemd 2017-03-12 21:28:49 +02:00
Andy Bauer e61a3fae9c always delete then recreate Crud folder for redhat builds 2017-03-07 14:44:53 -06:00
Andy Bauer d6caa7562f move the check for trusty arch 2017-03-07 14:43:14 -06:00
Andy Bauer f23e43ef85 add multiarch support 2017-03-07 14:24:06 -06:00
Andrew Bauer b514ab0b3c remove double quotes 2017-03-06 18:56:44 -06:00
Andrew Bauer bfe84e6a7c move debain versioning into a function 2017-03-06 18:54:55 -06:00
Andrew Bauer 0ee6da84c0 set VERSION & RELEASE in trusty build 2017-03-06 18:41:48 -06:00
Andrew Bauer 0cf94c3573 echo VERSION and RELEASE 2017-03-06 18:27:45 -06:00
Andrew Bauer 6dc2b13aee change package versioning scheme 2017-03-06 15:25:54 -06:00
Andrew Bauer 07a9a8bf70 check the built package exists signal failure if it doesn't 2017-03-06 06:50:59 -06:00
Andy Bauer 297e9b0463 remove set -e, deploy on master branch only 2017-03-05 14:02:02 -06:00
Andy Bauer 42887c8c2c specify the deb package name more precisely 2017-03-05 13:44:42 -06:00
Andy Bauer 26fbc04f7c fix typo 2017-03-05 13:41:17 -06:00
Andy Bauer 858b49a603 remove all patches 2017-03-05 13:04:37 -06:00
Andy Bauer 4fe70f0e7d recreate patch 2017-03-05 12:39:03 -06:00
Andy Bauer c6fc6cb0ca change patch method 2017-03-05 11:46:45 -06:00
Andy Bauer 7e0860f6bf move patch after symlink is established 2017-03-05 11:37:22 -06:00
Andy Bauer 696cfb1fc3 patch deb scripts to set perms on zm.conf 2017-03-05 11:14:28 -06:00
Andy Bauer b4a04b1d61 allow builds from local command line e.g. when not running Travis 2017-03-05 10:26:36 -06:00
Andy Bauer 18ce4ab966 install zoneminder deb only when running in Travis 2017-03-05 09:06:57 -06:00
Andy Bauer 713b2c12a3 add gdebi as required binary 2017-03-05 08:32:52 -06:00
Andy Bauer 6ec3a29f3e set version & release vars prior to calling packpack 2017-03-04 18:09:42 -06:00
Andy Bauer 02ea25e8a0 set group ownership on zm.conf 2017-03-04 10:49:14 -06:00
Andy Bauer 285e04bbf8 move code into subroutines, retire installzm.sh 2017-03-04 10:30:36 -06:00
Andy Bauer 92eda0b298 add Travis cron functionality 2017-03-04 10:16:05 -06:00
Andy Bauer 1dda7eeef1 change exit codes, debian filename issue fixed upstream 2017-03-04 09:44:42 -06:00
Andrew Bauer b8a162b2dc comment out autosetup patch 2017-02-28 14:23:20 -06:00
Andrew Bauer 7a06166d6b fix path in patch 2017-02-28 08:20:55 -06:00
Andrew Bauer 37e34b3715 fix exit code 2017-02-28 07:28:07 -06:00
Andrew Bauer cd9a3fd59b fix %autosetup support 2017-02-28 07:26:54 -06:00
Andrew Bauer 526d1bc99e configure rsync xfers to zmrepo 2017-02-27 09:45:08 -06:00
Andrew Bauer b9cd96b269 initial ssh config, add encrypted rsa keys 2017-02-27 08:38:58 -06:00
Andy Bauer 4f8b11d56f move bash commands into external script 2017-02-19 10:18:59 -06:00
Markos Vakondios ef8f5ceb23 Dockerfile Xenial & php 7 support 2017-02-18 00:17:18 +02:00
Andrew Bauer 33e8afa0e0 only patch packpack if it is not already patched 2017-02-17 13:25:17 -06: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
Michaël Arnauts c3da373b1b Disable SSH 2017-02-14 10:52:00 +01:00
Andrew Bauer fbb8375a1a check if crud plugin exists before unpacking 2017-01-25 10:49:58 -06: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
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
Andrew Bauer 41acdbb480 Merge pull request #1257 from salberin/topic/docker-fixes
Fix docker file
2016-02-05 07:37:38 -06:00
Sander Alberink e01547cbe4 Update timezone to GMT, reduce SHM requirement to 512M
Increase the SHM to 2048 if you need to support H.264 cameras
2016-02-05 14:08:43 +01:00
Sander Alberink b0c5aa511a Migrate to cmake for building.
Also ensure that content is properly symlinked.
2016-02-05 14:02:20 +01:00
Isaac Connor dd4f92fd4c Merge pull request #1243 from knnniggett/do_debian_script
use local user @ hostname.local for author
2016-02-04 11:55:14 -05:00
Sander Alberink baa305c0ed Increase shared memory available in docker to ensure H.264 cameras can work
Also enable CGI module, as zoneminder needs this for monitors
2016-02-01 12:35:45 +01:00
Sander Alberink b99e7b6500 Prepare for new Apache 2.4 behviour in Trusty 2016-02-01 12:34:09 +01:00
Pliable Pixels 0ade8abd6a typo 2016-01-20 16:11:35 -05:00
Pliable Pixels 8dd35d6057 modifications for general users 2016-01-20 16:09:12 -05:00
Andy Bauer 22ef473202 Use the full name 2016-01-19 10:22:51 -06:00
Andy Bauer a17bde0784 update hostname logic 2016-01-19 10:13:36 -06:00
Andy Bauer e2b00bbe1f use local user @ hostname.local for author 2016-01-19 08:05:40 -06:00
Isaac Connor e9c9caf201 Add a local build type 2016-01-18 21:39:33 -05:00
Isaac Connor 41a8249ed9 update my package building script 2016-01-05 09:04:04 -05:00
Isaac Connor 5ce35f147a initial rough version 2015-08-20 20:35:01 -04:00
Andrew Bauer 790ecba0b2 Move script to /utils 2014-11-15 12:48:01 -06:00
Kyle Johnson c48b039b15 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.travis.yml
2014-10-31 12:25:57 -04:00
Kyle Johnson 4cb0d7b1cd Use full path to zm_create.sql in bootstrap-zm.sh 2014-06-27 14:13:29 -04:00
Kyle Johnson 78c9ed2a7f Print out debug info in bootstrap-zm.sh 2014-06-27 14:08:57 -04:00
Kyle Johnson 13f5bccb7c Try to cd back to the build root 2014-06-27 08:34:15 -04:00
Kyle Johnson 158432a8cf First shot at testing an individual monitor 2014-06-27 08:23:53 -04:00
Kyle Johnson 2e12a5fee7 Fix path to test.monitor.sql in run_tests 2014-06-27 08:06:04 -04:00
Kyle Johnson 5d81f59e3a Moved travis tests to their own script 2014-06-27 08:00:49 -04:00
Kyle Johnson 1ff907ae80 Reorganize the travis file. 2014-06-27 07:19:58 -04:00
Hamilton Turner f2dbb1fe08 Dockerfile works properly, documentation updated
- Dockerfile now builds properly
- Dockerfile now ADDs files from local directory. This allows
  you to either pull from github (for master) or to build
  locally (for development)
- Removes some dependencies from container (wget, git)
- Removes pulling apache virtual host file from github
- Upgrades MySQL start check to actually check instead of just
  sleeping
2014-04-18 12:39:05 -04:00
Isaac Connor afc7581146 use zmDbConnect instead of all the DBI connect stuff 2014-04-09 10:34:58 -04:00
Kyle Johnson 7aa69dd5f3 Added CMakeLists.txt to bump-version.pl 2014-02-06 22:39:12 -05:00
Kyle Johnson 21b41f198a Initial commit of bump-version.pl 2014-02-06 22:37:16 -05:00
Kyle Johnson c492d421e5 Initial commit of zm-alarm.pl, example script to react to monitor alarms 2014-01-28 08:13:44 -05:00
Kyle Johnson 61c5658abf Added a readme for the Docker stuff 2014-01-27 14:03:51 -05:00
Kyle Johnson 0bf4122016 Set execute bit on travis.pl 2014-01-04 14:45:22 -05:00
Kyle Johnson 2b789332c8 Initial commit of perl test script for travis builds 2014-01-04 14:44:12 -05:00