ref: refs/heads/master commit 5007de92bf910ba49fb8c4dbaa451aa8713421fa Author: Josef Reidinger Date: Fri Nov 20 10:14:12 2009 +0100 Revert accidentlly added development code to redirecting http (bnc#556962) This partially reverts commit c0b4ead673f67ef18a8a6f555a6d8ab369ffb904. --- webclient/config/lighttpd.conf | 39 ++++++++++++++------------------------- 1 files changed, 14 insertions(+), 25 deletions(-) diff --git a/webclient/config/lighttpd.conf b/webclient/config/lighttpd.conf index 52a6c77..388e11a 100644 --- a/webclient/config/lighttpd.conf +++ b/webclient/config/lighttpd.conf @@ -15,31 +15,12 @@ var.state_dir = "/var/run" ## Basic Configuration ## --------------------- ## -# cannot use together with SERVER[socket] so change ip or socket there #server.port = 80 +server.bind = "0.0.0.0" +server.port = 54984 -#automatic redirect http to https -$HTTP["scheme"] == "http" { - $HTTP["host"] =~ "(.*)" { - url.redirect = ("(.*)" => "https://%1") - } -#place where you can change ip or socket -} else $SERVER["socket"] == "0.0.0.0:54984" { - ssl.engine = "enable" - ssl.pemfile = "/etc/lighttpd/certs/webyast.pem" -} - -## RAILS settings -# Change *-procs to 2 if you need to use Upload Progress or other tasks that -# *need* to execute a second request while the first is still pending. -fastcgi.server = ( ".fcgi" => ( "localhost" => ( - "min-procs" => 1, - "max-procs" => 1, - "socket" => "/srv/www/yast/tmp/sockets/fcgi.socket", - "bin-path" => "/srv/www/yast/public/dispatch.fcgi", - "bin-environment" => ( "RAILS_ENV" => "production" ) -) ) ) - +ssl.engine = "enable" +ssl.pemfile = "/etc/lighttpd/certs/webyast.pem" ## ## Run as a different username/groupname. @@ -68,7 +49,7 @@ server.max-read-idle = 120 server.pid-file = state_dir + "/yastwc.pid" -server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire","mod_redirect" ) +server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi", "mod_compress", "mod_expire" ) server.error-handler-404 = "/dispatch.fcgi" server.document-root = "/srv/www/yast/public/" @@ -87,6 +68,15 @@ expire.url = ( "/favicon.ico" => "access 3 days", "/javascripts/" => "access 3 days" ) +# Change *-procs to 2 if you need to use Upload Progress or other tasks that +# *need* to execute a second request while the first is still pending. +fastcgi.server = ( ".fcgi" => ( "localhost" => ( + "min-procs" => 1, + "max-procs" => 1, + "socket" => "/srv/www/yast/tmp/sockets/fcgi.socket", + "bin-path" => "/srv/www/yast/public/dispatch.fcgi", + "bin-environment" => ( "RAILS_ENV" => "production" ) +) ) ) mimetype.assign = ( ".css" => "text/css", @@ -108,7 +98,6 @@ $HTTP["useragent"] =~ "^(.*MSIE.*)|(.*AppleWebKit.*)$" { } - # http://redmine.lighttpd.net/wiki/lighttpd/HowToSimpleSSL #$SERVER["socket"] == ":443" { # ssl.engine = "enable" -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org