From 8ccd50e523685ee39c53ddaf446ca49aeddafaf7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Pialasse Date: Fri, 13 Sep 2024 15:20:51 -0400 Subject: [PATCH] * Sun Sep 01 2024 Jean-Philippe Pialasse 1.6-1.sme - initial version for SME11 [SME: ] - build and require rpm for plugins and skins - TODO: allow custom server IMAP/SMTP - TODO: Install deps without symphony --- additional/COPYING | 340 ++++++++++++++++++ .../defaults/roundcube/PluginsList | 2 +- .../migrate/80ROUNDCUBE_IMAPS_ACCESS | 17 - .../migrate/80roundcube_Plugins_Migration | 81 ++--- .../etc/e-smith/events/actions/roundcube-conf | 3 + .../etc/e-smith/sql/init/80roundcube | 6 +- .../etc/httpd/conf/httpd.conf/80OptDomain | 25 -- .../etc/httpd/conf/httpd.conf/92roundcube | 3 - .../httpd/conf/httpd.conf/Roundcube/00Setup | 11 + .../Roundcube/80VirtualhostRoundcube | 40 +++ .../VirtualHosts/30RoundcubeWebmailAliases | 25 ++ .../VirtualHosts/60RoundCube-force-https | 23 -- .../etc/php-fpm.d/www.conf/15roundcube | 9 +- .../etc/roundcubemail/config.inc.php/30IMAP | 2 +- .../etc/roundcubemail/config.inc.php/60SYSTEM | 2 +- smeserver-roundcube.spec | 3 + 16 files changed, 465 insertions(+), 127 deletions(-) create mode 100644 additional/COPYING delete mode 100644 root/etc/e-smith/db/configuration/migrate/80ROUNDCUBE_IMAPS_ACCESS delete mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/80OptDomain create mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Roundcube/00Setup create mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Roundcube/80VirtualhostRoundcube create mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundcubeWebmailAliases delete mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60RoundCube-force-https diff --git a/additional/COPYING b/additional/COPYING new file mode 100644 index 0000000..196760e --- /dev/null +++ b/additional/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + 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 Library General Public License instead.) You can apply it to +your programs, too. + + 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. + + 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. + + 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. + + 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. + + 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. + + 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. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 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". + +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. + + 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. + +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. + + 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: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + 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. + + 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.) + +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. + +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. + +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. + + 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: + + 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, + + 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 + + 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 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 (C) 19yy + + 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. + + 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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) 19yy 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. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList b/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList index 91f0a6f..9c7a48f 100644 --- a/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList +++ b/root/etc/e-smith/db/configuration/defaults/roundcube/PluginsList @@ -1 +1 @@ -globaladdressbook,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve,nextcloud_attachments +globaladdressbook,contextmenu,markasjunk,vcard_attachments,newmail_notifier,emoticons,managesieve,nextcloud_attachments,html5_notifier,fail2ban,message_highlight,thunderbird_labels diff --git a/root/etc/e-smith/db/configuration/migrate/80ROUNDCUBE_IMAPS_ACCESS b/root/etc/e-smith/db/configuration/migrate/80ROUNDCUBE_IMAPS_ACCESS deleted file mode 100644 index 86dbbc9..0000000 --- a/root/etc/e-smith/db/configuration/migrate/80ROUNDCUBE_IMAPS_ACCESS +++ /dev/null @@ -1,17 +0,0 @@ -{ -# If you set the server dns resolver to external -# (for the main domain) you can not login in roundcube -# with the imap authentication - -use esmith::DomainsDB; -my $d = esmith::DomainsDB->open_ro; -my $domainname = $DB->get_value('DomainName') or - die ("Unable to retrieve the domain name: $!"); - -my $dns = $d->get_prop("$domainname",'Nameservers') or - die ("Unable to retrieve the Name Servers: $!"); - -if ($dns ne 'localhost') { -$DB->set_prop('imaps','access','public'); -} -} diff --git a/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration b/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration index d91e8df..cb6d126 100644 --- a/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration +++ b/root/etc/e-smith/db/configuration/migrate/80roundcube_Plugins_Migration @@ -4,54 +4,37 @@ ##Added for version smeserver-roundcube-1.1-4 my $plugins = $cdb->get_prop('roundcube','PluginsList') || ''; - return unless ($plugins ne ''); + # force add plugin we use + for my $plug (qw(nextcloud_attachments html5_notifier fail2ban message_highlight thunderbird_labels) ) + { + next unless ($plugins !~ "$plug"); + $plugins = $plugins. (($plugins eq "")? "":",") . $plug; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } -#nextcloud_attachements is used -if ($plugins !~ 'nextcloud_attachments') - { - $plugins = $plugins.',nextcloud_attachments'; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -#sieverule is now used instead of -if ($plugins !~ 'managesieve') - { - $plugins = $plugins.',managesieve'; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -# sieverule deprecated - if ($plugins =~ 'sieverule') - { - $plugins =~ s/,sieverule//g; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -# markasjunk2 deprecated - if ($plugins =~ 'markasjunk') - { - $plugins =~ s/markasjunk2/markasjunk/g; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -#Carddav is a really bad plugin, when available it will become usefull - if ($plugins =~ 'carddav') - { - $plugins =~ s/,carddav//g; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -#remove calendar - if ($plugins =~ 'calendar') - { - $plugins =~ s/,calendar//g; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -#remove libcalendaring - if ($plugins =~ 'libcalendaring') - { - $plugins =~ s/,libcalendaring//g; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } -#remove tasklist - if ($plugins =~ 'tasklist') - { - $plugins =~ s/,tasklist//g; - $cdb->set_prop('roundcube','PluginsList',"$plugins"); - } + # list of outdated, depreacted or dangerous plugins + #sieverule is now used instead of + if ($plugins !~ 'managesieve') + { + $plugins = $plugins.',managesieve'; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } + # sieverule deprecated + if ($plugins =~ 'sieverule') + { + $plugins =~ s/,sieverule//g; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } + # markasjunk2 deprecated + if ($plugins =~ 'markasjunk') + { + $plugins =~ s/markasjunk2/markasjunk/g; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } + #remove tasklist + if ($plugins =~ 'tasklist') + { + $plugins =~ s/,tasklist//g; + $cdb->set_prop('roundcube','PluginsList',"$plugins"); + } } diff --git a/root/etc/e-smith/events/actions/roundcube-conf b/root/etc/e-smith/events/actions/roundcube-conf index 7808428..5d3d56c 100644 --- a/root/etc/e-smith/events/actions/roundcube-conf +++ b/root/etc/e-smith/events/actions/roundcube-conf @@ -1,2 +1,5 @@ #!/bin/bash +# prevents setting error_reporting in 1.6; removed in newer versions +/usr/bin/sed -i -e 's/^.*error_reporting.*$/ \/\/rem/' /usr/share/roundcubemail/program/lib/Roundcube/bootstrap.php +# update composer /usr/bin/rcplugin_update.sh diff --git a/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube b/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube index 622fd06..45ca27f 100644 --- a/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube +++ b/root/etc/e-smith/templates/etc/e-smith/sql/init/80roundcube @@ -5,7 +5,7 @@ $OUT .= <key; + $virtualHostContent = $domain->prop('Content'); + $OUT = ""; +} + diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Roundcube/80VirtualhostRoundcube b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Roundcube/80VirtualhostRoundcube new file mode 100644 index 0000000..6f5135b --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Roundcube/80VirtualhostRoundcube @@ -0,0 +1,40 @@ +{ +my $status = $roundcube{'status'} || "disabled"; +if (($port eq "80") ){ + $OUT = <<"_EOL"; + # PORT FORWARD FROM 80 TO: 443 + ServerName $virtualHost +_EOL + + $OUT .= <<_EOL; + ServerAlias + SSLProxyEngine On + RewriteEngine on + RewriteCond %\{REQUEST_URI\} !^/.well-known/acme-challenge [NC] + RewriteCond %\{HTTPS\} off + RewriteRule ^/(.*) https://%\{HTTP_HOST\}/$1 [NC,R,L] +_EOL + +} +else { + + use esmith::DomainsDB; + my $domains = esmith::DomainsDB->open_ro; + my $ssl_file_crt = $domains->get_prop($virtualHost, "DomainSSLCertificateFile") || "disabled"; + my $ssl_file_key = $domains->get_prop($virtualHost, "DomainSSLCertificateKeyFile") || "disabled"; + my $ssl_file_chain = $domains->get_prop($virtualHost, "DomainSSLCertificateChainFile") || "disabled"; + my $DocRoot = "/usr/share/roundcubemail"; + + $OUT = <<"_EOL"; + ServerName $VirtualHost + DocumentRoot $DocRoot + SSLEngine On + SSLCompression off +_EOL + + $OUT .= " SSLCertificateFile $ssl_file_crt\n" unless $ssl_file_crt eq 'disabled'; + $OUT .= " SSLCertificateChainFile $ssl_file_chain\n" unless $ssl_file_chain eq 'disabled'; + $OUT .= " SSLCertificateKeyFile $ssl_file_key\n" unless ( $ssl_file_key eq 'disabled' || ! -e $ssl_file_chain ); + +} + diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundcubeWebmailAliases b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundcubeWebmailAliases new file mode 100644 index 0000000..87ea9c9 --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30RoundcubeWebmailAliases @@ -0,0 +1,25 @@ +{ + $haveSSL = (exists ${modSSL}{status} and ${modSSL}{status} eq "enabled") ? 'yes' : 'no'; + my $webmailStatus = $roundcube{'status'} || "disabled"; + + my $dirs; + $dirs{horde} = '/usr/share/roundcubemail'; + $dirs{webmail} = "$dirs{roundcubemail}"; + my @places=('webmail','horde','roundcubemail','roundcube'); + push(@places,$roundcube{'URL'}) if ((exists $roundcube{'URL'}) && ($roundcube{'URL'} ne '')); + + return " # webmail is disabled in this VirtualHost" + unless $webmailStatus eq 'enabled'; + + foreach $place (@places) + { + if (($port eq "$httpPort") && ($haveSSL eq 'yes') ) + { + my $portspec = ($httpsPort eq 443) ? "" : ":$httpsPort"; + $OUT .= " RewriteRule ^/$place(/.*|\$) https://%{HTTP_HOST}${portspec}/$place\$1 [L,R]\n"; + } else { + $OUT .= " Alias /$place $dirs{$place}\n"; + } + } +} + diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60RoundCube-force-https b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60RoundCube-force-https deleted file mode 100644 index 9a87dc8..0000000 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60RoundCube-force-https +++ /dev/null @@ -1,23 +0,0 @@ -{ - my $status = $roundcube{'status'} || "disabled"; - return " # roundcube is disabled in this VirtualHost" - unless $status eq 'enabled'; - -{ -if ($port ne "443") -{ -$OUT .= <<'HERE'; -## Redirect roundcubeWeb Address to Secure Address -RewriteEngine on -RewriteRule ^/roundcube https://%{HTTP_HOST}/roundcube -RewriteRule ^/roundcubemail https://%{HTTP_HOST}/roundcubemail - -## End Of Redirect -HERE - -if ((exists $roundcube{'URL'}) && ($roundcube{'URL'} ne '')) { - $OUT .= "RewriteRule ^/$roundcube{'URL'} https://%{HTTP_HOST}/$roundcube{'URL'}\n"; - } -} -} -} diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube index 941876a..f08b6dd 100644 --- a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube +++ b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15roundcube @@ -8,7 +8,10 @@ if ($PHP_VERSION eq $phpversion){ my $memory_limit = ($roundcube{MemoryLimit} || '512M'); $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/); my $open_basedir= $roundcube{PHPBaseDir} || ''; - $open_basedir = "/usr/share/roundcubemail:/etc/roundcubemail/:/var/log/roundcubemail:/var/lib/roundcubemail:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir"; + my $include_path = ".:/usr/share/pear-addons:/usr/share/pear:/usr/share/pear-data/:/usr/share/php". + ":/opt/remi/php81/root/usr/share/pear:/opt/remi/php81/root/usr/share/php". + ":/opt/remi/php81/root/usr/share/pear-data/:/opt/remi/php82/root/usr/share/pear-data/: /opt/remi/php83/root/usr/share/pear-data/"; + $open_basedir = "/usr/share/roundcubemail:/etc/roundcubemail/:/var/log/roundcubemail:/var/lib/roundcubemail:/var/log/roundcube.log:/var/lib/php/roundcube:/home/e-smith/files/roundcube:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir:$include_path"; my $id = 'roundcube'; my $max_children = $roundcube{'PHPmaxChildren'} || 20; my $min_spare_servers = $roundcube{'PHPminServers'} || 4; @@ -42,12 +45,14 @@ slowlog = /var/log/php/roundcube/slow.log php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f php@{ $DomainName } php_admin_flag[display_errors] = off php_admin_flag[log_errors] = on +php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT php_admin_value[error_log] = syslog php_admin_value[memory_limit] = $memory_limit php_admin_value[max_execution_time] = 3600 php_admin_value[post_max_size] = $max_upload_size php_admin_value[upload_max_filesize] = $max_upload_size -php_admin_value[disable_functions] = system, show_source, symlink, dl, passthru +php_admin_value[disable_functions] = system, show_source, symlink, dl, passthru +php_value[include_path] = $include_path php_admin_value[open_basedir] = $open_basedir php_admin_flag[allow_url_fopen] = on php_admin_flag[file_upload] = on diff --git a/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP b/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP index b1862d0..426c247 100644 --- a/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP +++ b/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/30IMAP @@ -14,7 +14,7 @@ // For example %n = mail.domain.tld, %t = domain.tld // WARNING: After hostname change update of mail_host column in users table is // required to match old user data records with the new host. - {$OUT .= " \$config['imap_host'] = 'ssl://$DomainName:$imaps{TCPPort}';\n";} + {$OUT .= " \$config['imap_host'] = 'ssl://localhost:$imaps{TCPPort}';\n";} // TCP port used for IMAP connections //{$OUT .= " \$config['default_port'] = $imaps{TCPPort};\n";} diff --git a/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/60SYSTEM b/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/60SYSTEM index a32448d..3141b78 100644 --- a/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/60SYSTEM +++ b/root/etc/e-smith/templates/etc/roundcubemail/config.inc.php/60SYSTEM @@ -147,7 +147,7 @@ $config['username_domain_forced'] = false; // %d - domain (http hostname without the first part) // %z - IMAP domain (IMAP hostname without the first part) // For example %n = mail.domain.tld, %t = domain.tld -$config['mail_domain'] = ''; +$config['mail_domain'] = '{$DomainName}'; // Password charset. // Use it if your authentication backend doesn't support UTF-8. diff --git a/smeserver-roundcube.spec b/smeserver-roundcube.spec index c8bbd9d..70bf787 100644 --- a/smeserver-roundcube.spec +++ b/smeserver-roundcube.spec @@ -35,6 +35,7 @@ Requires: roundcube-skin-classic Requires: roundcube-plugin-nextcloud_attachments Requires: roundcube-plugin-globaladdressbook Requires: roundcube-plugin-contextmenu +Requires: php-sabre-dav php-sabre-event php-sabre-http php-sabre-uri2 php-sabre-vobject4444 php-sabre-xml2 AutoReqProv: no %description @@ -82,6 +83,8 @@ fi * Sun Sep 01 2024 Jean-Philippe Pialasse 1.6-1.sme - initial version for SME11 [SME: ] - build and require rpm for plugins and skins +- TODO: allow custom server IMAP/SMTP +- TODO: Install deps without symphony * Mon Mar 25 2024 Jean-Philippe Pialasse 1.2-24.sme - fix temp event not ending because of interactive install of plugin [SME: 12530]