diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index fab86cbfec..1d2aa198bd 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=60 +TIS_PATCH_VER=61 diff --git a/puppet-manifests/src/modules/openstack/templates/lighttpd.conf.erb b/puppet-manifests/src/modules/openstack/templates/lighttpd.conf.erb index 62f2be6265..d5cad4a7d8 100755 --- a/puppet-manifests/src/modules/openstack/templates/lighttpd.conf.erb +++ b/puppet-manifests/src/modules/openstack/templates/lighttpd.conf.erb @@ -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"