Commit Graph

146 Commits

Author SHA1 Message Date
Isaac Connor cccc3df700 Merge branch 'master' into storageareas 2017-05-03 16:43:44 -04:00
Andrew Bauer ebe7c21984 Update rsync_xfer.sh 2017-05-02 13:44:34 -05:00
Isaac Connor 2344f533ba debuild has a problem with the debian dir being a link, so mv it instead 2017-04-27 12:18:27 -04:00
Isaac Connor 9dd251c1d5 direcoty shouldn't have the distro in it apparently 2017-04-27 11:52:24 -04:00
Isaac Connor 4121e4b061 put back the code that generates the .orig.tar.gz and deletes .git etc 2017-04-27 11:45:10 -04:00
Isaac Connor 7076b92af4 fix if on exit status of build 2017-04-27 09:01:47 -04:00
Isaac Connor fa0e1b728c xMerge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-26 20:42:39 -04:00
Isaac Connor 5f9268addd fix stsatus code deteciton 2017-04-26 20:42:28 -04:00
Isaac Connor 3d35a01240 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-04-26 16:49:16 -04:00
Isaac Connor 7d3dc84c12 echo out what distro we are building for 2017-04-26 16:49:13 -04:00
Isaac Connor 188ac8e097 die if build failed. 2017-04-26 16:45:23 -04:00
Isaac Connor 01c4242d2d Merge branch 'update_do_debian_release' into storageareas 2017-04-26 16:03:46 -04:00
Isaac Connor 088fa0192b Merge branch 'master' into storageareas 2017-04-25 10:00:14 -04:00
Isaac Connor b2fc959a50 Merge branch 'master' into update_do_debian_release 2017-04-24 17:01:56 -04:00
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
Isaac Connor 3ac9eac31e Merge branch 'master' into storageareas 2017-04-19 14:16:20 -04: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
Isaac Connor b71d021ae1 Merge branch 'fix_1849' into storageareas 2017-04-18 12:43:04 -04: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 273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Isaac Connor 432a38720a Merge pull request #1788 from knnniggett/travis_test1
packpack nightly builds
2017-04-15 10:21:42 -04:00
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
Andrew Bauer 9d6a65abbe have to use ln with -T flag to force overwrite of existing link 2017-03-17 09:32:58 -05: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