tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

puppet: Fixed bootstrap-server.sh for OpenBSD.

Browse source
This commit is contained in:
Timo Mkinen 2013-09-09 14:12:54 +03:00
parent e14fc2e327
commit caa6ab3e22
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
puppet/bootstrap-server.sh
View file

@ -11,10 +11,16 @@ case $1 in
;; ;;
esac esac
hostname -f | fgrep "." > /dev/null hostname | fgrep "." > /dev/null
if [ $? -ne 0 ]; then if [ $? -eq 0 ]; then
FQDN="$(hostname)"
else
hostname -f | fgrep "." > /dev/null
if [ $? -ne 0 ]; then
echo "error, command 'hostname -f' does not return domainname" 1>&2 echo "error, command 'hostname -f' does not return domainname" 1>&2
exit 1 exit 1
fi
FQDN="$(hostname -f)"
fi fi
which ruby > /dev/null 2>&1 which ruby > /dev/null 2>&1
@ -33,8 +39,7 @@ if [ -s /etc/puppet/puppet.conf ]; then
mv /etc/puppet/puppet.conf /etc/puppet/puppet.conf.orig mv /etc/puppet/puppet.conf /etc/puppet/puppet.conf.orig
fi fi
FQDN="$(hostname -f)" mkdir -p /srv
mkdir -p /etc/puppet/manifests/node mkdir -p /etc/puppet/manifests/node
if [ ! -s /etc/puppet/manifests/site.pp ]; then if [ ! -s /etc/puppet/manifests/site.pp ]; then