Skip to content

Commit bf234f7

Browse files
committed
Override rsyslog behaviour by using Vagrantfile to create a higher
priority conf file. This allows rsyslog clients to communicate with the rsyslog server on the on the Controller.
1 parent 96ae777 commit bf234f7

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

contrib/vagrant/nodes_vagrantfile_template.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
# Avahi-daemon broadcasts the machine's hostname to local DNS.
2121
# So $id.local in this case
2222
sudo service avahi-daemon restart
23+
echo "*.* @@192.168.61.100:514" > /etc/rsyslog.d/51-remote.conf
2324
SCRIPT
2425
end

contrib/vagrant/provision-controller.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,6 @@ knife bootstrap "$node_name.local" \
101101
--sudo
102102
set +x
103103

104-
# The IP address detected by Chef is the VM's eth0 10.0.0.0 range address.
105-
# However we need the 192 range address set on eth1.
106-
echo_color "Updating the IP address stored on the Chef Server for the Deis Controller node..."
107-
knife exec -E 'nodes.transform("name:deis-controller") { |n|
108-
n.automatic_attrs["ipaddress"] = "192.168.61.100"
109-
n.save
110-
}'
111-
112-
if [ $? -eq 0 ]; then
113-
echo_color "IP address updated."
114-
fi
115-
116104
echo_color "Updating Django site object from 'example.com' to 'deis-controller'..."
117105
vagrant ssh -c "sudo su deis -c \"psql deis -c \\\" \
118106
UPDATE django_site \

0 commit comments

Comments
 (0)