From owner-svn-ports-head@FreeBSD.ORG Tue Dec 9 19:49:17 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2E4FDE; Tue, 9 Dec 2014 19:49:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D3E77ADB; Tue, 9 Dec 2014 19:49:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB9JnGlG057102; Tue, 9 Dec 2014 19:49:16 GMT (envelope-from xmj@FreeBSD.org) Received: (from xmj@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB9JnF2e057092; Tue, 9 Dec 2014 19:49:15 GMT (envelope-from xmj@FreeBSD.org) Message-Id: <201412091949.sB9JnF2e057092@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: xmj set sender to xmj@FreeBSD.org using -f From: Johannes Jost Meixner Date: Tue, 9 Dec 2014 19:49:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374425 - in head/sysutils/rubygem-smart_proxy_salt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Dec 2014 19:49:17 -0000 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 (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 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