correcting documentation on autosign in puppetmasterd, and switching the autosign.conf file to use the same authstore as fileserver.conf

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@609 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 1 insertions, 4 deletions

diff --git a/test/server/tc_ca.rb b/test/server/tc_ca.rb
index e3f768b39..de1ed0963 100644
--- a/test/server/tc_ca.rb
+++ b/test/server/tc_ca.rb
@@ -204,8 +204,7 @@ class TestCA < Test::Unit::TestCase
         @@tmpfiles << autosign
         File.open(autosign, "w") { |f|
             f.puts "hostmatch.domain.com"
-            f.puts ".+.other.com"
-            f.puts "hostname.+"
+            f.puts "*.other.com"
         }
 
         caserv = nil
@@ -216,8 +215,6 @@ class TestCA < Test::Unit::TestCase
 
         assert(caserv.autosign?("hostmatch.domain.com"))
         assert(caserv.autosign?("fakehost.other.com"))
-        assert(caserv.autosign?("hostname.rahtest.boo"))
-        assert(caserv.autosign?("hostname.com")) # a tricky one
         assert(!caserv.autosign?("kirby.reductivelabs.com"))
         assert(!caserv.autosign?("culain.domain.com"))
     end