playing with puppet_hostname

Author: danlangford

deploy/vagrant/modules/buttonmen/templates/create_rds_database.erb

@@ -15,7 +15,7 @@ if [ "$?" = "0" ]; then
 else 
   echo "Creating <%= buttonmen_db1_name %>"
   echo "CREATE DATABASE <%= buttonmen_db1_name %>" | mysql ${MYSQL_ARGS}
-  echo "GRANT ALL ON <%= buttonmen_db1_name %>.* TO <%= buttonmen_db1_user %>@'<%= puppet_hostname %>' IDENTIFIED BY '<%= buttonmen_db1_pass %>'" | mysql ${MYSQL_ARGS}
+  echo "GRANT ALL ON <%= buttonmen_db1_name %>.* TO <%= buttonmen_db1_user %>@'<%= @puppet_hostname %>' IDENTIFIED BY '<%= buttonmen_db1_pass %>'" | mysql ${MYSQL_ARGS}
 
   echo "Populating <%= buttonmen_db1_name %>"
   cd /buttonmen/deploy/database

deploy/vagrant/modules/postfix/templates/main.cf.erb

@@ -19,13 +19,13 @@ smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 # See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
 # information on enabling SSL in the smtp client.
 
-myhostname = <%= puppet_hostname %>
+myhostname = <%= @puppet_hostname %>
 mydomain = buttonweavers.com
 alias_maps = hash:/etc/aliases
 alias_database = hash:/etc/aliases
-myorigin = <%= puppet_hostname %>
+myorigin = <%= @puppet_hostname %>
 masquerade_domains = $mydomain
-mydestination = <%= puppet_hostname %>, localhost.buttonweavers.com, localhost
+mydestination = <%= @puppet_hostname %>, localhost.buttonweavers.com, localhost
 relayhost = 
 mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
 mailbox_size_limit = 0