Any plans to update salt to 0.9.5?

[Doug Barton]

On 01/20/2012 07:09, Christer Edwards wrote:
> On Thu, Jan 19, 2012 at 8:12 PM, Doug Barton <dougb at freebsd.org> wrote:
>> I've been evaluating salt, and would prefer not to deploy prior to the
>> msgpack update in 0.9.5.
> 
> I am hoping to get the port updated today, yes. Thanks for the
> additional nudge to get it finished :)

Awesome, thanks!

I've attached a small patch I came up with to brute-force the PREFIX.
The change in patch-setup.py doesn't do it for me for some reason. What
happens is that the daemon starts up because the path to the config is
included in the command line. But all of the command line tools
subsequently need the -c option to tell them where it is. While not
particularly elegant, doing it this way has 2 additional benefits. First
it updates the documentation as well as the binaries, and second it
means less to edit when a new user is setting it up for the first time
because the defaults already work.

When you get your update ready feel free to cc me on the PR.


Doug

-- 

	It's always a long day; 86400 doesn't fit into a short.

	Breadth of IT experience, and depth of knowledge in the DNS.
	Yours for the right price.  :)  http://SupersetSolutions.com/

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/salt/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	9 Jan 2012 15:41:04 -0000	1.2
+++ Makefile	20 Jan 2012 23:43:16 -0000
@@ -49,9 +49,16 @@
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 post-patch:
+.for file in conf/minion conf/master doc/man/salt-key.1 doc/man/salt-cp.1 \
+    doc/man/salt-minion.1 doc/man/salt-syndic.1 doc/man/salt-master.1 \
+    doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 salt/cli/__init__.py \
+    salt/__init__.py salt/config.py salt/client.py salt/modules/mysql.py
+	@${REINPLACE_CMD} -e 's|/etc/salt|${PREFIX}/etc/salt|' \
+	    -e 's|/srv/salt|${PREFIX}/etc/salt/states|' ${WRKSRC}/${file}
+.endfor
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/setup.py
-	${MV} ${WRKSRC}/conf/master ${WRKSRC}/conf/master.sample
-	${MV} ${WRKSRC}/conf/minion ${WRKSRC}/conf/minion.sample
+	@${MV} ${WRKSRC}/conf/master ${WRKSRC}/conf/master.sample
+	@${MV} ${WRKSRC}/conf/minion ${WRKSRC}/conf/minion.sample
 
 post-install:
 	@${CAT} ${PKGMESSAGE}