View | Details | Raw Unified | Return to bug 198073 | Differences between
and this patch

Collapse All | Expand All

(-)UIDs (+1 lines)
Lines 239-244 Link Here
239
subsonic:*:844:844::0:0:Subsonic standalone-server:/nonexistent:/usr/sbin/nologin
239
subsonic:*:844:844::0:0:Subsonic standalone-server:/nonexistent:/usr/sbin/nologin
240
fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash
240
fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash
241
scanlogd:*:902:902::0:0:scanlogd user:/nonexistent:/usr/sbin/nologin
241
scanlogd:*:902:902::0:0:scanlogd user:/nonexistent:/usr/sbin/nologin
242
influxd:*:907:907::0:0:InfluxDB Daemon:/var/empty:/usr/sbin/nologin
242
riemann:*:908:908::0:0:Riemann User:/var/empty:/usr/sbin/nologin
243
riemann:*:908:908::0:0:Riemann User:/var/empty:/usr/sbin/nologin
243
proxy65:*:909:909::0:0:Proxy65 Daemon:/nonexistent:/usr/sbin/nologin
244
proxy65:*:909:909::0:0:Proxy65 Daemon:/nonexistent:/usr/sbin/nologin
244
bacula:*:910:910::0:0:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin
245
bacula:*:910:910::0:0:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin
(-)GIDs (+1 lines)
Lines 234-239 Link Here
234
subsonic:*:844:
234
subsonic:*:844:
235
fossy:*:901:www
235
fossy:*:901:www
236
scanlogd:*:902:
236
scanlogd:*:902:
237
influxd:*:907:
237
riemann:*:908:
238
riemann:*:908:
238
proxy65:*:909:
239
proxy65:*:909:
239
bacula:*:910:
240
bacula:*:910:
(-)databases/Makefile (+1 lines)
Lines 99-104 Link Here
99
    SUBDIR += hs-persistent-sqlite
99
    SUBDIR += hs-persistent-sqlite
100
    SUBDIR += hs-persistent-template
100
    SUBDIR += hs-persistent-template
101
    SUBDIR += hsqldb
101
    SUBDIR += hsqldb
102
    SUBDIR += influxdb
102
    SUBDIR += innotop
103
    SUBDIR += innotop
103
    SUBDIR += ip4r
104
    SUBDIR += ip4r
104
    SUBDIR += ipa_sdb
105
    SUBDIR += ipa_sdb
