summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2017-04-21 16:05:28 +0300
committerCaleb Maclennan2017-04-21 16:06:29 +0300
commitaa5f944cec933dc979757659e30cbf7428a89b78 (patch)
treed588a82194a16f103745c6d9a5e383786bc1d26f
parent875da4e29c07e5519775efec172cdbdee7f095d0 (diff)
downloadaur-aa5f944cec933dc979757659e30cbf7428a89b78.tar.gz
Use system's ruby bundler for systemd units
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--mastodon-sidekiq.service2
-rw-r--r--mastodon-web.service2
4 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0e65668a4c1f..488c612fc509 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Apr 21 12:57:18 UTC 2017
+# Fri Apr 21 13:06:16 UTC 2017
pkgbase = mastodon-git
pkgdesc = A GNU Social-compatible microblogging server
pkgver = 1.2.2_22_ga0ed88a9
@@ -30,8 +30,8 @@ pkgbase = mastodon-git
source = mastodon-streaming.service
source = mastodon.target
sha256sums = SKIP
- sha256sums = e0d3047c1b2592a987c9a0375efb242a30dcf584e0a1f2e4b33221861fcfa55d
- sha256sums = 05bf79cabdf0787ff2c6e36ff9b4fd62237d72fe336294b03b64532f665cd687
+ sha256sums = 2b3a22149ee88c4bacf83aa1958b06fc791057089737596b35b6e1968b1443aa
+ sha256sums = 5f72e3ee2921f8b760bac614d910a3c36334ebfefdfd4ba0c9058e21d8537c73
sha256sums = 5a7bd6a66b93480468483205a12640317f5df5de3b4b4b6fcee38976bff606e4
sha256sums = 0920e862a1ad598022743381f2b0a38c3c745c7e1a6566c3fe51275bbef82e72
diff --git a/PKGBUILD b/PKGBUILD
index 0573870b527b..2fe948af33ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,8 +33,8 @@ source=(
"mastodon.target"
)
sha256sums=('SKIP'
- 'e0d3047c1b2592a987c9a0375efb242a30dcf584e0a1f2e4b33221861fcfa55d'
- '05bf79cabdf0787ff2c6e36ff9b4fd62237d72fe336294b03b64532f665cd687'
+ '2b3a22149ee88c4bacf83aa1958b06fc791057089737596b35b6e1968b1443aa'
+ '5f72e3ee2921f8b760bac614d910a3c36334ebfefdfd4ba0c9058e21d8537c73'
'5a7bd6a66b93480468483205a12640317f5df5de3b4b4b6fcee38976bff606e4'
'0920e862a1ad598022743381f2b0a38c3c745c7e1a6566c3fe51275bbef82e72')
install=mastodon.install
diff --git a/mastodon-sidekiq.service b/mastodon-sidekiq.service
index 85510487cfe5..40fafd9815eb 100644
--- a/mastodon-sidekiq.service
+++ b/mastodon-sidekiq.service
@@ -8,7 +8,7 @@ User=mastodon
WorkingDirectory=/var/lib/mastodon/live
Environment="RAILS_ENV=production"
Environment="DB_POOL=5"
-ExecStart=/var/lib/mastodon/.rbenv/shims/bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push
+ExecStart=/usr/bin/bundle exec sidekiq -c 5 -q default -q mailers -q pull -q push
TimeoutSec=15
Restart=always
diff --git a/mastodon-web.service b/mastodon-web.service
index 2ed9f6899fa6..3cce1f0f9313 100644
--- a/mastodon-web.service
+++ b/mastodon-web.service
@@ -8,7 +8,7 @@ User=mastodon
WorkingDirectory=/var/lib/mastodon/live
Environment="RAILS_ENV=production"
Environment="PORT=3000"
-ExecStart=/var/lib/mastodon/.rbenv/shims/bundle exec puma -C config/puma.rb
+ExecStart=/usr/bin/bundle exec puma -C config/puma.rb
TimeoutSec=15
Restart=always