.gitignore

@@ -2,4 +2,3 @@
 *.log
 *spec-20*
 *.tar.xz
-*.bak

LICENSE

@@ -1,119 +1,73 @@
-GNU GENERAL PUBLIC LICENSE
+Apache License
-Version 2, June 1991
+Version 2.0, January 2004
+http://www.apache.org/licenses/
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
-Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+1. Definitions.
 
-Preamble
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
 
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
 
-When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+"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.
 
-To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
 
-For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
 
-We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+"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.
 
-Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+"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).
 
-Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+"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.
 
-The precise terms and conditions for copying, distribution and modification follow.
+"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."
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+"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.
 
-0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+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.
 
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+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.
 
-1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+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:
 
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
 
-2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
 
-     a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+     (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
 
-     b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+     (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.
 
-     c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+     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.
 
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+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.
 
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+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.
 
-In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+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.
 
-3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+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.
 
-     a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+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.
-
-     b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
-
-     c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
-
-4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
-
-6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
-
-7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 END OF TERMS AND CONDITIONS
 
-How to Apply These Terms to Your New Programs
+APPENDIX: How to apply the Apache License to your work.
 
-If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+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.
 
-To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+Copyright [yyyy] [name of copyright owner]
 
-     one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author
+Licensed under the Apache License, Version 2.0 (the "License");
-
+you may not use this file except in compliance with the License.
-     This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+You may obtain a copy of the License at
-
-     This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
-
-     Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
-
-     Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice
 
+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.

Makefile

@@ -1,6 +1,6 @@
-# Makefile for source rpm: smeserver-apache
+# Makefile for source rpm: e-smith-apache
 # $Id: Makefile,v 1.1 2016/02/04 18:31:19 vip-ire Exp $
-NAME := smeserver-apache
+NAME := e-smith-apache
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common

README.md

@@ -1,20 +1,12 @@
-# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> smeserver-apache
+# <img src="https://www.koozali.org/images/koozali/Logo/Png/Koozali_logo_2016.png" width="25%" vertical="auto" style="vertical-align:bottom"> e-smith-apache
 
-SMEServer Koozali developed git repo for smeserver-apache smeserver
+SMEServer Koozali developed git repo for e-smith-apache smeserver
 
 ## Wiki
 <br />https://wiki.koozali.org/
 
 ## Bugzilla
-Show list of outstanding bugs:
+Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-apache&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
-[All](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&bug_status=CONFIRMED&bug_status=NEEDINFO&bug_status=IN_PROGRESS&bug_status=RESOLVED&bug_status=VERIFIED&cf_package=smeserver-apache&classification=SME+Server&list_id=105756&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
-[Confirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=CONFIRMED&cf_package=smeserver-apache&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
-[Unconfirmed](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=UNCONFIRMED&cf_package=smeserver-apache&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
-[Need info](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=NEEDINFO&cf_package=smeserver-apache&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
-[In progress](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=IN_PROGRESS&cf_package=smeserver-apache&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
-[Resolved](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=RESOLVED&cf_package=smeserver-apache&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)  
-[Verified](https://bugs.koozali.org/buglist.cgi?action=wrap&bug_status=VERIFIED&cf_package=smeserver-apache&classification=SME+Server&order=changeddate+DESC%2Ccomponent%2Cpriority%2Cbug_severity&query_format=advanced)
-And a list of outstanding Legacy bugs: (e-smith-apache) [here](https://bugs.koozali.org/buglist.cgi?component=e-smith-apache&product=SME%20Server%2010.X&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED)
 
 ## Description
 

additional/e-smith-apache.spec

@@ -0,0 +1,321 @@
+Summary: e-smith server and gateway - apache module
+%define name e-smith-apache
+Name: %{name}
+%define version 1.1.2
+%define release 01
+Version: %{version}
+Release: %{release}
+License: GPL
+Vendor: Mitel Networks Corporation
+Group: Networking/Daemons
+Source: %{name}-%{version}.tar.gz
+Packager: e-smith developers <bugs@e-smith.com>
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
+BuildArchitectures: noarch
+Requires: e-smith-base >= 4.15.1
+Requires: e-smith-daemontools >= 1.7.1-01
+Conflicts: e-smith-ibays < 1.0.2
+AutoReqProv: no
+BuildRequires: e-smith-devtools >= 1.11.0-12
+
+%description
+e-smith server and gateway software - apache module.
+
+%changelog
+* Wed Nov 17 2004 Mark Knox <markk@e-smith.com>
+- [1.1.2-01]
+- Picking up new directory. MN00056429.
+
+* Wed Nov 17 2004 Mark Knox <markk@e-smith.com>
+- [1.1.1-03]
+- Added empty ValidFrom defaults fragment [markk MN00056429]
+
+* Tue Nov  9 2004 Charlie Brady <charlieb@e-smith.com>
+- [1.1.1-02]
+- Modify config and run script for compatibility with apache 2. Most of these
+  changes were contributed by Shad Lords. [charlieb MN00051144]
+
+* Mon Oct  4 2004 Charlie Brady <charlieb@e-smith.com>
+- [1.1.1-01]
+- New development stream for apache 2 - 1.1.1
+
+* Fri Sep  3 2004 Charlie Brady <charlieb@e-smith.com>
+- [1.1.0-23]
+- Clean BuildRequires. [charlieb MN00043055]
+
+* Tue Jul 13 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-22]
+- Updated modPerl templates to remove use of esmith::config.
+  [msoulier MN00039579]
+
+* Tue Jun 22 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-21]
+- Added RewriteCond statements to previous RewriteRules to exclude localhost,
+  so ssh port-forwarding is not broken. [msoulier MN00020885]
+
+* Fri Jun 18 2004 Tony Clayton <apc@e-smith.com>
+- [1.1.0-20]
+- Fix LoadModule fragment from last patch [tonyc 11348]
+
+* Mon Jun 14 2004 Tony Clayton <apc@e-smith.com>
+- [1.1.0-19]
+- Add modPerl service and httpd.conf templates [tonyc 11348]
+
+* Mon May 10 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-18]
+- Adding rewrite rules to prevent plaintext access to the server manager.
+  [msoulier MN00020885]
+
+* Thu May  6 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-17]
+- Added httpd-admin's remoteaccess list to permissible networks for
+  server-resources. [msoulier MN00024949]
+
+* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-16]
+- Backing-out last change. [msoulier dpar-21489]
+
+* Mon Feb 23 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-15]
+- Added restart-httpd-graceful to domain-* events. [msoulier dpar-21489]
+
+* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-14]
+- Updating requires to e-smith-daemontools. [msoulier 7629]
+
+* Wed Feb 18 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-13]
+- Updating restart-httpd-graceful to use new daemontools sigusr1 option.
+  [msoulier 7629]
+
+* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-12]
+- Staggering the symlinks a little farther. [msoulier 9955]
+
+* Wed Jan 21 2004 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-11]
+- Adding symlinks to the service-domain-create event for httpd restart.
+  [msoulier 9955]
+
+* Tue Dec  9 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-10]
+- Fixed another error in the specfile, resulting in incorrect file
+  permissions. [msoulier 7629]
+- Updated action scripts for supervise. [msoulier 7629]
+
+* Tue Dec  9 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-09]
+- Fixed an error in the specfile. [msoulier 7629]
+
+* Tue Dec  9 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-08]
+- Updated createlinks for daemontools. [msoulier 7629]
+
+* Tue Dec  9 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-07]
+- Putting httpd-e-smith under supervision. [msoulier 7629]
+
+* Thu Sep 18 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-06]
+- Added a null-string return value to the end of 00Setup, ensure no output
+  from that fragment. [msoulier 9803]
+
+* Wed Sep  3 2003 Charlie Brady <charlieb@e-smith.com>
+- [1.1.0-05]
+- Use implementation class, not virtual class in  VirtualHosts/00Setup fragment.
+  [charlieb 9803]
+
+* Wed Sep  3 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-04]
+- Added a 75AddType05.exe fragment to specify a proper mime-type for .exe
+  files. [msoulier 9866]
+
+* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com>
+- [1.1.0-03]
+- Allow TemplatePath property in domain record to specify an alternate template
+  subdir for virtual host content specification (e.g. to proxypass a domain).
+  [charlieb 8409]
+
+* Fri Aug 29 2003 Charlie Brady <charlieb@e-smith.com>
+- [1.1.0-02]
+- Changed the VirtualHosts subtemplate to pass the domain object instead of db handle,
+  and modified VirtualHosts/00Setup fragment to convert it to the right class.
+  Fix scoping problem with the blessed object. [charlieb 9803]
+
+* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.1.0-01]
+- rolling to dev stream - 1.1.0
+
+* Fri Aug 29 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.0.0-04]
+- Added a 00Setup fragment to VirtualHosts to process the %domainsdb hash back
+  into an esmith::DomainsDB object. [msoulier 9803]
+
+* Mon Aug 25 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.0.0-03]
+- Added a reference to the domains db in the extra data for processing the
+  VirtualHosts fragments. [msoulier 9803]
+
+* Fri Aug  1 2003 Michael Soulier <msoulier@e-smith.com>
+- [1.0.0-02]
+- Fixed a precedence error that broke virtual hosts in apache.
+  [msoulier 9640]
+
+* Wed Jul  9 2003 Charlie Brady <charlieb@e-smith.com>
+- [1.0.0-01]
+- Setting to release version number  - 1.0.0
+
+* Wed Jul  9 2003 Michael Soulier <msoulier@e-smith.com>
+- [0.2.0-04]
+- Fixed breakage in admin web server when a local network with a 32-bit subnet
+  mask is used. [msoulier 9259]
+
+* Thu Jul  3 2003 Charlie Brady <charlieb@e-smith.com>
+- [0.2.0-03]
+- Fix log noise problem in expansion of httpd.conf template. [charlieb 9269]
+
+* Wed Jul  2 2003 Charlie Brady <charlieb@e-smith.com>
+- [0.2.0-02]
+- List primary domain as first (default) virtual domain in apache config.
+  Include $SystemName.domain.name in ServerAlias directive. [charlieb 9241]
+
+* Thu Jun 26 2003 Charlie Brady <charlieb@e-smith.com>
+- [0.2.0-01]
+- Changing version to stable stream number - 0.2.0
+
+* Thu Jun 12 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.2-01]
+- Add order to migrate fragments [gordonr 9015]
+
+* Wed Jun 11 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.1-02]
+- Fixed Conflicts header - should be <, not <= [gordonr 8903]
+
+* Fri Jun  6 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.1-01]
+- Shuffled some httpd.conf fragments to e-smith-ibays [gordonr 8903]
+
+* Wed May 28 2003 Michael Soulier <msoulier@e-smith.com>
+- [0.1.0-19]
+- Moving httpd-e-smith init script to e-smith-apache. [msoulier 8852]
+
+* Tue Apr 29 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-18]
+- Do an explicit die if the httpd-e-smith record is missing from the
+  config db, rather than an implicit die due to an invalid object
+  reference [gordonr 8609]
+
+* Wed Apr  9 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-17]
+- Relocated conf-httpd from e-smith-base [gordonr 8150]
+
+* Fri Apr  4 2003 Mark Knox <markk@e-smith.com>
+- [0.1.0-16]
+- Moved restart-httpd-* actions from base [markk 5509]
+
+* Fri Apr  4 2003 Mark Knox <markk@e-smith.com>
+- [0.1.0-15]
+- Moved db config fragments here from e-smith-base [markk 5509]
+
+* Tue Apr  1 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-14]
+- Make /server-resources/ browsable from LAN [gordonr 6620]
+
+* Tue Apr  1 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-13]
+- Delete Apache ReadmeName directive [gordonr 6313]
+
+* Tue Apr  1 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-12]
+- Fixed broken conf-httpd-e-smith links in post-{install,upgrade} [gordonr 7960]
+
+* Tue Mar 18 2003 Lijie Deng <lijied@e-smith.com>
+- [0.1.0-11]
+- Deleted ./etc/httpd/conf/httpd.conf/template-begin 
+  deleted ./etc/httpd/conf/srm.conf/template-begin
+  deleted ./etc/httpd/conf/access.conf/template-begin [lijied 3295]
+
+* Mon Mar 17 2003 Lijie Deng <lijied@e-smith.com>
+- [0.1.0-10]
+- Delete empty template-end file  [lijied 3295]
+  
+* Wed Mar 12 2003 Charlie Brady <charlieb@e-smith.com>
+- [0.1.0-09]
+- Remove more references to primary and wwwpublic in favour
+  of the "Primary" i-bay. There is still some special case code,
+  which might go later if it turns out not to be needed.
+  [charlieb 5652]
+
+* Tue Mar 11 2003 Mark Knox <markk@e-smith.com>
+- [0.1.0-08]
+- Fixed a missing quote in 27ManagerProxyPass [markk 7635]
+
+* Tue Mar 11 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-07]
+- Pass externalSSLAccess and localAccess to VirtualDomains fragments so they don't
+  need to recalculate these values [gordonr 7635]
+- Use early return from 27ManagerProxyPass and new DB interface [gordonr 7635]
+
+* Mon Mar 10 2003 Charlie Brady <charlieb@e-smith.com>
+- [0.1.0-06]
+- Remove special case handling for /home/e-smith/files/primary in Apache
+  configuration. Migrate code and db entries for wwwpublic to Public.
+  [charlieb 5652]
+
+* Fri Mar  7 2003 Charlie Brady <charlieb@e-smith.com>
+- [0.1.0-05]
+- Replace deprecated CONFREF with MORE_DATA in processTemplate call in
+  VirtualHosts fragment of httpd.conf templates. Fixes template
+  expansion breakage (I'm not sure what broke it, but this fixes it.)
+  [charlieb]
+- Add default config db fragments to set type and status. Remove redundant
+  conf-httpd-e-smith script. [charlieb 1507]
+
+* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-04]
+- Move SSL initialisation to global context [gordonr 1432]
+
+* Fri Jan 24 2003 Gordon Rowell <gordonr@e-smith.com>
+- [0.1.0-03]
+- Use default SSL certificate of $SystemName.$DomainName [gordonr 4874]
+
+* Wed Jan  8 2003 Mark Knox <markk@e-smith.com>
+- [0.1.0-02]
+- Added conf-httpd-e-smith action linked to the same events as conf-startup
+  in e-smith-base [markk 6428]
+
+* Mon Jan 06 2003 Mark Knox <m_knox@mitel.com>
+- [0.1.0-01]
+- Initial release, split out from e-smith-base [markk 6428]
+
+%prep
+%setup
+
+%pre
+
+%post
+
+%build
+perl createlinks
+mkdir -p root/service
+ln -s /var/service/httpd-e-smith root/service/httpd-e-smith
+mkdir -p root/var/service/httpd-e-smith/supervise
+touch root/var/service/httpd-e-smith/down
+
+%install
+rm -rf $RPM_BUILD_ROOT
+(cd root   ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
+
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
+    --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
+    --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
+    > e-smith-%{version}-filelist
+
+echo "%doc COPYING"          >> e-smith-%{version}-filelist
+
+%clean 
+rm -rf $RPM_BUILD_ROOT
+
+%files -f e-smith-%{version}-filelist
+%defattr(-,root,root)

contriborbase

@@ -0,0 +1 @@
+sme10

createlinks

@@ -2,11 +2,10 @@
 
 use esmith::Build::CreateLinks qw(:all);
 #--------------------------------------------------
-# actions for smeserver-apache-update
+# actions for e-smith-apache-update
 #--------------------------------------------------
-my $event = "smeserver-apache-update";
+my $event = "e-smith-apache-update";
 templates2events("/etc/httpd/conf/httpd.conf", $event);
-templates2events("/var/www/html/.well-known/security.txt", $event);
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 event_link("systemd-reload", $event, "89");
 event_link("systemd-default", $event, "88");
@@ -17,7 +16,6 @@ templates2events("/etc/logrotate.d/httpd", $event);
 #--------------------------------------------------
 my $event = "console-save";
 
-templates2events("/var/www/html/.well-known/security.txt", $event);
 templates2events("/etc/httpd/conf/httpd.conf", $event);
 safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 
@@ -145,7 +143,6 @@ safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-s
 
 $event = "remoteaccess-update";
 
-templates2events("/var/www/html/.well-known/security.txt", $event);
 templates2events("/etc/httpd/conf/httpd.conf", $event);
 safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 
@@ -155,7 +152,6 @@ safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-s
 
 $event = "email-update";
 
-templates2events("/var/www/html/.well-known/security.txt", $event);
 templates2events("/etc/httpd/conf/httpd.conf", $event);
 safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 
@@ -165,7 +161,6 @@ safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-s
 
 $event = "logrotate";
 
-templates2events("/var/www/html/.well-known/security.txt", $event);
 safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 
 #--------------------------------------------------
@@ -173,7 +168,6 @@ safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-s
 #--------------------------------------------------
 
 $event = "ssl-update";
-templates2events("/var/www/html/.well-known/security.txt", $event);
 templates2events("/etc/httpd/conf/httpd.conf", $event);
 safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
 
@@ -182,7 +176,6 @@ safe_symlink("reload", "root/etc/e-smith/events/$event/services2adjust/httpd-e-s
 #--------------------------------------------------
 
 $event = "post-install";
-templates2events("/var/www/html/.well-known/security.txt", $event);
 templates2events("/etc/logrotate.d/httpd", $event);
 
 #--------------------------------------------------
@@ -190,6 +183,5 @@ templates2events("/etc/logrotate.d/httpd", $event);
 #--------------------------------------------------
 
 $event = "post-upgrade";
-templates2events("/var/www/html/.well-known/security.txt", $event);
 templates2events("/etc/logrotate.d/httpd", $event);
 

e-smith-apache.spec

@@ -1,10 +1,10 @@
 # $Id: e-smith-apache.spec,v 1.27 2022/10/07 09:04:44 terryfage Exp $
 
-Summary: smeserver server and gateway - apache module
+Summary: e-smith server and gateway - apache module
-%define name smeserver-apache
+%define name e-smith-apache
 Name: %{name}
-%define version 11.0.0
+%define version 2.6.0
-%define release 14
+%define release 24
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,28 +13,26 @@ Source: %{name}-%{version}.tar.xz
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
-Requires: smeserver-base >= 4.15.1
+Requires: e-smith-base >= 4.15.1
-Requires: smeserver-lib >= 1.15.1-19
+Requires: e-smith-lib >= 1.15.1-19
-Requires: smeserver-daemontools >= 1.7.1-01
+Requires: e-smith-daemontools >= 1.7.1-01
 Requires: mod_ssl
 Requires: mod_authnz_external
-Requires: perl-DateTime
 Obsoletes: distcache <= 1.4.5
 Obsoletes: mod_auth_external
 Obsoletes: e-smith-proxypass
 Obsoletes: e-smith-apache-proxy
 # for the new httpd 2.4 syntax
-Conflicts: smeserver-ibays < 2.6.0-19
+Conflicts: e-smith-ibays < 2.6.0-19
 Conflicts: smeserver-horde < 1.0.0-32 
 Conflicts: smeserver-php < 3.0.0-43
-Conflicts: smeserver-proxy < 5.6.0-11
+Conflicts: e-smith-proxy < 5.6.0-11
 Conflicts: e-smith-manager < 2.8.0-36
 AutoReqProv: no
-BuildRequires: smeserver-devtools >= 1.11.0-12
+BuildRequires: e-smith-devtools >= 1.11.0-12
-Provides: e-smith-apache = %{version}-%{release}
 
 %description
-smeserver server and gateway software - apache module.
+e-smith server and gateway software - apache module.
 
 %prep
 %setup
@@ -52,9 +50,6 @@ rm -rf $RPM_BUILD_ROOT
     --dir /var/service/httpd-e-smith 'attr(01755,root,root)' \
     --file /var/service/httpd-e-smith/down 'attr(0644,root,root)' \
     --file /var/service/httpd-e-smith/run 'attr(0755,root,root)' \
-    --ignoredir /var/www/html/ --ignoredir /var/www/ \
-    --dir /var/www/html/.well-known 'attr(0701,root,root)' \
-    --dir /var/www/html/.well-known/acme-challenge 'attr(0755,root,root)' \
     > e-smith-%{version}-filelist
 
 echo "%doc COPYING"          >> e-smith-%{version}-filelist
@@ -74,55 +69,6 @@ if [ $1 -gt 1 ] ; then
 fi
 
 %changelog
-* Thu Feb 20 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-14.sme
-- load mod dav and dav_fs by default [SME: 2269]
-- regroup multiple mod fragments in less fragments
-
-* Sat Jan 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-13.sme
-- use esmith::ssl to set ciphers and protocol [SME: 12821]
-  improve cipher order to get strongers first
-  drop SSLv2
-
-* Thu Jan 02 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-12.sme
-- fix OCSP Stapling support [SME: 12819]
-- fix .well-known/security.txt [SME: 12818]
-- add X-Permitted-Cross-Domain-Policies header [SME: 12857]
-- add  Cross-Origin headers [SME: 12856] 
-- add Permissions-Policy header [SME: 12855]
-
-* Fri Dec 27 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-11.sme
-- add X-Content-Type-Options nosniff [SME: 12835]
-- add Strict Transport Security support HSTS [SME: 12815]
-- add X-Frame-Options SAMEORIGIN Header to prevent clickjacking [SME: 12816]
-- add referrer-Policy same-origin [SME: 12817]
-- add OCSP Stapling support [SME: 12819]
-- add CSP Content-Security-Policy support [SME: 9567] 
-- add .well-known and .well-known/security.txt [SME: 12818]
-
-* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-7.sme
-- Update createlinks to create smeserver-package-update event[SME: 12579]
-
-* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-6.sme
-- Set license file to GPL2.0  [SME: 12577]
-
-* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
-- fix systemd service file [SME: 12556]
-
-* Tue Mar 26 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
-- remove conflicting /etc/httpd/state 
-
-* Mon Mar 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
-- conflict with smeserver-proxy
-
-* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
-- Change Requires: e-smith- to Requires: smeserver-
-
-* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-1.sme
-- Update Release and Version to base version and 1st release for SME11 [SME: 12518]
-
-* Mon Mar 11 2024 rename-e-smith-pkg.sh by Trevor Batley <trevor@batley.id.au> 2.6.0-25.sme
-- Rename to smeserver-apache [SME: 12359]
-
 * Wed Jul 12 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.6.0-24.sme
 - Roll up patches and move to git repo [SME: 12338]
 

root/etc/e-smith/db/configuration/defaults/httpd-e-smith/SSLv2

@@ -0,0 +1 @@
+disabled

root/etc/e-smith/db/configuration/migrate/apache

@@ -1,5 +0,0 @@
-{
- # delete old httpd-e-smith apache properties
- $DB->get('httpd-e-smith')->delete_prop($_) for ( qw(SSLv2 ) ); 
-
-}

root/etc/e-smith/templates.metadata/var/www/html/.well-known/security.txt

@@ -1,3 +0,0 @@
-UID="root"
-GID="apache"
-PERMS=0640

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule15

@@ -0,0 +1,3 @@
+# notify for systemd
+LoadModule systemd_module modules/mod_systemd.so
+

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule50

@@ -4,12 +4,10 @@
 		proxy_http
 		alias
 		rewrite
-		access_compat
                 authn_core
                 authz_core
 		authz_host
 		authz_user
-		authnz_external
                 authn_file
                 authn_anon
                 auth_digest
@@ -17,12 +15,9 @@
                 authz_groupfile
 		authnz_ldap
 		ldap
-		dav
-		dav_fs
 		proxy_wstunnel
                 mpm_prefork
                 socache_dbm
-		systemd
                 unixd
 	    ));
 }

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule60

