diff options
| author | Johannes Jost Meixner <xmj@FreeBSD.org> | 2014-12-09 19:49:14 +0000 |
|---|---|---|
| committer | Johannes Jost Meixner <xmj@FreeBSD.org> | 2014-12-09 19:49:14 +0000 |
| commit | 958b2c85352a8c12b5ae75e8c8af6cdde5b2ce51 (patch) | |
| tree | e4252594709dd8660f7dd3a5c84d3e89e3d29747 /sysutils/rubygem-smart_proxy_salt | |
| parent | de822b3d84bd774e15a3909ec5285fbf46a9f539 (diff) | |
| download | ports-958b2c85352a8c12b5ae75e8c8af6cdde5b2ce51.tar.gz ports-958b2c85352a8c12b5ae75e8c8af6cdde5b2ce51.zip | |
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@kvedulv.de> (maintainer)
Approved by: swills (mentor)
Notes
Notes:
svn path=/head/; revision=374425
Diffstat (limited to 'sysutils/rubygem-smart_proxy_salt')
5 files changed, 27 insertions, 5 deletions
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile index c2c31bb051d4..3c38989bd843 100644 --- a/sysutils/rubygem-smart_proxy_salt/Makefile +++ b/sysutils/rubygem-smart_proxy_salt/Makefile @@ -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> diff --git a/sysutils/rubygem-smart_proxy_salt/distinfo b/sysutils/rubygem-smart_proxy_salt/distinfo index 1245d19eac23..19d3ff539206 100644 --- a/sysutils/rubygem-smart_proxy_salt/distinfo +++ b/sysutils/rubygem-smart_proxy_salt/distinfo @@ -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 diff --git a/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports b/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports new file mode 100644 index 000000000000..acd990aed48d --- /dev/null +++ b/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports @@ -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 diff --git a/sysutils/rubygem-smart_proxy_salt/pkg-message b/sysutils/rubygem-smart_proxy_salt/pkg-message new file mode 100644 index 000000000000..dd6e8241cff4 --- /dev/null +++ b/sysutils/rubygem-smart_proxy_salt/pkg-message @@ -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 diff --git a/sysutils/rubygem-smart_proxy_salt/pkg-plist b/sysutils/rubygem-smart_proxy_salt/pkg-plist index b5a82e6d3b0b..3c722feca406 100644 --- a/sysutils/rubygem-smart_proxy_salt/pkg-plist +++ b/sysutils/rubygem-smart_proxy_salt/pkg-plist @@ -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 |