--- smeserver-ejabberd-2.0.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/80ejabberd.pem.SSLCert 2008-06-22 20:48:27.000000000 +0200 +++ smeserver-ejabberd-2.0.0/root/etc/e-smith/templates/home/e-smith/ssl.pem/80ejabberd.pem 2008-06-22 18:56:56.000000000 +0200 @@ -0,0 +1,19 @@ +{ + my $domain = $DomainName || "localdomain"; + my $hostname = $SystemName || "localhost"; + my $ppid = $$; + $pid = fork(); + if( $pid == 0 ){ + # wait for SME cert to be expanded + waitpid($ppid,0); + use esmith::templates; + esmith::templates::processTemplate({ + TEMPLATE_PATH => "/home/e-smith/ssl.pem/$hostname.$domain.pem" , + TEMPLATE_EXPAND_QUEUE => [ "/" ] , + OUTPUT_FILENAME => "/var/service/ejabberd/ssl/cert.pem" , + UID => "ejabberd" , + PERMS => 0640 , + }); + exec 'sv', '2', '/service/ejabberd'; + } +} \ Pas de fin de ligne à la fin du fichier. --- smeserver-ejabberd-2.0.0/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http.SSLCert 2008-06-22 20:44:21.000000000 +0200 +++ smeserver-ejabberd-2.0.0/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports30http 2008-06-22 18:56:56.000000000 +0200 @@ -3,10 +3,7 @@ $OUT .= "\n"; $OUT .= ' %% remove web_admin to disable admin interface:'; $OUT .= "\n"; - $OUT .= ' ,{5280, ejabberd_http, [tls, {certfile, "/home/e-smith/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}, http_poll'; + $OUT .= ' ,{5280, ejabberd_http, [tls, {certfile, "/var/service/ejabberd/ssl/cert.pem"}, http_poll'; $OUT .= ', web_admin' if (${ejabberd}{WebAdmin} eq 'enabled'); $OUT .= ']}'; $OUT .= "\n"; --- smeserver-ejabberd-2.0.0/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s.SSLCert 2008-06-22 20:44:21.000000000 +0200 +++ smeserver-ejabberd-2.0.0/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/80Ports10c2s 2008-06-22 18:56:56.000000000 +0200 @@ -2,32 +2,23 @@ $OUT =<<'HERE'; %%{5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]}, %% Use this line to enable SSL: - %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/home/e-smith/server.pem"}]}, + %%{5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/var/service/ejabberd/ssl/cert.pem"}]}, %% %% Use those lines instead for TLS support: - %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "/home/e-smith/server.pem"}]}, - %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/home/e-smith/server.pem"}]}, + %%{5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls, {certfile, "/var/service/ejabberd/ssl/cert.pem"}]}, + %%{5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/var/service/ejabberd/ssl/cert.pem"}]}, HERE if ( ${ejabberd}{XMPPAccess} eq 'tls' ) { - $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls_required, {certfile, "/home/e-smith/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}]},'; + $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {shaper, c2s_shaper}, starttls_required, {certfile, "/var/service/ejabberd/ssl/cert.pem"}]},'; $OUT .= "\n"; - $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/home/e-smith/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}]}'; + $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, tls, {certfile, "/var/service/ejabberd/ssl/cert.pem"}]}'; $OUT .= "\n\n"; } else { $OUT .= ' {5222, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, {shaper, c2s_shaper}]},'; $OUT .= "\n"; - $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/home/e-smith/ssl.pem/'; - $OUT .= ${SystemName}; - $OUT .= ('.' . ${DomainName}); - $OUT .= '.pem"}]}'; + $OUT .= ' {5223, ejabberd_c2s, [{access, c2s}, {max_stanza_size, 65536}, tls, {certfile, "/var/service/ejabberd/ssl/cert.pem"}]}'; $OUT .= "\n\n"; } } \ Pas de fin de ligne à la fin du fichier. --- smeserver-ejabberd-2.0.0/root/var/service/ejabberd/control/2.SSLCert 2008-06-22 20:47:37.000000000 +0200 +++ smeserver-ejabberd-2.0.0/root/var/service/ejabberd/control/2 2008-06-22 18:56:56.000000000 +0200 @@ -0,0 +1,5 @@ +#! /bin/sh + +test /var/service/ejabberd/ssl/cert.pem -nt ./supervise/pid || exit 0 +sv t . +