@@ -0,0 +1,7 @@
+{
+
+    $OUT .= load_modules(qw(
+               access_compat
+    ));
+}
+

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule80

@@ -0,0 +1,4 @@
+
+# Extra Modules
+LoadModule authnz_external_module modules/mod_authnz_external.so
+

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL10SSLCipherSuite

@@ -1,6 +1,5 @@
 {
-    use esmith::ssl;
     # When updating CipherSuite both e-smith-apache and smeserver-qpsmtpd templates should be updated.
     $OUT  = "SSLCipherSuite ";
-    $OUT .= $modSSL{CipherSuite} || $smeCiphers;
+    $OUT .= $modSSL{CipherSuite} || 'ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:HIGH@STRENGTH:!SSLv2:!ADH:!aNULL:!MD5:!RC4';
 }

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL30SSLProtocol

@@ -1,5 +1,9 @@
 {
-    use esmith::ssl;
     # Specify which SSL Protocols to accept for this context
-    $OUT .= "SSLProtocol ". SSLprotoApache() ;
+    $OUT .= "SSLProtocol all";
+    $OUT .= " -SSLv2" unless (${'httpd-e-smith'}{'SSLv2'} || 'disabled') eq 'enabled';
+    $OUT .= " -SSLv3" unless (${'httpd-e-smith'}{'SSLv3'} || 'disabled') eq 'enabled';
+    $OUT .= " -TLSv1" unless (${'httpd-e-smith'}{'TLSv1'} || 'disabled') eq 'enabled';
+    $OUT .= " -TLSv1.1" unless (${'httpd-e-smith'}{'TLSv1.1'} || 'disabled') eq 'enabled';
+    $OUT .= " -TLSv1.2" unless (${'httpd-e-smith'}{'TLSv1.2'} || 'enabled') eq 'enabled';
 }

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/35SSL36SSLStapling

