Attachment 149870 Details for Bug 195404 – update to 1.0.0

[patch] update to 1.0.0

rubygem-smart_proxy_salt-1.0.0.diff (text/plain), 3.96 KB, created by Michael Moll on 2014-11-26 09:40:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Moll

Created: 2014-11-26 09:40:05 UTC

Size: 3.96 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 373434)
>+++ Makefile	(working copy)
>@@ -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 @@
> 			-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 @@
> 		${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>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 373434)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-sbin-upload-salt-reports
>===================================================================
>--- files/patch-sbin-upload-salt-reports	(revision 0)
>+++ files/patch-sbin-upload-salt-reports	(working copy)
>@@ -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
>
>Property changes on: files/patch-sbin-upload-salt-reports
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/salt.rb
>===================================================================
>--- files/salt.rb	(revision 373434)
>+++ files/salt.rb	(working copy)
>@@ -1 +1 @@
>-gem 'smart_proxy_salt', '0.0.2'
>+gem 'smart_proxy_salt', '1.0.0'
>Index: pkg-message
>===================================================================
>--- pkg-message	(revision 0)
>+++ pkg-message	(working copy)
>@@ -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
>
>Property changes on: pkg-message
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 373434)
>+++ pkg-plist	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 195404: 149870 | 149871