Date: Mon, 29 Sep 2014 21:12:11 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369556 - in head/sysutils/rubygem-smart_proxy_salt: . files Message-ID: <201409292112.s8TLCB8d044510@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Sep 29 21:12:11 2014 New Revision: 369556 URL: http://svnweb.freebsd.org/changeset/ports/369556 QAT: https://qat.redports.org/buildarchive/r369556/ Log: sysutils/rubygem-smart_proxy_salt: fix various bugs to make port functional PR: 194014 Submitted by: Michael Moll <kvedulv@kvedulv.de> Added: head/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample (contents, props changed) head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node (contents, props changed) Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile head/sysutils/rubygem-smart_proxy_salt/pkg-plist Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/Makefile Mon Sep 29 21:05:03 2014 (r369555) +++ head/sysutils/rubygem-smart_proxy_salt/Makefile Mon Sep 29 21:12:11 2014 (r369556) @@ -3,6 +3,7 @@ PORTNAME= smart_proxy_salt PORTVERSION= 0.0.2 +PORTREVISION= 1 CATEGORIES= sysutils ruby MASTER_SITES= RG @@ -12,14 +13,22 @@ COMMENT= SaltStack Plug-In for Foreman's LICENSE= GPLv3 RUN_DEPENDS= foreman-proxy>=1.6.0:${PORTSDIR}/net/foreman-proxy \ - ${PYTHON_PKGNAMEPREFIX}salt:${PORTSDIR}/sysutils/py-salt + ${PYTHON_PKGNAMEPREFIX}salt>0:${PORTSDIR}/sysutils/py-salt +USE_PYTHON= yes USE_RUBY= yes USE_RUBYGEMS= yes RUBYGEM_AUTOPLIST= yes .include <bsd.port.pre.mk> +post-patch: + @${REINPLACE_CMD} \ + -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 + post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d @@ -27,5 +36,7 @@ post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/foreman-proxy ${MKDIR} ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d ${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 .include <bsd.port.post.mk> Added: head/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-smart_proxy_salt/files/foreman.yaml.sample Mon Sep 29 21:12:11 2014 (r369556) @@ -0,0 +1,10 @@ +--- +:proto: http +:host: foreman.example.com +:port: 3000 +:ssl_ca: "" +:ssl_cert: "" +:ssl_key: "" +:timeout: 10 +:salt: /usr/local/bin/salt +:upload_grains: true Added: head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node Mon Sep 29 21:12:11 2014 (r369556) @@ -0,0 +1,11 @@ +--- bin/foreman-node.orig 2014-09-27 23:35:54.000000000 +0200 ++++ bin/foreman-node 2014-09-27 23:39:19.000000000 +0200 +@@ -5,7 +5,7 @@ + + require 'yaml' + +-$settings_file = "/etc/salt/foreman.yaml" ++$settings_file = "%%LOCALBASE%%/etc/salt/foreman.yaml" + SETTINGS = YAML.load_file($settings_file) + + require 'net/http' Modified: head/sysutils/rubygem-smart_proxy_salt/pkg-plist ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/pkg-plist Mon Sep 29 21:05:03 2014 (r369555) +++ head/sysutils/rubygem-smart_proxy_salt/pkg-plist Mon Sep 29 21:12:11 2014 (r369556) @@ -1,3 +1,4 @@ bin/foreman-node share/foreman-proxy/bundler.d/salt.rb @sample etc/foreman-proxy/settings.d/salt.yml.sample +@sample etc/salt/foreman.yaml.sample
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409292112.s8TLCB8d044510>