(-)databases/influxdb/Makefile (+131 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	influxdb
4
PORTVERSION=	0.9.0
5
DISTVERSIONPREFIX=	v
6
CATEGORIES=	databases net-mgmt
7
8
MAINTAINER=	cheffo@freebsd-bg.org
9
COMMENT=	Open-source distributed time series database
10
11
LICENSE=	MIT
12
13
BUILD_DEPENDS=	go>=1.4.0:${PORTSDIR}/lang/go
14
15
ONLY_FOR_ARCHS=	i386 amd64
16
17
USE_RC_SUBR=	influxd
18
19
USE_GITHUB=	yes
20
GH_ACCOUNT=	influxdb:DEFAULT \
21
		alecthomas:log4go \
22
		armon:go_metrics \
23
		BurntSushi:toml \
24
		bmizerany:pat \
25
		boltdb:bolt \
26
		cheffo:crypto,go_uuid \
27
		fatih:pool \
28
		gogo:gogo_protobuf \
29
		golang:golang_protobuf \
30
		hashicorp:raft,raft_boltdb,go_msgpack \
31
		kimor79:gollectd \
32
		peterh:liner \
33
		rakyll:statik
34
GH_PROJECT=	bolt:bolt crypto:crypto go-metrics:go_metrics \
35
		go-msgpack:go_msgpack gollectd:gollectd liner:liner \
36
		log4go:log4go pat:pat pool:pool protobuf:gogo_protobuf \
37
		protobuf:golang_protobuf raft-boltdb:raft_boltdb raft:raft \
38
		statik:statik toml:toml go-uuid:go_uuid
39
GH_TAGNAME=	04a3e85:bolt 056c9bc:toml 1351f93:crypto 1bb0d1c:liner \
40
		1bcc57d:log4go 274df12:statik 58bbd41:gogo_protobuf \
41
		61d0dee:gollectd aece6fb:golang_protobuf b2d95e5:go_metrics \
42
		b8a3500:pat cba550e:pool d1e82c1:raft_boltdb ed3ca8a:go_uuid \
43
		f0f02dd:raft fa3f638:go_msgpack
44
45
SUB_FILES=	influxd
46
SUB_LIST+=	INFLUXD_USER=${INFLUXD_USER} \
47
		INFLUXD_GROUP=${INFLUXD_GROUP} \
48
		INFLUXD_DBDIR=${INFLUXD_DBDIR} \
49
		INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \
50
		INFLUXD_LOGDIR=${INFLUXD_LOGDIR}
51
52
PLIST_SUB=	INFLUXD_USER=${INFLUXD_USER} \
53
		INFLUXD_GROUP=${INFLUXD_GROUP} \
54
		INFLUXD_DBDIR=${INFLUXD_DBDIR} \
55
		INFLUXD_PIDDIR=${INFLUXD_PIDDIR} \
56
		INFLUXD_LOGDIR=${INFLUXD_LOGDIR}
57
58
INFLUXD_USER?=	influxd
59
INFLUXD_GROUP?=	influxd
60
61
INFLUXD_DBDIR=	/var/db/${PORTNAME}/
62
INFLUXD_LOGDIR=	/var/log/${PORTNAME}/
63
INFLUXD_PIDDIR=	/var/run/${PORTNAME}/
64
65
USERS=		${INFLUXD_USER}
66
GROUPS=		${INFLUXD_GROUP}
67
68
STRIP=		# stripping can break go binaries
69
70
post-patch:
71
	@${MKDIR} ${WRKSRC}/src/code.google.com/p
72
	@${MKDIR} ${WRKSRC}/src/github.com/BurntSushi
73
	@${MKDIR} ${WRKSRC}/src/github.com/armon
74
	@${MKDIR} ${WRKSRC}/src/github.com/bmizerany
75
	@${MKDIR} ${WRKSRC}/src/github.com/boltdb
76
	@${MKDIR} ${WRKSRC}/src/github.com/fatih
77
	@${MKDIR} ${WRKSRC}/src/github.com/gogo
78
	@${MKDIR} ${WRKSRC}/src/github.com/golang
79
	@${MKDIR} ${WRKSRC}/src/github.com/hashicorp
80
	@${MKDIR} ${WRKSRC}/src/github.com/influxdb
81
	@${MKDIR} ${WRKSRC}/src/github.com/kimor79
82
	@${MKDIR} ${WRKSRC}/src/github.com/peterh
83
	@${MKDIR} ${WRKSRC}/src/github.com/rakyll
84
	@${MKDIR} ${WRKSRC}/src/golang.org/x
85
	@${MKDIR} ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
86
.for src in CHANGELOG.md CONTRIBUTING.md LICENSE QUERIES.md README.md \
87
	balancer.go balancer_test.go circle-test.sh circle.yml client \
88
	cluster cmd continuous_queries.md diagnostics.go errors.go etc \
89
	influxql meta package.sh scripts services shared snapshot statik \
90
	stats.go stats_test.go tcp tests toml tsdb uuid
91
	@${MV} ${WRKSRC}/${src} \
92
		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
93
.endfor
94
	@${MV} ${WRKSRC_bolt} ${WRKSRC}/src/github.com/boltdb/bolt
95
	@${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto
96
	@${MV} ${WRKSRC_go_metrics} ${WRKSRC}/src/github.com/armon/go-metrics
97
	@${MV} ${WRKSRC_go_msgpack} ${WRKSRC}/src/github.com/hashicorp/go-msgpack
98
	@${MV} ${WRKSRC_go_uuid} ${WRKSRC}/src/code.google.com/p/go-uuid
99
	@${MV} ${WRKSRC_gogo_protobuf} ${WRKSRC}/src/github.com/gogo/protobuf
100
	@${MV} ${WRKSRC_golang_protobuf} ${WRKSRC}/src/github.com/golang/protobuf
101
	@${MV} ${WRKSRC_gollectd} ${WRKSRC}/src/github.com/kimor79/gollectd
102
	@${MV} ${WRKSRC_liner} ${WRKSRC}/src/github.com/peterh/liner
103
	@${MV} ${WRKSRC_log4go} ${WRKSRC}/src/code.google.com/p/log4go
104
	@${MV} ${WRKSRC_pat} ${WRKSRC}/src/github.com/bmizerany/pat
105
	@${MV} ${WRKSRC_pool} ${WRKSRC}/src/github.com/fatih/pool
106
	@${MV} ${WRKSRC_raft_boltdb} ${WRKSRC}/src/github.com/hashicorp/raft-boltdb
107
	@${MV} ${WRKSRC_raft} ${WRKSRC}/src/github.com/hashicorp/raft
108
	@${MV} ${WRKSRC_statik} ${WRKSRC}/src/github.com/rakyll/statik
109
	@${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/BurntSushi/toml
110
111
do-build:
112
		@cd ${WRKSRC}/src/github.com/influxdb/ &&  ${SETENV} GOPATH=${WRKSRC} go install ./...
113
114
do-install:
115
		${MKDIR} ${STAGEDIR}${INFLUXD_DBDIR} \
116
		${STAGEDIR}${INFLUXD_PIDDIR} \
117
		${STAGEDIR}${INFLUXD_LOGDIR}
118
119
post-install:
120
		${INSTALL_PROGRAM} ${WRKSRC}/bin/influxd ${STAGEDIR}${PREFIX}/bin/influxd
121
		${INSTALL_PROGRAM} ${WRKSRC}/bin/influx ${STAGEDIR}${PREFIX}/bin/influx
122
		@${SED} -i .bak -e \
123
			"s|/tmp/influxdb/development|/var/db/influxdb|g" \
124
			${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/config.sample.toml
125
		${INSTALL_DATA} \
126
			${WRKSRC}/src/github.com/${GH_ACCOUNT}/${GH_PROJECT}/etc/config.sample.toml  \
127
			${STAGEDIR}${PREFIX}/etc/influxd.conf.sample
128
		@${MKDIR} ${STAGEDIR}/var/db/influxdb
129
		@${MKDIR} ${STAGEDIR}/var/log/influxdb
130
131
.include <bsd.port.mk>
(-)databases/influxdb/distinfo (+34 lines)
Line 0 Link Here
1
SHA256 (influxdb-influxdb-v0.9.0_GH0.tar.gz) = c7cc869754d7bfb9374b0a16a9b91073d9588adedbd7bfda1d5709e22d3a3d75
2
SIZE (influxdb-influxdb-v0.9.0_GH0.tar.gz) = 2554827
3
SHA256 (alecthomas-log4go-1bcc57d_GH0.tar.gz) = f15f25fb0d4d88ce9817f1a04c32c5ca7cf35358615b61601ef47be388733604
4
SIZE (alecthomas-log4go-1bcc57d_GH0.tar.gz) = 16190
5
SHA256 (armon-go-metrics-b2d95e5_GH0.tar.gz) = a3c2f9b16157249cf248c5a21fc9ade43c35c451005ed9dcc2d4b52b0f2f9680
6
SIZE (armon-go-metrics-b2d95e5_GH0.tar.gz) = 11360
7
SHA256 (BurntSushi-toml-056c9bc_GH0.tar.gz) = 73125940543e2922a77bee42f068f35383b5e260e5fbab867efcb7a59a05671a
8
SIZE (BurntSushi-toml-056c9bc_GH0.tar.gz) = 37104
9
SHA256 (bmizerany-pat-b8a3500_GH0.tar.gz) = 6468a8b27db2bed1edf6eb845da6f7466221c7b0b41112d77710e4ac76926a2f
10
SIZE (bmizerany-pat-b8a3500_GH0.tar.gz) = 5205
11
SHA256 (boltdb-bolt-04a3e85_GH0.tar.gz) = 63ea778d7f9f82e94610ed0a96cd4135993704440d6e3e9b09cdfb5c96c8d54e
12
SIZE (boltdb-bolt-04a3e85_GH0.tar.gz) = 72745
13
SHA256 (cheffo-crypto-1351f93_GH0.tar.gz) = 29ddf6009158914fb35f9d8e27c48164428dedac6a1314215e1717ae913d96f0
14
SIZE (cheffo-crypto-1351f93_GH0.tar.gz) = 860364
15
SHA256 (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 3ad72804ee9b735add1039ec8cffd445fefd66852a3b7c0b82baf428696ca921
16
SIZE (cheffo-go-uuid-ed3ca8a_GH0.tar.gz) = 41022
17
SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
18
SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854
19
SHA256 (gogo-protobuf-58bbd41_GH0.tar.gz) = 1d50a318b50a5f07e8111972081bef9d9dd2a7b9e3915fc88b10291620981498
20
SIZE (gogo-protobuf-58bbd41_GH0.tar.gz) = 1147405
21
SHA256 (golang-protobuf-aece6fb_GH0.tar.gz) = 3f4db232b0548a3b527f087539c9de28068c2f5603f66b1ff16b84ed222884b0
22
SIZE (golang-protobuf-aece6fb_GH0.tar.gz) = 142325
23
SHA256 (hashicorp-raft-f0f02dd_GH0.tar.gz) = 93fa0a92f3ef54a133c71d1b5f0288e12f3d933a392693c6d947c8f55637ee73
24
SIZE (hashicorp-raft-f0f02dd_GH0.tar.gz) = 57418
25
SHA256 (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 68bb2996a4ec490c099612efcc255ad721014aaf42afbf9f0b21fcf8361162d9
26
SIZE (hashicorp-raft-boltdb-d1e82c1_GH0.tar.gz) = 8879
27
SHA256 (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 6353c623d5d58c7ca03e2bdac63f9da7da8848fb1f5f7f239b33e3ce6fe6c6bd
28
SIZE (hashicorp-go-msgpack-fa3f638_GH0.tar.gz) = 49496
29
SHA256 (kimor79-gollectd-61d0dee_GH0.tar.gz) = 217d827fb26d1cf7b1fa3bae7fa51fc5b25ff2141151ffa7d328d015cd4fb498
30
SIZE (kimor79-gollectd-61d0dee_GH0.tar.gz) = 9508
31
SHA256 (peterh-liner-1bb0d1c_GH0.tar.gz) = 0ed1d975b6af46820eb55826527a9ab0263376da5a20e94b21695e21267f6f2e
32
SIZE (peterh-liner-1bb0d1c_GH0.tar.gz) = 16925
33
SHA256 (rakyll-statik-274df12_GH0.tar.gz) = 47cb3d4bc95171baeac813c0373cdfc232c4339fb09f251a76df247615216d49
34
SIZE (rakyll-statik-274df12_GH0.tar.gz) = 77898
(-)databases/influxdb/files/influxd.in (+47 lines)
Line 0 Link Here
1
#!/bin/sh
2
# $FreeBSD$
3
4
# PROVIDE: influxd
5
# REQUIRE: DAEMON NETWORKING
6
# BEFORE: LOGIN
7
# KEYWORD: shutdown
8
9
# Add the following lines to /etc/rc.conf to enable influxdb:
10
# influxd_enable="YES"
11
#
12
# influxd_enable (bool):	Set to YES to enable influxd
13
#				Default: NO
14
# influxd_conf (str):		influxd configuration file
15
#				Default: ${PREFIX}/etc/influxd.conf
16
# influxd_user (str):		influxd daemon user
17
#				Default: influxd
18
# influxd_group (str):		influxd daemon group
19
#				Default: influxd
20
# influxd_flags (str):		Extra flags passed to influxd
21
22
. /etc/rc.subr
23
24
name="influxd"
25
rcvar=influxd_enable
26
27
: ${influxd_enable:="NO"}
28
: ${influxd_user:="%%INFLUXD_USER%%"}
29
: ${influxd_group:="%%INFLUXD_GROUP%%"}
30
: ${influxd_flags:=""}
31
: ${influxd_conf:="%%PREFIX%%/etc/${name}.conf"}
32
: ${influxd_options:="${influxdb_flags} -config=${influxd_conf}"}
33
34
# daemon
35
influxd_pidfile="%%INFLUXD_PIDDIR%%${name}.pid"
36
procname="%%PREFIX%%/bin/${name}"
37
command=/usr/sbin/daemon
38
command_args=" -f -c -p ${influxd_pidfile} ${procname} ${influxd_options}"
39
start_precmd="influxd_precmd"
40
41
influxd_precmd()
42
{
43
    install -o ${influxd_user} /dev/null ${influxd_pidfile}
44
}
45
46
load_rc_config $name
47
run_rc_command "$1"
(-)databases/influxdb/files/patch-cluster_client__pool.go (+11 lines)
Line 0 Link Here
1
--- cluster/client_pool.go.orig	2015-06-23 14:38:16 UTC
2
+++ cluster/client_pool.go
3
@@ -4,7 +4,7 @@ import (
4
 	"net"
5
 	"sync"
6
 
7
-	"gopkg.in/fatih/pool.v2"
8
+	"github.com/fatih/pool"
9
 )
10
 
11
 type clientPool struct {
(-)databases/influxdb/files/patch-cluster_shard__writer.go (+11 lines)
Line 0 Link Here
1
--- cluster/shard_writer.go.orig	2015-06-23 14:38:36 UTC
2
+++ cluster/shard_writer.go
3
@@ -7,7 +7,7 @@ import (
4
 
5
 	"github.com/influxdb/influxdb/meta"
6
 	"github.com/influxdb/influxdb/tsdb"
7
-	"gopkg.in/fatih/pool.v2"
8
+	"github.com/fatih/pool"
9
 )
10
 
11
 const (
(-)databases/influxdb/pkg-descr (+13 lines)
Line 0 Link Here
1
An open-source, distributed, time series database with no external dependencies.
2
InfluxDB is the new home for all of your metrics, events, and analytics.
3
4
InfluxDB is a time series, metrics, and analytics database. It'written in Go and
5
has no external dependencies. That means once you install it there's nothing
6
else to manage (like Redis, ZooKeeper, HBase, or whatever).
7
8
InfluxDB is targeted at use cases for DevOps, metrics, sensor data, and
9
real-time analytics. It arose from our need for a database like this on more
10
than a few previous products we' built. You can read more about our jurney from 
11
SaaS application to open source time series database.
12
13
WWW: http://influxdb.com
(-)databases/influxdb/pkg-plist (+6 lines)
Line 0 Link Here
1
bin/influx
2
bin/influxd
3
@dir(%%INFLUXD_USER%%,%%INFLUXD_GROUP%%,0750) %%INFLUXD_DBDIR%%
4
@dir(%%INFLUXD_USER%%,%%INFLUXD_GROUP%%,0750) %%INFLUXD_LOGDIR%%
5
@dir(%%INFLUXD_USER%%,%%INFLUXD_GROUP%%,0750) %%INFLUXD_PIDDIR%%
6
@sample etc/%%INFLUXD_USER%%.conf.sample

Return to bug 198073