update to v25.1

3 files changed, 8 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a20cceb78f74..1726d4720527 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,10 +12,8 @@ pkgbase = mackerel-agent-git
 	backup = etc/mackerel-agent/mackerel-agent.conf
 	source = mackerel-agent-git::git+https://github.com/mackerelio/mackerel-agent.git
 	source = mackerel-agent.service
-	source = mackerel-agent.conf
 	sha1sums = SKIP
 	sha1sums = 0f31c458aabc5ce69a5f7ba42ae89ae4ab9df967
-	sha1sums = 3fe77f612f4e06908c1bee43fa99f395726d1040
 
 pkgname = mackerel-agent-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 986818658567..67017690aa2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Takashi Inoue <inoue@pitan.org>
 pkgname=mackerel-agent-git
-pkgver=0.24.0
+pkgver=0.25.1
 pkgrel=1
 pkgdesc="A revolutionary new kind of application performance management"
 arch=('i686' 'x86_64')
@@ -11,8 +11,7 @@ conflicts=('mackerel-agent')
 makedepends=('go' 'git')
 backup=('etc/mackerel-agent/mackerel-agent.conf')
 source=("$pkgname"::'git+https://github.com/mackerelio/mackerel-agent.git'
-        'mackerel-agent.service'
-        'mackerel-agent.conf')
+        'file://mackerel-agent.service')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -40,12 +39,15 @@ check() {
 
 package() {
   install -Dm755 "$srcdir/$pkgname/build/mackerel-agent" "$pkgdir/usr/bin/mackerel-agent"
-  install -Dm644 "$srcdir/mackerel-agent.conf" "$pkgdir/etc/mackerel-agent/mackerel-agent.conf"
+  install -Dm644 "$srcdir/$pkgname/mackerel-agent.sample.conf" "$pkgdir/etc/mackerel-agent/mackerel-agent.conf"
+  sed -i "s/^# pidfile/pidfile/" "$pkgdir/etc/mackerel-agent/mackerel-agent.conf"
+  sed -i "s/^# root/root/" "$pkgdir/etc/mackerel-agent/mackerel-agent.conf"
+  sed -i "s/^# verbose/verbose/" "$pkgdir/etc/mackerel-agent/mackerel-agent.conf"
+  sed -i "s/^# apikey/apikey/" "$pkgdir/etc/mackerel-agent/mackerel-agent.conf"
   install -Dm644 "$srcdir/mackerel-agent.service" "$pkgdir/usr/lib/systemd/system/mackerel-agent.service"
 
   mkdir -p "$pkgdir/var/lib/mackerel-agent"
 }
 
 sha1sums=('SKIP'
-          '0f31c458aabc5ce69a5f7ba42ae89ae4ab9df967'
-          '3fe77f612f4e06908c1bee43fa99f395726d1040')
+          '0f31c458aabc5ce69a5f7ba42ae89ae4ab9df967')
diff --git a/mackerel-agent.conf b/mackerel-agent.conf
deleted file mode 100644
index 26e572886b1c..000000000000
--- a/mackerel-agent.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-pidfile = "/run/mackerel-agent.pid"
-root = "/var/lib/mackerel-agent"
-verbose = false
-#apikey=
-
-# Include other config files
-# include = "/etc/mackerel-agent/conf.d/*.conf"
-
-# Configuration for connection
-# [connection]
-# post_metrics_dequeue_delay_seconds = 30 # delay for dequeuing from buffer queue (max value: 59)
-# post_metrics_retry_delay_seconds = 60   # delay for retring a request that causes errors (max value: 180)
-# post_metrics_retry_max = 10             # max numbers of retries for a request that causes errors
-# post_metrics_buffer_size = 30           # max numbers of requests stored in buffer queue.
-
-# Configuration for Custom Metrics Plugins
-# see also: http://help-ja.mackerel.io/entry/advanced/custom-metrics
-#
-# [plugin.metrics.vmstat]
-# command = "ruby /path/to/plugins/metrics-vmstat.rb"
-# [plugin.metrics.curl]
-# command = "ruby /path/to/plugins/metrics-curl.rb"