@@ -1,2 +0,0 @@
-SSLUseStapling On
-SSLStaplingCache dbm:/run/httpd/ssl_stapling

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/38Cross-Domain

@@ -1 +0,0 @@
-header setifempty X-Permitted-Cross-Domain-Policies "none"

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/38Cross-Origin

@@ -1,5 +0,0 @@
-Header setifempty Cross-Origin-Embedder-Policy	"unsafe-none; report-to='default'"
-Header setifempty Cross-Origin-Embedder-Policy-Report-Only	"unsafe-none; report-to='default'"
-Header setifempty Cross-Origin-Opener-Policy	"unsafe-none"
-Header setifempty Cross-Origin-Opener-Policy-Report-Only	"unsafe-none; report-to='default'"
-Header setifempty Cross-Origin-Resource-Policy	"same-site"

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/38Permissions-Policy

@@ -1 +0,0 @@
-Header setifempty Permissions-Policy	"accelerometer=(), autoplay=(), camera=(), cross-origin-isolated=(), display-capture=(self), encrypted-media=(), fullscreen=*, geolocation=(self), gyroscope=(), keyboard-map=(), magnetometer=(), microphone=(), midi=(), payment=*, picture-in-picture=*, publickey-credentials-get=(), screen-wake-lock=(), sync-xhr=*, usb=(), xr-spatial-tracking=(), gamepad=(), serial=()"

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/38nosniff

