From 448321fed4427e8c69b9e0c6a40d2579ad28b87f Mon Sep 17 00:00:00 2001
From: Tao Liu <tao.liu@windriver.com>
Date: Fri, 1 Feb 2019 15:58:52 -0600
Subject: [PATCH] Configurable Host HTTP/HTTPS Port Binding

In order to avoid conflicts with containerized services
binding to standard HTTP (80) / HTTPS (443) port numbers,
the default port numbers are changed to 8080 and 8443.

Lighttpd port configuration is performed through puppet,
and the packaged lighttpd.conf uses port 80. As a result,
lighttpd is bind to port 80 before running config_controller.
This prevents patching before running config_controller.
This update changes the default http port to 8080 in the
packaged lighttpd.conf.

8080 is http port and 8008 is horizon port. The default
config file is changed here to be consistent with the port
number configured via puppet.

Story: 2004642
Task: 29300
Depends-On: https://review.openstack.org/#/c/634237/

Change-Id: I52b8f602dc2349ffabd9b90344dfafaf703ee4d7
Signed-off-by: Tao Liu <tao.liu@windriver.com>
---
 base/lighttpd-config/centos/build_srpm.data | 2 +-
 base/lighttpd-config/files/lighttpd.conf    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/base/lighttpd-config/centos/build_srpm.data b/base/lighttpd-config/centos/build_srpm.data
index da1e20bd8..2c3b2cb8b 100644
--- a/base/lighttpd-config/centos/build_srpm.data
+++ b/base/lighttpd-config/centos/build_srpm.data
@@ -1,2 +1,2 @@
 SRC_DIR="files"
-TIS_PATCH_VER=0
+TIS_PATCH_VER=1
diff --git a/base/lighttpd-config/files/lighttpd.conf b/base/lighttpd-config/files/lighttpd.conf
index 31b294800..af4d0394b 100755
--- a/base/lighttpd-config/files/lighttpd.conf
+++ b/base/lighttpd-config/files/lighttpd.conf
@@ -140,8 +140,8 @@ static-file.exclude-extensions = ( ".php", ".pl", ".fcgi" )
 
 ######### Options that are good to be but not neccesary to be changed #######
 
-## bind to port (default: 80)
-#server.port                = 81
+## bind to port 8080
+server.port                = 8080
 
 ## bind to localhost (default: all interfaces)
 #server.bind                = "grisu.home.kneschke.de"
@@ -220,7 +220,7 @@ $HTTP["url"] !~ "^/(rel-[^/]*|feed|updates|static)/" {
                                ( "localhost" =>
                                  (
                                    "host" => "127.0.0.1",
-                                   "port" => 8080
+                                   "port" => 8008
                                  )
                                )
                              )
@@ -244,7 +244,7 @@ $HTTP["url"] !~ "^/(rel-[^/]*|feed|updates|static)/" {
 #
 
 #### Listen to IPv6
-$SERVER["socket"] == "[::]:80" { }
+$SERVER["socket"] == "[::]:8080" { }
 
 #### status module
 #status.status-url          = "/server-status"