summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick White <git@njw.name>2020-03-10 14:21:29 +0000
committerNick White <git@njw.name>2020-03-10 14:21:29 +0000
commit58d15331e982c51e8fdc6fdf0383824b0a007f56 (patch)
tree2ba1c2ee651dea30be432f0610809eb7f64e0203
parent277e2224b049778c7cbd5b6bae86e786fda6d34d (diff)
Ensure modules are always updated, and that the service allows time for this to happen
-rw-r--r--roles/pipeliner/files/bookpipeline.service1
-rw-r--r--roles/pipeliner/templates/updatepipeline.j24
2 files changed, 4 insertions, 1 deletions
diff --git a/roles/pipeliner/files/bookpipeline.service b/roles/pipeliner/files/bookpipeline.service
index d68c730..10c016d 100644
--- a/roles/pipeliner/files/bookpipeline.service
+++ b/roles/pipeliner/files/bookpipeline.service
@@ -2,6 +2,7 @@
Description=Book Pipeline
[Service]
+TimeoutStartSec=300
ExecStartPre=/usr/local/bin/updatepipeline
ExecStart=/usr/local/bin/bookpipeline -v
Restart=always
diff --git a/roles/pipeliner/templates/updatepipeline.j2 b/roles/pipeliner/templates/updatepipeline.j2
index 5e0e842..43b3c4f 100644
--- a/roles/pipeliner/templates/updatepipeline.j2
+++ b/roles/pipeliner/templates/updatepipeline.j2
@@ -6,7 +6,9 @@ t="/home/{{ ansible_user }}/trainings"
# (they don't work for the go get stage in go 1.11)
export GOPATH="$g"
go get -u rescribe.xyz/bookpipeline/... && \
-cd "$g/src/rescribe.xyz/bookpipeline" && GO111MODULE=on go install ./... && \
+cd "$g/src/rescribe.xyz/bookpipeline" && \
+GO111MODULE=on go get -u rescribe.xyz/bookpipeline/... && \
+GO111MODULE=on go install ./... && \
sudo cp "$g/bin/bookpipeline" /usr/local/bin/ || exit 1
cd "$t" && git pull && \