aboutsummaryrefslogtreecommitdiffstats
path: root/net-im
diff options
context:
space:
mode:
authorjrm <jrm@FreeBSD.org>2017-09-27 23:31:06 +0800
committerjrm <jrm@FreeBSD.org>2017-09-27 23:31:06 +0800
commit5128afb856313495c99478f850930fd7960eda36 (patch)
tree44b86d2907a6bc0d8b4020c5d43d9cdffc647b1d /net-im
parent9406ea46531a5cbed25bf3cb823ab0b4d5270a7b (diff)
downloadfreebsd-ports-gnome-5128afb856313495c99478f850930fd7960eda36.tar.gz
freebsd-ports-gnome-5128afb856313495c99478f850930fd7960eda36.tar.zst
freebsd-ports-gnome-5128afb856313495c99478f850930fd7960eda36.zip
net-im/mastodon: Remove Gemfile.lock in the rc scripts before starting web
and worker services. There does not seem to be a simple way to prevent a removed Gemfile.lock from being re-generated when the web or worker services are started. This can cause startup errors when users upgrade dependencies and they no longer match what is in Gemfile.lock.
Diffstat (limited to 'net-im')
-rw-r--r--net-im/mastodon/Makefile1
-rw-r--r--net-im/mastodon/files/mastodon_web.in1
-rw-r--r--net-im/mastodon/files/mastodon_workers.in1
3 files changed, 3 insertions, 0 deletions
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index eab6a199c9b8..2257f3a3abbd 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mastodon
DISTVERSIONPREFIX= v
DISTVERSION= 1.6.1
+PORTREVISION= 1
CATEGORIES= net-im www
MAINTAINER= jrm@FreeBSD.org
diff --git a/net-im/mastodon/files/mastodon_web.in b/net-im/mastodon/files/mastodon_web.in
index ccdd3c53e038..edfbd2e1ace9 100644
--- a/net-im/mastodon/files/mastodon_web.in
+++ b/net-im/mastodon/files/mastodon_web.in
@@ -33,6 +33,7 @@ mastodon_web_user="mastodon"
pidfile="%%WWWDIR%%/tmp/${name}.pid"
procname="%%RUBY%%:"
+start_precmd="rm -f %%WWWDIR%%/Gemfile.lock"
command="%%PREFIX%%/bin/puma"
command_flags="-C config/puma.rb"
command_args=">> /var/log/mastodon/${name##mastodon_}.log 2>&1 &"
diff --git a/net-im/mastodon/files/mastodon_workers.in b/net-im/mastodon/files/mastodon_workers.in
index 365b7d8d523c..cb793deb0182 100644
--- a/net-im/mastodon/files/mastodon_workers.in
+++ b/net-im/mastodon/files/mastodon_workers.in
@@ -30,6 +30,7 @@ mastodon_workers_user="mastodon"
pidfile="%%WWWDIR%%/tmp/${name}.pid"
procname="%%RUBY%%:"
+start_precmd="rm -f %%WWWDIR%%/Gemfile.lock"
command="%%PREFIX%%/bin/sidekiq"
command_flags="-c ${mastodon_workers_threads} -q default -q mailers -q pull -q push"
command_args=">> /var/log/mastodon/${name##mastodon_}.log 2>&1 &"