Merge pull request #58 from freenas/consul-alerts-11.1-stable

Set AWS env variables for config and creds.
truenas · Dec 12, 2017 · 7553f62 · 7553f62
2 parents c536ac4 + 2c2b74c
commit 7553f62
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/sysutils/consul-alerts/Makefile b/sysutils/consul-alerts/Makefile
@@ -1,7 +1,8 @@
-# $FreeBSD$
+# $FreeBSD: head/sysutils/consul-alerts/Makefile 451834 2017-10-12 09:06:17Z mat $
 
 PORTNAME=	consul-alerts
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
@@ -17,16 +18,14 @@ USES=		compiler go
 USE_GITHUB=	yes
 GH_ACCOUNT=	AcalephStorage
 GH_SUBDIR=	src/github.com/AcalephStorage/consul-alerts
-GH_TUPLE=	aws:aws-sdk-go:v1.8.30:aws_sdk_go/src/github.com/aws/aws-sdk-go \
+GH_TUPLE=	aws:aws-sdk-go:v1.12.45:aws_sdk_go/src/github.com/aws/aws-sdk-go \
 		imdario:mergo:0.2.2:mergo/src/github.com/imdario/mergo \
 		mitchellh:hashstructure:9204ce5:hashstructure/src/github.com/mitchellh/hashstructure
 
 PLIST_FILES=	${PREFIX}/bin/${PORTNAME}
 
 USE_RC_SUBR=	${PORTNAME}
 
-STRIP=		#none
-
 do-build:
 	cd ${GO_WRKSRC} && \
 		${SETENV} ${BUILD_ENV} GOPATH=${WRKSRC} go build -v -x \

diff --git a/sysutils/consul-alerts/distinfo b/sysutils/consul-alerts/distinfo
@@ -1,8 +1,8 @@
-TIMESTAMP = 1495844279
+TIMESTAMP = 1513054327
 SHA256 (AcalephStorage-consul-alerts-v0.5.0_GH0.tar.gz) = 2f6b8e1c0c58a1b84ff0b24655f86da1325f4124eaa24fd45bc1b4cc324ef360
 SIZE (AcalephStorage-consul-alerts-v0.5.0_GH0.tar.gz) = 242042
-SHA256 (aws-aws-sdk-go-v1.8.30_GH0.tar.gz) = 8467f39202e19299738eae2c0ec1e5475798b2bd02110d64efe824abe912210e
-SIZE (aws-aws-sdk-go-v1.8.30_GH0.tar.gz) = 6784740
+SHA256 (aws-aws-sdk-go-v1.12.45_GH0.tar.gz) = 1fbc31b43cc6e119afeff9047fe0f21ff73b1aeaf028ddb3119a52c1e3e3c8d0
+SIZE (aws-aws-sdk-go-v1.12.45_GH0.tar.gz) = 8414334
 SHA256 (imdario-mergo-0.2.2_GH0.tar.gz) = 06ff82ceeea1a2d5e5064867a8e3c581ad9c1fc8e243afc673b7b8c94f28d4cf
 SIZE (imdario-mergo-0.2.2_GH0.tar.gz) = 9415
 SHA256 (mitchellh-hashstructure-9204ce5_GH0.tar.gz) = c3e9599761f944c6bcc7c6e7d92df40e32f247c471a02b02a079817d4ccf2afc

diff --git a/sysutils/consul-alerts/files/consul-alerts.in b/sysutils/consul-alerts/files/consul-alerts.in
@@ -17,6 +17,8 @@
 . /etc/rc.subr
 
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
+export AWS_CONFIG_FILE=/root/.aws/config
+export AWS_SHARED_CREDENTIALS_FILE=/root/.aws/credentials
 
 name=consul_alerts
 rcvar=consul_alerts_enable