Merge remote-tracking branch 'upstream/develop' into 1511-contact-evolution

[friendica.git] / mods / sample-Lighttpd.config

diff --git a/mods/sample-Lighttpd.config b/mods/sample-Lighttpd.config
index 66d00585d9742ac899f0cb3301dc38c7dbcf1bad..422c710069089e4d31d887e22dede758e8d95eab 100644 (file)
--- a/mods/sample-Lighttpd.config
+++ b/mods/sample-Lighttpd.config
@@ -42,26 +42,30 @@ server.pid-file             = "/var/run/lighttpd.pid"
 server.username             = "www-data"
 server.groupname            = "www-data"
 
+# enable SSL
 ssl.engine = "enable"
 ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem"
 ssl.ca-file = "/etc/lighttpd/ssl/ca.pem"
 
+# fix for problem between curl and lighttpd
+server.reject-expect-100-with-417 = "disable"
+
 # Send everybody to landing
-page:                                                            
+page:
 $SERVER["socket"] == ":80" {
 
 $HTTP["scheme"] == "http" {
     $HTTP["host"] =~ ".*" {
         # This next redirect doesn't appear to ever execute in
-Firefox                       
+Firefox
         # (sometimes, anyway -- caching issue?), but it does seem
-to                         
+to
         # reliably in Google's Chromium browser. If I change it
-here                         
+here
         # and restart Lighty, Firefox still goes to the URL in
-the                           
-        # last 'else' below. Or something. 
-Sometimes.                                       
+the
+        # last 'else' below. Or something.
+Sometimes.
         server.document-root = "/var/www"
         url.redirect = (".*" => "https://example.com")
     }
@@ -76,7 +80,7 @@ $HTTP["scheme"] == "https" {
         server.document-root = "/var/www/wordpress"
         ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem"
         # include
-"wpmu-rewrites.conf"                                                       
+"wpmu-rewrites.conf"
         url.rewrite-if-not-file = (
             "^/(.*/)?files/$" => "/index.php",
              "^/(.*/)?files/(.*)" => "/wp-includes/ms-files.php?file=$2",
@@ -90,9 +94,9 @@ $HTTP["scheme"] == "https" {
         server.document-root = "/var/www/friendica"
         ssl.pemfile = "/etc/lighttpd/ssl/friendica.pem"
         # Got the following 'Drupal Clean URL'after Mike suggested
-trying                    
+trying
         # something along those lines, from
-http://drupal.org/node/1414950                   
+http://drupal.org/node/1414950
         url.rewrite-if-not-file = (
             "^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2",
             "^\/(.*)$" => "/index.php?q=$1"
@@ -121,14 +125,14 @@ dir-listing.encoding        = "utf-8"
 server.dir-listing          = "disable"
 
 #compress.cache-dir          =
-"/var/cache/lighttpd/compress/"                               
+"/var/cache/lighttpd/compress/"
 #compress.filetype           = ( "application/x-javascript", "text/css",
 "text/html", "text/p\
 lain"
-)                                                                               
+)
 
 
 include_shell "/usr/share/lighttpd/create-mime.assign.pl"
 include_shell "/usr/share/lighttpd/include-conf-enabled.pl"
 
----------------( config ends )-----------------
\ No newline at end of file
+---------------( config ends )-----------------