Merge pull request #201 from techhat/freebsd

Correct the paths in the deploy script for FreeBSD
This commit is contained in:
Thomas S Hatch 2012-12-21 09:26:20 -08:00
commit b2b69bc3e9
2 changed files with 7 additions and 6 deletions

View File

@ -15,7 +15,7 @@ cd salt
/usr/local/bin/python setup.py install
cd
mkdir -p /etc/salt/pki
echo '{{ vm['priv_key'] }}' > /etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /etc/salt/pki/minion.pub
echo '{{ minion }}' > /etc/salt/minion
echo '{{ vm['priv_key'] }}' > /usr/local/etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /usr/local/etc/salt/pki/minion.pub
echo '{{ minion }}' > /usr/local/etc/salt/minion
salt-minion -d

View File

@ -8,7 +8,8 @@ cd
echo 'PACKAGESITE: http://pkgbeta.freebsd.org/freebsd-9-amd64/latest' > /usr/local/etc/pkg.conf
/usr/local/sbin/pkg install -y salt
mkdir -p /etc/salt/pki
echo '{{ vm['priv_key'] }}' > /etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /etc/salt/pki/minion.pub
echo '{{ minion }}' > /etc/salt/minion
echo '{{ vm['priv_key'] }}' > /usr/local/etc/salt/pki/minion.pem
echo '{{ vm['pub_key'] }}' > /usr/local/etc/salt/pki/minion.pub
echo '{{ minion }}' > /usr/local/etc/salt/minion
salt-minion -d