[otrs-cvs] UnitTest/bin UnitTestAutoSetup.pl,1.264,1.265

Comments:
Update of /home/cvs/UnitTest/bin
In directory lancelot:/tmp/cvs-serv4273/bin

Modified Files:
	UnitTestAutoSetup.pl 
Log Message:
PrivatePath and CertPath need to be writable.

Author: mb

Index: UnitTestAutoSetup.pl
===================================================================
RCS file: /home/cvs/UnitTest/bin/UnitTestAutoSetup.pl,v
retrieving revision 1.264
retrieving revision 1.265
diff -2 -u -d -r1.264 -r1.265
--- UnitTestAutoSetup.pl	5 Apr 2013 09:58:52 -0000	1.264
+++ UnitTestAutoSetup.pl	5 Apr 2013 10:41:37 -0000	1.265
@@ -511,6 +511,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/bin/gpg';
     $Enviroment{smime}->{Shell}      = '/usr/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/ssl/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}            = '/etc/init.d/mysql';
@@ -537,6 +537,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/bin/gpg2';
     $Enviroment{smime}->{Shell}      = '/usr/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/pki/tls/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}            = '/etc/init.d/mysqld';
@@ -563,6 +563,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/bin/gpg';
     $Enviroment{smime}->{Shell}      = '/usr/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/pki/tls/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}            = '/etc/init.d/mysqld';
@@ -592,6 +592,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/bin/gpg';
     $Enviroment{smime}->{Shell}      = '/usr/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/ssl/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}  = '/etc/init.d/mysql';
@@ -631,6 +631,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/bin/gpg';
     $Enviroment{smime}->{Shell}      = '/usr/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/ssl/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}            = '/etc/init.d/mysql';
@@ -657,6 +657,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/local/bin/gpg';
     $Enviroment{smime}->{Shell}      = '/usr/local/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/ssl/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}            = '/usr/local/etc/rc.d/mysql-server';
@@ -683,6 +683,6 @@
     $Enviroment{gpg}->{Shell}        = '/usr/bin/gpg';
     $Enviroment{smime}->{Shell}      = '/usr/bin/openssl';
-    $Enviroment{smime}->{CertDir}    = '/etc/ssl/certs';
-    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certs';
+    $Enviroment{smime}->{CertDir}    = '/opt/otrs/var/certdir';
+    $Enviroment{smime}->{PrivateDir} = '/opt/otrs/var/certprivate';
 
     $Databases{mysql}->{Server}  = '/etc/init.d/mysql';
@@ -1004,14 +1004,16 @@
         }
 
-        # create PrivatePath if needed
-        if ( !-d $Enviroment{smime}->{PrivateDir} ) {
-            make_path(
-                $Enviroment{smime}->{PrivateDir},
-                {
-                    owner => $UnitTestUser,
-                    group => $Enviroment{apache}->{Group},
-                }
-            );
-
+        # create ssl paths if needed
+        # please note these both need to be writable for the unit tests!
+        for my $Dir (qw ( CertDir PrivateDir )) {
+            if ( !-d $Enviroment{smime}->{$Dir} ) {
+                make_path(
+                    $Enviroment{smime}->{$Dir},
+                    {
+                        owner => $UnitTestUser,
+                        group => $Enviroment{apache}->{Group},
+                    }
+                );
+            }
         }
 
---------------------------------------------------------------------
OTRS mailing list: cvs-log - Webpage: http://otrs.org/
Archive: http://lists.otrs.org/pipermail/cvs-log
To unsubscribe: http://lists.otrs.org/cgi-bin/listinfo/cvs-log