Date: Wed, 27 Sep 2017 15:31:06 +0000 (UTC) From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450756 - in head/net-im/mastodon: . files Message-ID: <201709271531.v8RFV6PI013345@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jrm Date: Wed Sep 27 15:31:06 2017 New Revision: 450756 URL: https://svnweb.freebsd.org/changeset/ports/450756 Log: 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. Modified: head/net-im/mastodon/Makefile head/net-im/mastodon/files/mastodon_web.in head/net-im/mastodon/files/mastodon_workers.in Modified: head/net-im/mastodon/Makefile ============================================================================== --- head/net-im/mastodon/Makefile Wed Sep 27 15:25:39 2017 (r450755) +++ head/net-im/mastodon/Makefile Wed Sep 27 15:31:06 2017 (r450756) @@ -3,6 +3,7 @@ PORTNAME= mastodon DISTVERSIONPREFIX= v DISTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= net-im www MAINTAINER= jrm@FreeBSD.org Modified: head/net-im/mastodon/files/mastodon_web.in ============================================================================== --- head/net-im/mastodon/files/mastodon_web.in Wed Sep 27 15:25:39 2017 (r450755) +++ head/net-im/mastodon/files/mastodon_web.in Wed Sep 27 15:31:06 2017 (r450756) @@ -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 &" Modified: head/net-im/mastodon/files/mastodon_workers.in ============================================================================== --- head/net-im/mastodon/files/mastodon_workers.in Wed Sep 27 15:25:39 2017 (r450755) +++ head/net-im/mastodon/files/mastodon_workers.in Wed Sep 27 15:31:06 2017 (r450756) @@ -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 &"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709271531.v8RFV6PI013345>