@@ -1 +0,0 @@
-Header setifempty X-Content-Type-Options nosniff

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/38referer

@@ -1 +0,0 @@
-Header setifempty Referrer-Policy "same-origin"

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/38xframe

@@ -1,3 +0,0 @@
-# prevent clickjacking attacks
-Header unset X-Frame-Options
-Header set X-Frame-Options SAMEORIGIN

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/79well-known

@@ -1,18 +0,0 @@
-# Alias for letsencrypt, security.txt and mailconfig ...
-Alias /.well-known/ /var/www/html/.well-known/
-# do not proxy request to acme-challenge and security.txt
-ProxyPass /.well-known/security.txt !
-ProxyPass /.well-known/acme-challenge !
-
-<Directory "/var/www/html/.well-known">
-  Options None
-  AllowOverride None
-  Require all granted
-  AddDefaultCharset off
-  Satisfy any
-</Directory>
-<Directory /var/www/html/.well-known/acme-challenge/>
-  Header set Content-Type "application/jose+json"
-  Require all granted
-  Satisfy any
-</Directory>

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28security.txt

@@ -1,12 +0,0 @@
-{
-    # vim: ft=perl:
-
-    $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ?  'yes' : 'no';
-    $plainTextAccess = ${'httpd-admin'}{PermitPlainTextAccess} || 'no';
-
-    $OUT = '';
-        if (($port eq $httpPort) && ($haveSSL eq 'yes') && ($plainTextAccess ne 'yes'))
-        {
-            $OUT .= "    RewriteRule ^/.well-known/security.txt\$    https://%{HTTP_HOST}/.well-known/security.txt [L,R]\n";
-        }
-}

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/29HSTS

