Changeset 11834 for lang/perl/Punc

Timestamp:

05/18/08 02:02:42 (6 months ago)

Author:

mizzy

Message:

ちゃんと動いてなかった

Location:

lang/perl/Punc/trunk

Files:

• bin/puncmaster-ca (modified) (1 diff)
• lib/Punc/Master/CA.pm (modified) (1 diff)
• lib/Punc/Master/Daemon.pm (modified) (2 diffs)

lang/perl/Punc/trunk/bin/puncmaster-ca

@@ -21 +21 @@
 my $ssldir  = File::Spec->catdir($confdir, 'ssl');
 my $ca = Punc::Master::CA->new({ ssldir  => $ssldir });
+$ca->init;
 
 for ( qw/ sign list / ) {

lang/perl/Punc/trunk/lib/Punc/Master/CA.pm

@@ -10 +10 @@
 has 'cadir'   => ( is => 'rw', isa => 'Str' );
 
-sub new {
-    my ( $class, $args ) = @_;
-
-    bless {
-        %$args,
-        csrdir  => File::Spec->catdir($args->{ssldir}, 'csrs'),
-        certdir => File::Spec->catdir($args->{ssldir}, 'certs'),
-        cadir   => File::Spec->catdir($args->{ssldir}, 'ca'),
-    }, $class;
+sub init {
+    my $self = shift;
+    $self->csrdir( File::Spec->catdir($self->ssldir, 'csrs') );
+    $self->certdir( File::Spec->catdir($self->ssldir, 'certs') );
+    $self->cadir( File::Spec->catdir($self->ssldir, 'ca') );
 }
 

lang/perl/Punc/trunk/lib/Punc/Master/Daemon.pm

@@ -12 +12 @@
 with    'Punc::Daemon::Role';
 
+has 'ca' => (
+    is      => 'rw',
+    isa     => 'Punc::Master::CA',
+    default => sub { Punc::Master::CA->new },
+);
+
 sub new {
     my $class = shift;
@@ -21 +27 @@
         })
       );
+    $self->ca->init;
 
     $self->_find_or_create_ca_cert($self->context);