[doc] improve sample configs

(commit msg edited by gstrauss)

3 files changed, 19 insertions, 26 deletions

diff --git a/doc/config/lighttpd.conf b/doc/config/lighttpd.conf
index 79f76534..69e70d1b 100644
--- a/doc/config/lighttpd.conf
+++ b/doc/config/lighttpd.conf
@@ -427,6 +427,7 @@ include conf_dir + "/conf.d/dirlisting.conf"
 ## To enable SSL for the whole server you have to provide a valid
 ## certificate and have to enable the SSL engine.::
 ##
+##   server.modules += ( "mod_openssl" )
 ##   ssl.engine = "enable"
 ##   ssl.pemfile = "/path/to/server.pem"
 ##
diff --git a/doc/config/modules.conf b/doc/config/modules.conf
index 90a039b9..609b71e2 100644
--- a/doc/config/modules.conf
+++ b/doc/config/modules.conf
@@ -70,57 +70,57 @@ server.modules = (
 ##
 ## mod_expire
 ##
-#include "conf.d/expire.conf"
+#include conf_dir + "/conf.d/expire.conf"
 
 ##
 ## mod_deflate
 ##
-#include "conf.d/deflate.conf"
+#include conf_dir + "/conf.d/deflate.conf"
 
 ##
 ## mod_magnet
 ##
-#include "conf.d/magnet.conf"
+#include conf_dir + "/conf.d/magnet.conf"
 
 ##
 ## mod_geoip
 ##
-#include "conf.d/geoip.conf"
+#include conf_dir + "/conf.d/geoip.conf"
 
 ##
 ## mod_ssi
 ##
-#include "conf.d/ssi.conf"
+#include conf_dir + "/conf.d/ssi.conf"
 
 ##
 ## mod_status
 ##
-#include "conf.d/status.conf"
+#include conf_dir + "/conf.d/status.conf"
 
 ##
 ## mod_webdav
 ##
-#include "conf.d/webdav.conf"
+#include conf_dir + "/conf.d/webdav.conf"
 
 ##
 ## mod_userdir
 ##
-#include "conf.d/userdir.conf"
+#include conf_dir + "/conf.d/userdir.conf"
 
 ##
 ## mod_cml
 ##
-#include "conf.d/cml.conf"
+#include conf_dir + "/conf.d/cml.conf"
 
 ##
 ## mod_rrdtool
 ##
-#include "conf.d/rrdtool.conf"
+#include conf_dir + "/conf.d/rrdtool.conf"
 
 ##
 ## mod_secdownload
 ##
-#include "conf.d/secdownload.conf"
+#include conf_dir + "/conf.d/secdownload.conf"
 
 ##
 #######################################################################
@@ -133,22 +133,22 @@ server.modules = (
 ##
 ## mod_proxy
 ##
-#include "conf.d/proxy.conf"
+#include conf_dir + "/conf.d/proxy.conf"
 
 ##
 ## SCGI (mod_scgi)
 ##
-#include "conf.d/scgi.conf"
+#include conf_dir + "/conf.d/scgi.conf"
 
 ##
 ## FastCGI (mod_fastcgi)
 ##
-#include "conf.d/fastcgi.conf"
+#include conf_dir + "/conf.d/fastcgi.conf"
 
 ##
 ## plain old CGI (mod_cgi)
 ##
-#include "conf.d/cgi.conf"
+#include conf_dir + "/conf.d/cgi.conf"
 
 ##
 #######################################################################
@@ -170,17 +170,17 @@ server.modules = (
 ##
 ## mod_evhost
 ##
-#include "conf.d/evhost.conf"
+#include conf_dir + "/conf.d/evhost.conf"
 
 ##
 ## mod_simple_vhost
 ##
-#include "conf.d/simple_vhost.conf"
+#include conf_dir + "/conf.d/simple_vhost.conf"
 
 ##
 ## mod_mysql_vhost
 ##
-#include "conf.d/mysql_vhost.conf"
+#include conf_dir + "/conf.d/mysql_vhost.conf"
 
 ##
 #######################################################################
diff --git a/doc/config/vhosts.d/vhosts.template b/doc/config/vhosts.d/vhosts.template
index 93175e21..7cccd0b4 100644
--- a/doc/config/vhosts.d/vhosts.template
+++ b/doc/config/vhosts.d/vhosts.template
@@ -22,13 +22,5 @@ $HTTP["host"] == "download.example.com" {
   server.errorlog             = log_root + "/" + server_name + "/error.log"
 }
 
-$SERVER["socket"] == "127.0.0.1:443" {
-  server.name = "localhost"
-  ssl.pemfile = "/etc/ssl/private/lighttpd-localhost.pem"
-  ssl.engine  = "enable"
-
-  server.document-root = vhosts_dir + "/ssl-localhost/pages/"
-}
-
 ##
 #######################################################################