@@ -1,26 +0,0 @@
-{
-    use esmith::DomainsDB;
-    my $domains = esmith::DomainsDB->open_ro;
-
-    # return if not SSL
-    return "    # skipping SSL certificate\n" unless $port eq "$httpsPort";
-
-    # return unless we have a real certificate (however, here  we assume that one will not set manually a self signed one...)
-    # by the way accessing with an ip will fail.
-    my $ssl_file_crt = $domains->get_prop($virtualHost, "DomainSSLCertificateFile") || $modSSL{'crt'}  || "disabled";
-    return "    # HSTS  incompatible with self signed certificate\n" unless ($ssl_file_crt ne "disabled" && -e $ssl_file_crt);
-
-    # return unless enabled for domain
-    return "    # HSTS disabled\n" unless ( ($domains->get_prop($virtualHost, "HSTS") || "enabled") eq 'enabled');
-
-    # if setting preload you need max-age>= 1years in second and includeSubDomains enabled.
-    my $preload = (($domains->get_prop($virtualHost, "HSTSpreload") || "disabled") eq 'enabled')? "; preload" : "";
-
-    my $includeSubDomains = (${'httpd-e-smith'}{HSTSsubdomain} eq 'enabled')? "; includeSubDomains" : "";
-    $includeSubDomains = "; includeSubDomains" if ($preload eq "; preload");
-
-    # default to 1 years in second to access to preload; suggested 2 years.
-    my $age = ($domains->get_prop($virtualHost, "HSTSage") )? $domains->get_prop($virtualHost, "HSTSage") : "31536000";
-
-    $OUT = '    Header always set Strict-Transport-Security "max-age='.$age.' '.$includeSubDomains.' '.$preload.'"' ;
-}

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30csp

