diff --git a/base/lighttpd-config/centos/build_srpm.data b/base/lighttpd-config/centos/build_srpm.data
new file mode 100644
index 000000000..da1e20bd8
--- /dev/null
+++ b/base/lighttpd-config/centos/build_srpm.data
@@ -0,0 +1,2 @@
+SRC_DIR="files"
+TIS_PATCH_VER=0
diff --git a/base/lighttpd-config/centos/lighttpd-config.spec b/base/lighttpd-config/centos/lighttpd-config.spec
new file mode 100644
index 000000000..ab701a6d9
--- /dev/null
+++ b/base/lighttpd-config/centos/lighttpd-config.spec
@@ -0,0 +1,64 @@
+Summary: StarlingX lighttpd Configuration File
+Name: lighttpd-config
+Version: 1.0
+Release: %{tis_patch_ver}%{?_tis_dist}
+License: Apache-2.0
+Group: config-files
+Packager: StarlingX
+URL: unknown
+Source: %name-%version.tar.gz
+
+BuildArch: noarch
+Requires: lighttpd
+
+%define debug_package %{nil}
+
+%description
+StarlingX lighttpd configuration file
+
+%prep
+
+%setup
+
+%build
+
+%install
+
+CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd
+ROOTDIR=%{buildroot}/www
+
+install -d -m 1777 ${ROOTDIR}/tmp
+install -d ${CONFDIR}/ssl
+install -d ${ROOTDIR}/pages/dav
+install -d %{buildroot}%{_datadir}/starlingx
+install -m640 lighttpd.conf %{buildroot}%{_datadir}/starlingx/lighttpd.conf
+install -m755 lighttpd.init %{buildroot}%{_datadir}/starlingx/lighttpd.init
+install -m644 lighttpd-inc.conf ${CONFDIR}/lighttpd-inc.conf
+install -m644 index.html.lighttpd ${ROOTDIR}/pages/index.html
+
+install -d %{buildroot}%{_sysconfdir}/logrotate.d
+install -m644 lighttpd.logrotate %{buildroot}%{_datadir}/starlingx/lighttpd.logrotate
+
+chmod 02770 %{buildroot}%{_sysconfdir}/lighttpd
+
+%post
+if [ $1 -eq 1 ] ; then
+ cp -f %{_datadir}/starlingx/lighttpd.conf %{_sysconfdir}/lighttpd/lighttpd.conf
+ chmod 640 %{_sysconfdir}/lighttpd/lighttpd.conf
+ cp -f %{_datadir}/starlingx/lighttpd.init %{_sysconfdir}/rc.d/init.d/lighttpd
+ chmod 755 %{_sysconfdir}/rc.d/init.d/lighttpd
+ cp -f %{_datadir}/starlingx/lighttpd.logrotate %{_sysconfdir}/logrotate.d/lighttpd
+ chmod 644 %{_sysconfdir}/logrotate.d/lighttpd
+fi
+
+
+%files
+%defattr(-,root,root)
+%license LICENSE
+%{_datadir}/starlingx/lighttpd.conf
+%{_datadir}/starlingx/lighttpd.logrotate
+%{_datadir}/starlingx/lighttpd.init
+%dir /www/pages/
+/www/pages/*
+%config(noreplace) %{_sysconfdir}/lighttpd/lighttpd-inc.conf
+/www/pages/index.html
diff --git a/base/lighttpd-config/files/LICENSE b/base/lighttpd-config/files/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/base/lighttpd-config/files/LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/base/lighttpd-config/files/index.html.lighttpd b/base/lighttpd-config/files/index.html.lighttpd
new file mode 100644
index 000000000..378f0982c
--- /dev/null
+++ b/base/lighttpd-config/files/index.html.lighttpd
@@ -0,0 +1 @@
+Welcome to StarlingX
diff --git a/base/lighttpd/files/lighttpd-inc.conf b/base/lighttpd-config/files/lighttpd-inc.conf
similarity index 100%
rename from base/lighttpd/files/lighttpd-inc.conf
rename to base/lighttpd-config/files/lighttpd-inc.conf
diff --git a/base/lighttpd/files/lighttpd.conf b/base/lighttpd-config/files/lighttpd.conf
similarity index 100%
rename from base/lighttpd/files/lighttpd.conf
rename to base/lighttpd-config/files/lighttpd.conf
diff --git a/base/lighttpd/files/lighttpd.init b/base/lighttpd-config/files/lighttpd.init
similarity index 100%
rename from base/lighttpd/files/lighttpd.init
rename to base/lighttpd-config/files/lighttpd.init
diff --git a/base/lighttpd/files/lighttpd.logrotate b/base/lighttpd-config/files/lighttpd.logrotate
similarity index 100%
rename from base/lighttpd/files/lighttpd.logrotate
rename to base/lighttpd-config/files/lighttpd.logrotate
diff --git a/base/lighttpd/centos/build_srpm.data b/base/lighttpd/centos/build_srpm.data
index 3a9f62926..c66bf348c 100755
--- a/base/lighttpd/centos/build_srpm.data
+++ b/base/lighttpd/centos/build_srpm.data
@@ -1,2 +1 @@
-COPY_LIST="files/*"
-TIS_PATCH_VER=6
+TIS_PATCH_VER=7
diff --git a/base/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch b/base/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
deleted file mode 100644
index 52caacd97..000000000
--- a/base/lighttpd/centos/meta_patches/0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 804b1d2ae37de293c2859d37d1c2cc9885e9d09e Mon Sep 17 00:00:00 2001
-From: Scott Little
-Date: Mon, 20 Mar 2017 10:21:28 -0400
-Subject: [PATCH 2/4] WRS:
- 0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
-
----
- SPECS/lighttpd.spec | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
-index 7acdc84..2f7b261 100644
---- a/SPECS/lighttpd.spec
-+++ b/SPECS/lighttpd.spec
-@@ -281,7 +281,7 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
- # WRS
- CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd
- ROOTDIR=%{buildroot}/www
--
-+install -d -m 1777 ${ROOTDIR}/tmp
- install -d ${CONFDIR}/ssl
- install -d ${ROOTDIR}/pages/dav
- install -m 0640 %{SOURCE103} ${CONFDIR}/lighttpd.conf
---
-2.7.4
-
diff --git a/base/lighttpd/centos/meta_patches/PATCH_ORDER b/base/lighttpd/centos/meta_patches/PATCH_ORDER
index ade386910..50776dfef 100644
--- a/base/lighttpd/centos/meta_patches/PATCH_ORDER
+++ b/base/lighttpd/centos/meta_patches/PATCH_ORDER
@@ -1,5 +1,4 @@
spec-include-TiS-changes.patch
-0001-Adding-tmp-dir-under-lighttpd-chroot-environ.patch
-0001-Update-package-versioning-for-TIS-format.patch
+Update-package-versioning-for-TIS-format.patch
spec-check-content-length.patch
meta_add_support_for_tpm.patch
diff --git a/base/lighttpd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/lighttpd/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
similarity index 100%
rename from base/lighttpd/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
rename to base/lighttpd/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
diff --git a/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch b/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
index fe0986d0a..70fa6ff04 100644
--- a/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
+++ b/base/lighttpd/centos/meta_patches/meta_add_support_for_tpm.patch
@@ -11,7 +11,7 @@ diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
index c27f78f..bc11989 100644
--- a/SPECS/lighttpd.spec
+++ b/SPECS/lighttpd.spec
-@@ -83,6 +83,7 @@ Patch3: lighttpd-1.4.39-socket.patch
+@@ -76,6 +76,7 @@ Patch3: lighttpd-1.4.39-socket.patch
# WRS Patches
Patch100: check-content-length.patch
@@ -19,7 +19,7 @@ index c27f78f..bc11989 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# For the target poweredby.png image (skip requirement + provide image on EL5)
-@@ -198,6 +199,7 @@ Authentication module for lighttpd that uses PAM.
+@@ -191,6 +192,7 @@ Authentication module for lighttpd that uses PAM.
# WRS Patches
%patch100 -p1 -b .content_length
diff --git a/base/lighttpd/centos/meta_patches/spec-check-content-length.patch b/base/lighttpd/centos/meta_patches/spec-check-content-length.patch
index 17a64ff92..8a22b6152 100644
--- a/base/lighttpd/centos/meta_patches/spec-check-content-length.patch
+++ b/base/lighttpd/centos/meta_patches/spec-check-content-length.patch
@@ -13,7 +13,7 @@ diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
index 2553b27..c27f78f 100644
--- a/SPECS/lighttpd.spec
+++ b/SPECS/lighttpd.spec
-@@ -80,6 +80,10 @@ Patch3: lighttpd-1.4.39-socket.patch
+@@ -73,6 +73,10 @@ Patch3: lighttpd-1.4.39-socket.patch
#Patch7: lighttpd-1.4.42-bignum.patch
#Patch8: lighttpd-1.4.43-mysql.patch
#Patch9: lighttpd-1.4.48-autoconf.patch
@@ -24,7 +24,7 @@ index 2553b27..c27f78f 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# For the target poweredby.png image (skip requirement + provide image on EL5)
%if %{with systemlogos}
-@@ -191,6 +195,10 @@ Authentication module for lighttpd that uses PAM.
+@@ -184,6 +188,10 @@ Authentication module for lighttpd that uses PAM.
#%patch7 -p0 -b .bignum
#%patch8 -p0 -b .mysql
#%patch9 -p0 -b .autoconf
diff --git a/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch b/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
index 527482c6d..81bb3e2bb 100644
--- a/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
+++ b/base/lighttpd/centos/meta_patches/spec-include-TiS-changes.patch
@@ -4,29 +4,22 @@ Date: Mon, 20 Mar 2017 10:21:28 -0400
Subject: [PATCH 1/4] WRS: spec-include-TiS-changes.patch
---
- SPECS/lighttpd.spec | 53 ++++++++++++++++++++++++++++++++++++++++-------------
- 1 file changed, 40 insertions(+), 13 deletions(-)
+ SPECS/lighttpd.spec | 29 ++++++++++++++---------------
+ 1 file changed, 14 insertions(+), 15 deletions(-)
diff --git a/SPECS/lighttpd.spec b/SPECS/lighttpd.spec
index de52e46..7acdc84 100644
--- a/SPECS/lighttpd.spec
+++ b/SPECS/lighttpd.spec
-@@ -62,6 +62,14 @@ Source13: http://www.lighttpd.net/light_logo.png
+@@ -62,6 +62,7 @@ Source13: http://www.lighttpd.net/light_logo.png
Source14: lighttpd-empty.png
#Source100: lighttpd-mod_geoip.c
#Source101: lighttpd-mod_geoip.txt
-+
-+# WRS
-+Source102: index.html.lighttpd
-+Source103: lighttpd.conf
-+Source104: lighttpd-inc.conf
-+Source105: lighttpd.logrotate
-+Source106: lighttpd-csr.conf
+
Patch0: lighttpd-1.4.39-defaultconf.patch
#Patch1: lighttpd-1.4.40-mod_geoip.patch
Patch2: lighttpd-1.4.35-system-crypto-policy.patch
-@@ -194,17 +202,19 @@ autoreconf -if
+@@ -194,17 +195,19 @@ autoreconf -if
--libdir='%{_libdir}/lighttpd' \
%{confswitch mysql} \
%{confswitch pam} \
@@ -53,7 +46,7 @@ index de52e46..7acdc84 100644
%{confswitch geoip} \
%{confswitch krb5}
make %{?_smp_mflags}
-@@ -223,13 +233,14 @@ install -D -p -m 0644 %{SOURCE2} \
+@@ -223,13 +226,14 @@ install -D -p -m 0644 %{SOURCE2} \
%{buildroot}%{_sysconfdir}/php.d/lighttpd.ini
# Install our own init script (included one is old style) or systemd service
@@ -71,28 +64,19 @@ index de52e46..7acdc84 100644
# Install our own default web page and images
mkdir -p %{buildroot}%{webroot}
-@@ -267,6 +278,20 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
+@@ -267,11 +271,9 @@ echo 'D /var/run/lighttpd 0750 lighttpd lighttpd -' > \
%{buildroot}%{_sysconfdir}/tmpfiles.d/lighttpd.conf
%endif
-+# WRS
-+CONFDIR=%{buildroot}%{_sysconfdir}/lighttpd
-+ROOTDIR=%{buildroot}/www
-+
-+install -d ${CONFDIR}/ssl
-+install -d ${ROOTDIR}/pages/dav
-+install -m 0640 %{SOURCE103} ${CONFDIR}/lighttpd.conf
-+install -m 0644 %{SOURCE104} ${CONFDIR}/lighttpd-inc.conf
-+install -m 0644 %{SOURCE102} ${ROOTDIR}/pages/index.html
-+
-+install -d %{buildroot}%{_sysconfdir}/logrotate.d
-+install -m 644 %{SOURCE105} %{buildroot}%{_sysconfdir}/logrotate.d/lighttpd
-+
-+chmod 02770 %{buildroot}%{_sysconfdir}/lighttpd
-
+-
%clean
rm -rf %{buildroot}
-@@ -315,11 +340,8 @@ fi
+
+-
+ %pre
+ /usr/sbin/useradd -s /sbin/nologin -M -r -d %{webroot} \
+ -c 'lighttpd web server' lighttpd &>/dev/null || :
+@@ -315,11 +317,8 @@ fi
%config %{_sysconfdir}/lighttpd/conf.d/mod.template
%config %{_sysconfdir}/lighttpd/vhosts.d/vhosts.template
%config(noreplace) %{_sysconfdir}/logrotate.d/lighttpd
@@ -104,18 +88,6 @@ index de52e46..7acdc84 100644
%if %{with tmpfiles}
%config(noreplace) %{_sysconfdir}/tmpfiles.d/lighttpd.conf
%endif
-@@ -345,6 +367,11 @@ fi
- # This is not really configuration, but prevent loss of local changes
- %config %{webroot}/index.html
-
-+# WRS
-+%dir /www/pages/
-+/www/pages/*
-+
-+
- %files fastcgi
- %defattr(-,root,root,-)
- %doc doc/outdated/fastcgi*.txt doc/scripts/spawn-php.sh
--
2.7.4
diff --git a/base/lighttpd/files/check-content-length.patch b/base/lighttpd/centos/patches/check-content-length.patch
similarity index 100%
rename from base/lighttpd/files/check-content-length.patch
rename to base/lighttpd/centos/patches/check-content-length.patch
diff --git a/base/lighttpd/files/lighttpd-tpm-support.patch b/base/lighttpd/centos/patches/lighttpd-tpm-support.patch
similarity index 100%
rename from base/lighttpd/files/lighttpd-tpm-support.patch
rename to base/lighttpd/centos/patches/lighttpd-tpm-support.patch
diff --git a/base/lighttpd/files/index.html.lighttpd b/base/lighttpd/files/index.html.lighttpd
deleted file mode 100644
index ef43ab273..000000000
--- a/base/lighttpd/files/index.html.lighttpd
+++ /dev/null
@@ -1 +0,0 @@
-Carrier Grade Communication Server
diff --git a/base/lighttpd/files/lighttpd-csr.conf b/base/lighttpd/files/lighttpd-csr.conf
deleted file mode 100644
index d754cfa11..000000000
--- a/base/lighttpd/files/lighttpd-csr.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-[ req ]
-default_bits = 1024
-distinguished_name = req_distinguished_name
-prompt = no
-
-[ req_distinguished_name ]
-C = CA
-ST = Ontario
-L = Ottawa
-O = Wind River Inc.
-OU = Carrier Grade Communications Server
-CN = *.wrs.com
-
diff --git a/centos_iso_image.inc b/centos_iso_image.inc
index 044b4381c..3d0d10cf8 100644
--- a/centos_iso_image.inc
+++ b/centos_iso_image.inc
@@ -202,6 +202,7 @@ python2-libvirt
# lighttpd
lighttpd
+lighttpd-config
lighttpd-fastcgi
lighttpd-mod_geoip
lighttpd-mod_mysql_vhost
diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 482378c13..e1d59f768 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -20,6 +20,7 @@ python/python-setuptools
virt/libvirt
virt/libvirt-python
base/lighttpd
+base/lighttpd-config
ceph/python-cephclient
networking/python-ryu
python/python-smartpm