Attachment #149870 for bug #195404

View | Details | Raw Unified | Return to bug 195404
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	smart_proxy_salt
PORTVERSION=	1.0.0
PORTREVISION=	1
CATEGORIES=	sysutils ruby
MASTER_SITES=	RG


			-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}/sbin/upload-salt-reports

post-install:
		${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy

		${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>

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (rubygem/smart_proxy_salt-0.0.2.gem) = 7b3ea0eb67a9a0fd05ab9179e3f45b59968407d13720dbdd92e70b78cb601f73	1	SHA256 (rubygem/smart_proxy_salt-1.0.0.gem) = a0a84ef93c6608701b8fd53d56c7e9e3a1793f13a0e65fc8ee4fada8be07ab3f
2	SIZE (rubygem/smart_proxy_salt-0.0.2.gem) = 20992	2	SIZE (rubygem/smart_proxy_salt-1.0.0.gem) = 22016




--- 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

Line 1 Link Here

(-)files/salt.rb (-1 / +1 lines)
1	gem 'smart_proxy_salt', '0.0.2'	1	gem 'smart_proxy_salt', '1.0.0'

Line 0 Link Here

(-)pkg-message (+5 lines)
	1	Further configuration is required to connect salt and foreman-proxy, see:
	2	https://github.com/theforeman/foreman_salt/wiki#21-smart-proxy
	3
	4	To upload reports from SaltStack highstates to Foreman, add a line like this to your /etc/crontab:
	5	/10 * * * root /usr/local/sbin/upload-salt-reports >>/var/log/foreman-proxy/salt-cron.log 2>&1

Lines 1-4 Link Here

(-)pkg-plist (+1 lines)
1	bin/foreman-node	1	bin/foreman-node
		2	sbin/upload-salt-reports
2	share/foreman-proxy/bundler.d/salt.rb	3	share/foreman-proxy/bundler.d/salt.rb
3	@sample etc/foreman-proxy/settings.d/salt.yml.sample	4	@sample etc/foreman-proxy/settings.d/salt.yml.sample
4	@sample etc/salt/foreman.yaml.sample	5	@sample etc/salt/foreman.yaml.sample

Return to bug 195404

Lines 2-9 Link Here

(-)Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= smart_proxy_salt	4	PORTNAME= smart_proxy_salt
5	PORTVERSION= 0.0.2	5	PORTVERSION= 1.0.0
6	PORTREVISION= 1
7	CATEGORIES= sysutils ruby	6	CATEGORIES= sysutils ruby
8	MASTER_SITES= RG	7	MASTER_SITES= RG
9		8
Lines 27-33 Link Here
27	-e "s\|/usr/bin/env ruby\|${RUBY}\|g" \	26	-e "s\|/usr/bin/env ruby\|${RUBY}\|g" \
28	-e "s\|/usr/bin/env python\|${PYTHON_CMD}\|g" \	27	-e "s\|/usr/bin/env python\|${PYTHON_CMD}\|g" \
29	-e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \	28	-e "s\|%%LOCALBASE%%\|${LOCALBASE}\|g" \
30	${WRKSRC}/bin/foreman-node	29	${WRKSRC}/bin/foreman-node \
		30	${WRKSRC}/sbin/upload-salt-reports
31		31
32	post-install:	32	post-install:
33	${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy	33	${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy
Lines 38-42 Link Here
38	${INSTALL_DATA} ${FILESDIR}/salt.rb ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb	38	${INSTALL_DATA} ${FILESDIR}/salt.rb ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb
39	${MKDIR} ${STAGEDIR}${PREFIX}/etc/salt	39	${MKDIR} ${STAGEDIR}${PREFIX}/etc/salt
40	${INSTALL_DATA} ${FILESDIR}/foreman.yaml.sample ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample	40	${INSTALL_DATA} ${FILESDIR}/foreman.yaml.sample ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample
		41	${INSTALL_SCRIPT} ${WRKSRC}/sbin/upload-salt-reports ${STAGEDIR}${PREFIX}/sbin
41		42
42	.include <bsd.port.post.mk>	43	.include <bsd.port.post.mk>

Line 0 Link Here

(-)files/patch-sbin-upload-salt-reports (+15 lines)
	1	--- sbin/upload-salt-reports.orig 2014-11-24 22:04:49.000000000 +0100
	2	+++ sbin/upload-salt-reports 2014-11-24 22:04:56.000000000 +0100
	3	@@ -1,9 +1,9 @@
	4	#!/usr/bin/env python
	5	# Uploads reports from the Salt job cache to Foreman
	6
	7	-LAST_UPLOADED = '/etc/salt/last_uploaded'
	8	-FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
	9	-LOCK_FILE = '/var/lock/salt-report-upload.lock'
	10	+LAST_UPLOADED = '%%LOCALBASE%%/etc/salt/last_uploaded'
	11	+FOREMAN_CONFIG = '%%LOCALBASE%%/etc/salt/foreman.yaml'
	12	+LOCK_FILE = '/var/run/salt-report-upload.lock'
	13
	14	import urllib
	15	import httplib