@@ -1,11 +0,0 @@
-{
-    use esmith::AccountsDB;
-    my $accounts = esmith::AccountsDB->open_ro;
-    my $CSP = $accounts->get_prop($virtualHostContent, "CSP") || "default-src 'self' https://www.$virtualHost https://$virtualHost;  style-src 'self' https://*.$virtualHost; script-src 'self' https://*.$virtualHost; worker-src 'self' https://*.$virtualHost; frame-ancestors 'self' https://*.$virtualHost; base-uri 'self' https://*.$virtualHost; form-action 'self' https://*.$virtualHost ";
-    return  "    # CSP disabled for this host\n" if ($CSP eq "disabled");
-    if ($CSP ne '')
-    {
-    $OUT .= "    # Content-Security-Policy; only if not set by content\n";
-    $OUT .= "    Header setifempty Content-Security-Policy \"$CSP\"\n";
-    }
-}

root/etc/e-smith/templates/var/www/html/.well-known/security.txt/10contact

@@ -1,9 +0,0 @@
-# Our security address
-Contact: { 
-# some examples
-# Contact: mailto:security@example.com
-# Contact: mailto:security%2Buri%2Bencoded@example.com
-# Contact: tel:+1-201-555-0123
-# Contact: https://example.com/security-contact.html
-${'httpd-e-smith'}{'SecurityContact'}||"mailto:admin\@$DomainName"}
-

