starlingx
/
config
Code Issues Proposed changes

Fix ipv6 support in generation of lighttpd.conf file 

The generated lighttpd.conf file only included ipv6 support
when https is enabled.
This modification fixes the template to support ipv6 in all cases

Story: 2002986
Task: 23000

Change-Id: I3551e5cfeb4d31a8fefcbd3f6f1350bb17984053
Signed-off-by: Paul-Emile Element <Paul-Emile.Element@windriver.com>
This commit is contained in:
Paul-Emile Element 2018-08-20 11:15:06 -04:00
parent 46291f7e9a
commit 5354843163
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/centos/build_srpm.data
View File

@ -1,2 +1,2 @@
SRC_DIR="src"
TIS_PATCH_VER=60
TIS_PATCH_VER=61

5
puppet-manifests/src/modules/openstack/templates/lighttpd.conf.erb
View File

@ -245,6 +245,9 @@ $HTTP["url"] !~ "^/(rel-[^/]*|feed|updates|static)/" {
# ".cgi" => "/usr/bin/perl" )
#
#### Listen to IPv6
$SERVER["socket"] == "[::]:80" { }
<% if @enable_https %>
#### SSL engine
$SERVER["socket"] == ":443" {
@ -255,8 +258,6 @@ $SERVER["socket"] == ":443" {
ssl.cipher-list = "ALL:!aNULL:!eNULL:!EXPORT:!TLSv1:!DES:!MD5:!PSK:!RC4:!EDH-RSA-DES-CBC3-SHA:!EDH-DSS-DES-CBC3-SHA:!DHE-RSA-AES128-SHA:!DHE-RSA-AES256-SHA:!ECDHE-RSA-DES-CBC3-SHA:!ECDHE-RSA-AES128-SHA:!ECDHE-RSA-AES256-SHA:!DES-CBC3-SHA:!AES128-SHA:!AES256-SHA:!DHE-DSS-AES128-SHA:!DHE-DSS-AES256-SHA:!CAMELLIA128-SHA:!CAMELLIA256-SHA:!DHE-DSS-CAMELLIA128-SHA:!DHE-DSS-CAMELLIA256-SHA:!DHE-RSA-CAMELLIA128-SHA:!DHE-RSA-CAMELLIA256-SHA:!ECDHE-ECDSA-DES-CBC3-SHA:!ECDHE-ECDSA-AES128-SHA:!ECDHE-ECDSA-AES256-SHA"
}
#### Listen to IPv6
$SERVER["socket"] == "[::]:80" { }
$SERVER["socket"] == "[::]:443" {
ssl.engine = "enable"
ssl.pemfile = "/etc/ssl/private/server-cert.pem"