certs moved into modpath

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@1142 2b470e98-0d58-463d-a4d8-8e2adae1ed80

CHANGED

@@ -26,6 +26,7 @@
   - change:  JsonList output optimized and more structured
   - feature: FHEMWEB save button, smallscreen first screen fix
   - feature: FHEMWEB encoding is now UTF-8, alias attribute is respected
+  - change:  HTTPS certs directory moved from cwd into modpath
 
   
 - 2011-07-08 (5.1)

docs/commandref.html

@@ -6711,8 +6711,8 @@ href="http://www.elv.de/output/controller.aspx?cid=74&detail=10&detail2=29870">U
         apt-get install libio-socket-ssl-perl; the OSX perl already has this
         module.<br>
         A local certificate has to be generated into a directory called certs,
-        this directory <b>must</b> be in the working directory (pwd) of fhem,
-        which is not necessarily the modpath directory. To generate it:
+        this directory <b>must</b> be in the <a href="#modpath">modpath</a>
+        directory, at the same level as the FHEM directory.
         <ul>
         mkdir certs<br>
         cd certs<br>

webfrontend/pgm2/01_FHEMWEB.pm

@@ -208,7 +208,13 @@ FW_Read($)
     $selectlist{$nhash{NAME}} = \%nhash;
 
     if($hash->{SSL}) {
-      my $ret = IO::Socket::SSL->start_SSL($nhash{CD}, { SSL_server=>1, });
+      # Certs directory must be in the modpath, i.e. at the same level as the FHEM directory
+      my $mp = AttrVal("global", "modpath", ".");
+      my $ret = IO::Socket::SSL->start_SSL($nhash{CD}, {
+        SSL_server    => 1, 
+        SSL_key_file  => "$mp/certs/server-key.pem",
+        SSL_cert_file => "$mp/certs/server-cert.pem",
+        });
       Log 1, "FHEMWEB HTTPS: $!" if(!$ret && $! ne "Socket is not connected");
     }