svn commit: r374425 - in head/sysutils/rubygem-smart_proxy_salt: . files

[Johannes Jost Meixner]

Author: xmj
Date: Tue Dec  9 19:49:14 2014
New Revision: 374425
URL: https://svnweb.freebsd.org/changeset/ports/374425
QAT: https://qat.redports.org/buildarchive/r374425/

Log:
  sysutils/rubygem-smart_proxy_salt: upgrade to 1.0.0
  
  - upgrade to 1.0.0
  
  PR:		195404
  Differential Revision:	https://reviews.freebsd.org/D1276
  Submitted by:	Michael Moll <kvedulv at kvedulv.de> (maintainer)
  Approved by:	swills (mentor)

Added:
  head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports   (contents, props changed)
  head/sysutils/rubygem-smart_proxy_salt/pkg-message   (contents, props changed)
Modified:
  head/sysutils/rubygem-smart_proxy_salt/Makefile
  head/sysutils/rubygem-smart_proxy_salt/distinfo
  head/sysutils/rubygem-smart_proxy_salt/pkg-plist

Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile
==============================================================================
--- head/sysutils/rubygem-smart_proxy_salt/Makefile	Tue Dec  9 19:48:24 2014	(r374424)
+++ head/sysutils/rubygem-smart_proxy_salt/Makefile	Tue Dec  9 19:49:14 2014	(r374425)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	smart_proxy_salt
-PORTVERSION=	0.0.2
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	sysutils ruby
 MASTER_SITES=	RG
 
@@ -27,7 +26,8 @@ post-patch:
 			-e "s|/usr/bin/env ruby|${RUBY}|g" \
 			-e "s|/usr/bin/env python|${PYTHON_CMD}|g" \
 			-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
-			${WRKSRC}/bin/foreman-node
+			${WRKSRC}/bin/foreman-node \
+			${WRKSRC}/sbin/upload-salt-reports
 
 post-install:
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy
@@ -38,5 +38,6 @@ post-install:
 		${INSTALL_DATA} ${FILESDIR}/salt.rb ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb
 		${MKDIR} ${STAGEDIR}${PREFIX}/etc/salt
 		${INSTALL_DATA} ${FILESDIR}/foreman.yaml.sample ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample
+		${INSTALL_SCRIPT} ${WRKSRC}/sbin/upload-salt-reports ${STAGEDIR}${PREFIX}/sbin
 
 .include <bsd.port.post.mk>

Modified: head/sysutils/rubygem-smart_proxy_salt/distinfo
==============================================================================
--- head/sysutils/rubygem-smart_proxy_salt/distinfo	Tue Dec  9 19:48:24 2014	(r374424)
+++ head/sysutils/rubygem-smart_proxy_salt/distinfo	Tue Dec  9 19:49:14 2014	(r374425)
@@ -1,2 +1,2 @@
-SHA256 (rubygem/smart_proxy_salt-0.0.2.gem) = 7b3ea0eb67a9a0fd05ab9179e3f45b59968407d13720dbdd92e70b78cb601f73
-SIZE (rubygem/smart_proxy_salt-0.0.2.gem) = 20992
+SHA256 (rubygem/smart_proxy_salt-1.0.0.gem) = a0a84ef93c6608701b8fd53d56c7e9e3a1793f13a0e65fc8ee4fada8be07ab3f
+SIZE (rubygem/smart_proxy_salt-1.0.0.gem) = 22016

Added: head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports	Tue Dec  9 19:49:14 2014	(r374425)
@@ -0,0 +1,15 @@
+--- sbin/upload-salt-reports.orig	2014-11-24 22:04:49.000000000 +0100
++++ sbin/upload-salt-reports	2014-11-24 22:04:56.000000000 +0100
+@@ -1,9 +1,9 @@
+ #!/usr/bin/env python
+ # Uploads reports from the Salt job cache to Foreman
+ 
+-LAST_UPLOADED = '/etc/salt/last_uploaded'
+-FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
+-LOCK_FILE = '/var/lock/salt-report-upload.lock'
++LAST_UPLOADED = '%%LOCALBASE%%/etc/salt/last_uploaded'
++FOREMAN_CONFIG = '%%LOCALBASE%%/etc/salt/foreman.yaml'
++LOCK_FILE = '/var/run/salt-report-upload.lock'
+ 
+ import urllib
+ import httplib

Added: head/sysutils/rubygem-smart_proxy_salt/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/rubygem-smart_proxy_salt/pkg-message	Tue Dec  9 19:49:14 2014	(r374425)
@@ -0,0 +1,5 @@
+Further configuration is required to connect salt and foreman-proxy, see:
+https://github.com/theforeman/foreman_salt/wiki#21-smart-proxy
+
+To upload reports from SaltStack highstates to Foreman, add a line like this to your /etc/crontab:
+*/10 * * * * root /usr/local/sbin/upload-salt-reports >>/var/log/foreman-proxy/salt-cron.log 2>&1

Modified: head/sysutils/rubygem-smart_proxy_salt/pkg-plist
==============================================================================
--- head/sysutils/rubygem-smart_proxy_salt/pkg-plist	Tue Dec  9 19:48:24 2014	(r374424)
+++ head/sysutils/rubygem-smart_proxy_salt/pkg-plist	Tue Dec  9 19:49:14 2014	(r374425)
@@ -1,4 +1,5 @@
 bin/foreman-node
+sbin/upload-salt-reports
 share/foreman-proxy/bundler.d/salt.rb
 @sample etc/foreman-proxy/settings.d/salt.yml.sample
 @sample etc/salt/foreman.yaml.sample