From d9e4bbe222fac00a56ad3b67f11dde3cbb43bad8 Mon Sep 17 00:00:00 2001 From: John Rodriguez Date: Thu, 17 Sep 2020 19:28:31 -0400 Subject: [PATCH 1/5] Removed system-service-manager - doesn't exist like this for ubuntu 18.04; pre-installed as ssm --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index c8ea3c9..020c1c0 100755 --- a/deploy.sh +++ b/deploy.sh @@ -833,7 +833,7 @@ elif [[ "${USER}" == "root" ]]; then if [[ "${OSxx}" == "ubuntu" ]]; then apt-get --assume-yes install \ mc zip unzip xz-utils wget curl htop dstat netcat \ - socat xfsprogs nfs-common system-storage-manager lvm2 \ + socat xfsprogs nfs-common lvm2 \ perl psmisc iotop bzip2 else yum install --assumeyes \ From 2941fa4d785552a2028964c8bd6163b9672aad3e Mon Sep 17 00:00:00 2001 From: John Rodriguez Date: Thu, 17 Sep 2020 20:06:27 -0400 Subject: [PATCH 2/5] mysql no longer allows blank default timestamp --- vlib/db/QPJob.sql | 6 +++--- vlib/db/QPLock.sql | 2 +- vlib/db/QPReq.sql | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/vlib/db/QPJob.sql b/vlib/db/QPJob.sql index 113c1c9..07a3a27 100644 --- a/vlib/db/QPJob.sql +++ b/vlib/db/QPJob.sql @@ -41,9 +41,9 @@ CREATE TABLE `QPJob` ( `cntGrabbed` int(11) NOT NULL DEFAULT '0', `inParallel` int(11) NOT NULL DEFAULT '0', `cdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `aliveTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `actTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `psTm` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `aliveTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', + `actTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', + `psTm` datetime NOT NULL DEFAULT '1970-01-01 00:00:01', `mem` bigint(20) NOT NULL DEFAULT '0', `maxmem` bigint(20) NOT NULL DEFAULT '0', `killCnt` bigint(20) NOT NULL DEFAULT '0', diff --git a/vlib/db/QPLock.sql b/vlib/db/QPLock.sql index 40e5656..c58c0eb 100644 --- a/vlib/db/QPLock.sql +++ b/vlib/db/QPLock.sql @@ -33,7 +33,7 @@ DROP TABLE IF EXISTS `QPLock`; CREATE TABLE `QPLock` ( `reqID` bigint(20) NOT NULL COMMENT 'request ID if positive, or private-use handle if negative', `key` varchar(767) NOT NULL COMMENT '767 is max length of mysql varchar key; really should be 4096 - max linux path length', - `purgeTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT 'if purgeTm < NOW(), lock has expired', + `purgeTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01' COMMENT 'if purgeTm < NOW(), lock has expired', PRIMARY KEY (`key`), KEY `qplock_reqid` (`reqID`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1; diff --git a/vlib/db/QPReq.sql b/vlib/db/QPReq.sql index 27a7ea8..926ae93 100644 --- a/vlib/db/QPReq.sql +++ b/vlib/db/QPReq.sql @@ -46,14 +46,14 @@ CREATE TABLE `QPReq` ( `progress` bigint(20) DEFAULT '0', `progress100` int(11) DEFAULT '0', `cdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - `takenTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `actTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `aliveTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `doneTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', - `purgeTm` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `takenTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', + `actTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', + `aliveTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', + `doneTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', + `purgeTm` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', `userKey` bigint(20) NOT NULL DEFAULT '0', `grabRand` bigint(20) DEFAULT '0', - `scheduleGrab` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00', + `scheduleGrab` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01', PRIMARY KEY (`reqID`), KEY `qpreq_grab` (`svcID`,`jobID`,`stat`,`act`), KEY `qpreq_grabParallel` (`inParallel`), From c9f75d7cb5c40b1fe5d01b77ee95157e2bcdc5b4 Mon Sep 17 00:00:00 2001 From: John Rodriguez Date: Thu, 17 Sep 2020 20:11:29 -0400 Subject: [PATCH 3/5] Some of the apt get installs needed --- requirements.list | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 requirements.list diff --git a/requirements.list b/requirements.list new file mode 100644 index 0000000..9b5a0a0 --- /dev/null +++ b/requirements.list @@ -0,0 +1,5 @@ +libmysql-dev +libpcre3 +libpcre3-dev +libsqlite3 +libmagickwand-dev From 47b085330ed0792d94d0b3f4e9c9c42a844354ea Mon Sep 17 00:00:00 2001 From: John Rodriguez Date: Thu, 17 Sep 2020 21:11:13 -0400 Subject: [PATCH 4/5] Fix for imagemagick 7.0+ --- vlib/xlib/image.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vlib/xlib/image.cpp b/vlib/xlib/image.cpp index 97c879a..2faad9f 100644 --- a/vlib/xlib/image.cpp +++ b/vlib/xlib/image.cpp @@ -225,7 +225,7 @@ sImage * sImage::resize(const char* pic_dst, udx width, udx height, EAspect keep } else if( keepAspect == eAspectHeight ) { width = m_width * height / m_height; } - rc = MagickResizeImage(wand, width, height, LanczosFilter, 1); + rc = MagickResizeImage(wand, width, height, LanczosFilter); if( rc == MagickTrue ) { rc = MagickWriteImage(wand, pic_dst); if( rc == MagickTrue ) { From 5e645c6a5b76b5a437635631819a1c934c7fd7fc Mon Sep 17 00:00:00 2001 From: John Rodriguez Date: Thu, 17 Sep 2020 21:11:31 -0400 Subject: [PATCH 5/5] Added an incomplete requirements list --- requirements.list | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements.list b/requirements.list index 9b5a0a0..a8bfc0c 100644 --- a/requirements.list +++ b/requirements.list @@ -3,3 +3,6 @@ libpcre3 libpcre3-dev libsqlite3 libmagickwand-dev + + +Install ImageMagick (tested with 7.0)