root/etc/e-smith/templates/var/www/html/.well-known/security.txt/20encryption

@@ -1,8 +0,0 @@
-# Our openPGP key
-Encryption: { 
-# some example
-# Encryption: https://example.com/pgp-key.txt
-# Encryption: dns:5d2d37ab76d47d36._openpgpkey.example.com?type=OPENPGPKEY
-# Encryption: openpgp4fpr:5f2de5521c63a801ab59ccb603d49de44b29100f
-${'httpd-e-smith'}{'SecurityEncryption'}||'openpgp4fpr:'}
-

root/etc/e-smith/templates/var/www/html/.well-known/security.txt/30expires

@@ -1,15 +0,0 @@
-# Expiration date of this policy
-Expires: {
- use strict;
- use warnings;
- use esmith::ConfigDB;
- use DateTime;
- my $db = esmith::ConfigDB->open or die "Could not open config db";
- # Obtain the TimeZone configuration database value
- my $timezone = $db->get("TimeZone")->value||"US/eastern";
- my $dt   = DateTime->now(time_zone    => $timezone);
- $dt->set_year($dt->year()+1);
- $dt->set_time_zone('UTC');
- $OUT =  $dt."z" ;
-}
-

root/etc/e-smith/templates/var/www/html/.well-known/security.txt/40language

@@ -1,8 +0,0 @@
-# Prefered Languages
-Preferred-Languages: { substr( ($sysconfig{Language}||"en"),0,2) }
-{
-# see https://securitytxt.org/ for more fields
-# Acknowledgments : https://
-# Policy : https://
-# Hiring : https://
-}

root/etc/httpd/state

@@ -0,0 +1 @@
+../../var/state/httpd

root/usr/lib/systemd/system/httpd-e-smith.service

@@ -6,9 +6,9 @@ Documentation=man:apachectl(8)
 
 [Service]
 Type=notify
+EnvironmentFile=/etc/sysconfig/httpd
 ExecStartPre=/sbin/e-smith/service-status httpd-e-smith
 ExecStartPre=/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-ExecStartPre=-/sbin/e-smith/expand-template /var/www/html/.well-known/security.txt
 ExecStartPre=/sbin/e-smith/systemd/httpd-e-smith-prepare
 ExecStart=/usr/sbin/httpd -f /etc/httpd/conf/httpd.conf -DFOREGROUND
 ExecReload=/usr/sbin/httpd -f /etc/httpd/conf/httpd.conf -k graceful