Please review pull request #157: (maint) slight tweaks to new answers opened by (justinstoller)

Description:

This changes the console and auth db users to unique names.

It also makes the db passwords use as many special characters as we support.

I moved the one line that needed interpolation in the dashboard answers section to it's own string so the special characters I added won't be interpolated.

I also added a conditional to replace the DASHBOARD refers that remained in the answers file.

• Opened: Wed Feb 29 23:45:53 UTC 2012
• Based on: puppetlabs:master (36080cb058a840fd0bbc97ea8965c4249eb7fc06)
• Requested merge: justinstoller:dont_duplicate_db_users (18240dc2f472a406b6a250e7f3776cad78754e01)

Diff follows:

diff --git a/setup/early/01-gen-answer-file.rb b/setup/early/01-gen-answer-file.rb index 6ac8de4..809e6e7 100644 --- a/setup/early/01-gen-answer-file.rb +++ b/setup/early/01-gen-answer-file.rb <at> <at> -31,30 +31,29 <at> <at> ] # Dashboard only answers -dashboard_a = %Q[ -q_puppet_enterpriseconsole_auth_database_user='console' -q_puppet_enterpriseconsole_auth_database_password='puppet' +dashboard_a = %q[ +q_puppet_enterpriseconsole_auth_database_user='mYu7hu3r' +q_puppet_enterpriseconsole_auth_database_password='~! <at> #$%^*-/aZ' q_puppet_enterpriseconsole_smtp_host=DASHBOARD q_puppet_enterpriseconsole_smtp_use_tls=n q_puppet_enterpriseconsole_smtp_port=25 q_puppet_enterpriseconsole_smtp_user_auth=y q_puppet_enterpriseconsole_smtp_username='console' -q_puppet_enterpriseconsole_smtp_password='puppet' -q_puppet_enterpriseconsole_auth_password='puppet' +q_puppet_enterpriseconsole_smtp_password='~! <at> #$%^*-/aZ' +q_puppet_enterpriseconsole_auth_password='~! <at> #$%^*-/aZ' q_puppet_enterpriseconsole_auth_user='console' q_puppet_enterpriseconsole_database_install=y q_puppet_enterpriseconsole_database_name='console' -q_puppet_enterpriseconsole_database_password='puppet' -q_puppet_enterpriseconsole_database_root_password='puppet' -q_puppet_enterpriseconsole_database_user='console' -q_puppet_enterpriseconsole_httpd_port=#{portno} +q_puppet_enterpriseconsole_database_password='~! <at> #$%^*-/aZ' +q_puppet_enterpriseconsole_database_root_password='~! <at> #$%^*-/aZ' +q_puppet_enterpriseconsole_database_user='mYc0nS03u3r' q_puppet_enterpriseconsole_install=y q_puppet_enterpriseconsole_inventory_hostname=`uname | grep -i sunos > /dev/null && hostname || hostname -s` q_puppet_enterpriseconsole_inventory_port=8140 q_puppet_enterpriseconsole_master_hostname=MASTER q_puppet_enterpriseconsole_inventory_certname=`uname | grep -i sunos > /dev/null && hostname || hostname -s` q_puppet_enterpriseconsole_inventory_dnsaltnames=MASTER -] +] + "\nq_puppet_enterpriseconsole_httpd_port=#{portno}\n" dashboardhost = nil hosts.each do |host| # Clean up all answer files that might conflict <at> <at> -111,6 +110,9 <at> <at> if line =~ /(q_puppetmaster_enterpriseconsole_hostname=)DASHBOARD/ then line = $1+dashboardhost end + if line =~ /(q_puppet_enterpriseconsole_smtp_host=)DASHBOARD/ then + line = $1+dashboardhost + end if line =~ /(q_puppet_enterpriseconsole_master_hostname=)MASTER/ then line = $1+master end

--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev <at> googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscribe <at> googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.