[Astlinux-commits] SF.net SVN: astlinux:[8089] branches/1.0

[<abe...@us...>]

Revision: 8089
          http://sourceforge.net/p/astlinux/code/8089
Author:   abelbeck
Date:     2017-01-11 18:11:47 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
lighttpd, add rc.conf variable HTTPSCHAIN, path to the CA file for support of chained certificates

Modified Paths:
--------------
    branches/1.0/package/lighttpd/lighttpd.conf
    branches/1.0/package/lighttpd/lighttpd.init
    branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf

Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf	2017-01-10 23:46:03 UTC (rev 8088)
+++ branches/1.0/package/lighttpd/lighttpd.conf	2017-01-11 18:11:47 UTC (rev 8089)
@@ -84,6 +84,7 @@
      ssl.engine                  = "enable"
      ssl.cipher-list             = "aRSA+HIGH !3DES +kEDH +kRSA !kSRP !kPSK"
      ssl.pemfile                 = "@HTTPSCERT@"
+     ssl.ca-file                 = "@HTTPSCHAIN@"
      server.document-root        = "/var/www"
      accesslog.filename          = "@HTTPS_ACCESSLOG@"
      url.access-deny             = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPSCGI@ )
@@ -101,6 +102,7 @@
 @IPV6@     ssl.engine                  = "enable"
 @IPV6@     ssl.cipher-list             = "aRSA+HIGH !3DES +kEDH +kRSA !kSRP !kPSK"
 @IPV6@     ssl.pemfile                 = "@HTTPSCERT@"
+@IPV6@     ssl.ca-file                 = "@HTTPSCHAIN@"
 @IPV6@     server.document-root        = "/var/www"
 @IPV6@     accesslog.filename          = "@HTTPS_ACCESSLOG@"
 @IPV6@     url.access-deny             = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPSCGI@ )

Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init	2017-01-10 23:46:03 UTC (rev 8088)
+++ branches/1.0/package/lighttpd/lighttpd.init	2017-01-11 18:11:47 UTC (rev 8089)
@@ -55,6 +55,11 @@
     httpdir="/dev/null"
   fi
   httpscert="${HTTPSCERT:-/etc/ssl/default_https.pem}"
+  if [ -n "$HTTPSCHAIN" -a -f "$HTTPSCHAIN" ]; then
+    httpschain="$HTTPSCHAIN"
+  else
+    httpschain=""
+  fi
   if [ "$HTTP_LISTING" = "no" ]; then
     http_listing="disable"
   else
@@ -144,6 +149,7 @@
   sed -i -e "s|@HOSTNAME@|${HOSTNAME}|g" \
          -e "s|@HTTPDIR@|${httpdir}|g" \
          -e "s|@HTTPSCERT@|${httpscert}|g" \
+         -e "s|@HTTPSCHAIN@|${httpschain}|g" \
          -e "s|@HTTP_LISTING@|${http_listing}|g" \
          -e "s|@HTTPS_LISTING@|${https_listing}|g" \
          -e "s|@HTTP_ACCESSLOG@|${http_accesslog}|g" \

Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2017-01-10 23:46:03 UTC (rev 8088)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf	2017-01-11 18:11:47 UTC (rev 8089)
@@ -368,6 +368,7 @@
 HTTPS_ACCESSLOG="no"       # Enable access logging in /var/log/lighttpd/ssl-access.log
 HTTPSCGI="yes"             # Define yes|no to enable CGI
 HTTPSCERT="/etc/ssl/default_https.pem"    # Path to the https certificate
+HTTPSCHAIN=""              # Path to the CA file for support of chained certificates
 
 ## HTTP Server
 ## If you set HTTPDIR, serve files from that directory.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.