X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FSetup.pm;h=f0929192098fe1b3827fcbc954fc11c43426e15c;hb=6f401f92ef5362b8e42e76fee24d89e46d78a0dd;hp=e27b66fc595e269342aa595097f9f17f2f2222b6;hpb=f3c4966ed1f6ec3db7accd6dcdd3a5a3821d72a7;p=freeside.git

diff --git a/FS/FS/Setup.pm b/FS/FS/Setup.pm
index e27b66fc5..f09291920 100644
--- a/FS/FS/Setup.pm
+++ b/FS/FS/Setup.pm
@@ -84,6 +84,12 @@ sub enable_encryption {
   $conf->set('encryptionpublickey',  $rsa->get_public_key_string );
   $conf->set('encryptionprivatekey', $rsa->get_private_key_string );
 
+  # reload Record globals, false laziness with FS::Record
+  $FS::Record::conf_encryption           = $conf->exists('encryption');
+  $FS::Record::conf_encryptionmodule     = $conf->config('encryptionmodule');
+  $FS::Record::conf_encryptionpublickey  = join("\n",$conf->config('encryptionpublickey'));
+  $FS::Record::conf_encryptionprivatekey = join("\n",$conf->config('encryptionprivatekey'));
+
 }
 
 sub populate_numbering {
@@ -400,6 +406,9 @@ sub initial_data {
     #phone types
     'phone_type' => [],
 
+    #message templates
+    'msg_template' => [],
+
   ;
 
   \%hash;
@@ -410,6 +419,7 @@ sub populate_access {
 
   use FS::AccessRight;
   use FS::access_right;
+  use FS::access_groupagent;
 
   foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
     my $access_right = new FS::access_right {