diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cbb3a13 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +*.rpm +*.log +*spec-20* +*.tar.gz diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2070d83 --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: smeserver-collabora +# $Id: Makefile,v 1.1 2022/03/09 20:43:31 jpp Exp $ +NAME := smeserver-collabora +SPECFILE = $(firstword $(wildcard *.spec)) + +define find-makefile-common +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +endef + +MAKEFILE_COMMON := $(shell $(find-makefile-common)) + +ifeq ($(MAKEFILE_COMMON),) +# attept a checkout +define checkout-makefile-common +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +endef + +MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) +endif + +include $(MAKEFILE_COMMON) diff --git a/README.md b/README.md index b18cbac..3c212dd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,15 @@ -# smeserver-collabora +# smeserver-collabora -SMEServer Koozali developed git repo for smeserver-collabora smecontribs \ No newline at end of file +SMEServer Koozali developed git repo for smeserver-collabora smecontribs + +## Wiki +
https://wiki.koozali.org/Collabora + +## Bugzilla +Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-collabora&product=SME%20Contribs&query_format=advanced&limit=0&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=CONFIRMED) + +## Description + +
*This description has been generated by an LLM AI system and cannot be relied on to be fully correct.* +*Once it has been checked, then this comment will be deleted* +
diff --git a/additional/.travis.yml b/additional/.travis.yml new file mode 100644 index 0000000..e5ce774 --- /dev/null +++ b/additional/.travis.yml @@ -0,0 +1,35 @@ +--- +language: ruby +services: + - docker +branches: + only: + - master +env: + global: + - DEST_ID=forge + - NSVER=7 + - DOCKER_IMAGE=nethserver/makerpms:${NSVER} + - > + EVARS=" + -e DEST_ID + -e TRAVIS_BRANCH + -e TRAVIS_BUILD_ID + -e TRAVIS_PULL_REQUEST_BRANCH + -e TRAVIS_PULL_REQUEST + -e TRAVIS_REPO_SLUG + -e TRAVIS_TAG + -e NSVER + -e ENDPOINTS_PACK + " +script: > + docker run -ti --name makerpms ${EVARS} + --hostname b${TRAVIS_BUILD_NUMBER}.nethserver.org + --volume $PWD:/srv/makerpms/src:ro ${DOCKER_IMAGE} makerpms-travis -s *.spec + && docker commit makerpms nethserver/build + && docker run -ti ${EVARS} + -e SECRET + -e SECRET_URL + -e AUTOBUILD_SECRET + -e AUTOBUILD_SECRET_URL + nethserver/build uploadrpms-travis diff --git a/additional/COPYING b/additional/COPYING new file mode 100644 index 0000000..eeb586b --- /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/contriborbase b/contriborbase new file mode 100644 index 0000000..9b7fd51 --- /dev/null +++ b/contriborbase @@ -0,0 +1 @@ +contribs10 diff --git a/createlinks b/createlinks new file mode 100644 index 0000000..6063718 --- /dev/null +++ b/createlinks @@ -0,0 +1,30 @@ +#!/usr/bin/perl -w + +use esmith::Build::CreateLinks qw(:all); + +my $event = 'smeserver-collabora-update'; + +event_actions($event, qw( + initialize-default-databases 00 + smeserver-collabora-conf 20 + systemd-default 88 + systemd-reload 89 +)); + +event_templates($event, qw( + /etc/httpd/conf/httpd.conf + /etc/rsyslog.conf +)); + +event_services($event, qw( + httpd reload + coolwsd restart + php73-php-fpm reload-or-restart + rsyslog restart +)); + +$event = 'smeserver-nextcloud-update'; +event_actions($event, qw( + smeserver-collabora-conf 70 +)); + diff --git a/root/etc/e-smith/db/configuration/defaults/coolwsd/AllowWopiHost b/root/etc/e-smith/db/configuration/defaults/coolwsd/AllowWopiHost new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/db/configuration/defaults/coolwsd/VirtualHost b/root/etc/e-smith/db/configuration/defaults/coolwsd/VirtualHost new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/db/configuration/defaults/coolwsd/status b/root/etc/e-smith/db/configuration/defaults/coolwsd/status new file mode 100644 index 0000000..86981e6 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/coolwsd/status @@ -0,0 +1 @@ +enabled diff --git a/root/etc/e-smith/db/configuration/defaults/coolwsd/type b/root/etc/e-smith/db/configuration/defaults/coolwsd/type new file mode 100644 index 0000000..24e1098 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/coolwsd/type @@ -0,0 +1 @@ +service diff --git a/root/etc/e-smith/db/configuration/migrate/migrateloolwsd b/root/etc/e-smith/db/configuration/migrate/migrateloolwsd new file mode 100644 index 0000000..f891eb3 --- /dev/null +++ b/root/etc/e-smith/db/configuration/migrate/migrateloolwsd @@ -0,0 +1,6 @@ +{ + my $loolwsd = $DB->get("loolwsd") or return; + my $coolwsd = $DB->get("coolwsd") || $DB->new_record("coolwsd", { type => "service" }); + $coolwsd->merge_props($loolwsd->props); + $loolwsd->delete; +} diff --git a/root/etc/e-smith/events/actions/smeserver-collabora-conf b/root/etc/e-smith/events/actions/smeserver-collabora-conf new file mode 100644 index 0000000..d3f546f --- /dev/null +++ b/root/etc/e-smith/events/actions/smeserver-collabora-conf @@ -0,0 +1,38 @@ +#!/bin/bash + +# Disable ssl +coolconfig set ssl.enable false +coolconfig set ssl.termination true +coolconfig set net.listen loopback +coolconfig set net.proto IPv4 + + +#Generate a list of hosts that can access to the wopi storage +#Server FQDN +AllowWopiHosts=`hostname` + +#Nextcloud virtualhost +if [[ -n `/sbin/e-smith/config getprop nextcloud VirtualHost` ]];then AllowWopiHosts+="|`/sbin/e-smith/config getprop nextcloud VirtualHost`";fi +if [[ -n `/sbin/e-smith/config getprop nextcloud CloudDomain` ]];then AllowWopiHosts+="|`/sbin/e-smith/config getprop nextcloud CloudDomain`";fi + +#Additional external host +if [[ -n `/sbin/e-smith/config getprop coolwsd AllowWopiHost` ]];then AllowWopiHosts+="|`/sbin/e-smith/config getprop coolwsd AllowWopiHost |sed -e 's/,/|/g' `";fi + +coolconfig set storage.wopi.host "$AllowWopiHosts" + + +if [[ -n `/sbin/e-smith/config getprop coolwsd VirtualHost` ]]; then + + #Configure smeserver-Nextcloud + if [[ -x "/usr/bin/occ" ]]; then + + /usr/bin/occ app:install richdocuments + + /usr/bin/occ config:app:set richdocuments wopi_url --value=https://`/sbin/e-smith/config getprop coolwsd VirtualHost` + + /usr/bin/occ app:enable richdocuments + + /usr/bin/occ config:system:set allow_local_remote_servers --value true --type bool + fi + +fi diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/00Setup b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/00Setup new file mode 100644 index 0000000..3ebd485 --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/00Setup @@ -0,0 +1,10 @@ +{ + use esmith::DomainsDB; + # Convert the passed hash for the domain object back into an object. + $domain = bless \%domain, 'esmith::DB::db::Record'; + + # Make scalars from some of the properties of the domain + $virtualHost = $domain->key; + $virtualHostContent = $domain->prop('Content'); + $OUT = ""; +} diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora new file mode 100644 index 0000000..8d3279a --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/80VirtualHostsCollabora @@ -0,0 +1,59 @@ +{ + if (($port eq "80") ){ + + $OUT .= " ServerName $virtualHost\n"; + $OUT .= " Redirect permanent / https://$virtualHost/ \n"; + $OUT .= "\n"; + } + else { + + $OUT .= " Options -Indexes\n"; + + $OUT .= " ServerName $virtualHost\n"; + + $OUT .= " SSLEngine on\n"; + + $OUT .= " # Encoded slashes need to be allowed\n"; + $OUT .= " AllowEncodedSlashes NoDecode\n"; + + $OUT .= " # keep the host\n"; + $OUT .= " ProxyPreserveHost On\n"; + + $OUT .= " # static html, js, images, etc. served from loolwsd\n"; + $OUT .= " # loleaflet is the client part of LibreOffice Online\n"; + $OUT .= " ProxyPass /loleaflet http://127.0.0.1:9980/loleaflet retry=0\n"; + $OUT .= " ProxyPassReverse /loleaflet http://127.0.0.1:9980/loleaflet\n"; + + $OUT .= " # static html, js, images, etc. served from coolwsd\n"; + $OUT .= " # browser is the client part of LibreOffice Online\n"; + $OUT .= " ProxyPass /browser http://127.0.0.1:9980/browser retry=0\n"; + $OUT .= " ProxyPassReverse /browser http://127.0.0.1:9980/browser\n"; + + $OUT .= " # WOPI discovery URL\n"; + $OUT .= " ProxyPass /hosting/discovery http://127.0.0.1:9980/hosting/discovery retry=0\n"; + $OUT .= " ProxyPassReverse /hosting/discovery http://127.0.0.1:9980/hosting/discovery\n"; + + $OUT .= " # Main websocket\n"; + $OUT .= " ProxyPassMatch \"/cool/(.*)/ws\$\" ws://127.0.0.1:9980/cool/\$1/ws nocanon\n"; + + $OUT .= " # Admin Console websocket\n"; + $OUT .= " ProxyPass /cool/adminws ws://127.0.0.1:9980/cool/adminws\n"; + + $OUT .= " # Download as, Fullscreen presentation and Image upload operations\n"; + $OUT .= " ProxyPass /cool http://127.0.0.1:9980/cool\n"; + $OUT .= " ProxyPassReverse /cool http://127.0.0.1:9980/cool\n"; + + $OUT .= " # Compatibility with integrations that use the /lool/convert-to endpoint\n"; + $OUT .= " ProxyPass /lool http://127.0.0.1:9980/cool\n"; + $OUT .= " ProxyPassReverse /lool http://127.0.0.1:9980/cool\n"; + + $OUT .= " # Endpoint with information about availability of various features\n"; + $OUT .= " ProxyPass /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities retry=0\n"; + $OUT .= " ProxyPassReverse /hosting/capabilities http://127.0.0.1:9980/hosting/capabilities\n"; + + + $OUT .= " # base\n"; + $OUT .= " ProxyPass / http://127.0.0.1:9980/ retry=0\n"; + $OUT .= " ProxyPassReverse / http://127.0.0.1:9980/\n"; + } +} diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-begin b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-begin new file mode 100644 index 0000000..b050035 --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-begin @@ -0,0 +1,2 @@ + + diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-end b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-end new file mode 100644 index 0000000..50d3d92 --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/Collabora/template-end @@ -0,0 +1,2 @@ + + diff --git a/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora b/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora new file mode 100644 index 0000000..54c2e24 --- /dev/null +++ b/root/etc/e-smith/templates/etc/rsyslog.conf/32collabora @@ -0,0 +1,6 @@ +# collabora +#first remove log noise +if $programname == "coolwsd" and $msg contains 'WRN Util::stringVectorToMap => record is misformed: #' then stop +:programname, isequal, "coolwsd" /var/log/coolwsd.log +& stop + diff --git a/root/etc/logrotate.d/collabora b/root/etc/logrotate.d/collabora new file mode 100644 index 0000000..a0c7d50 --- /dev/null +++ b/root/etc/logrotate.d/collabora @@ -0,0 +1,9 @@ +/var/log/coolwsd.log +{ + missingok + sharedscripts + postrotate + /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true + endscript +} + diff --git a/root/etc/yum/post-actions/coolwsd.action b/root/etc/yum/post-actions/coolwsd.action new file mode 100644 index 0000000..7abf6bc --- /dev/null +++ b/root/etc/yum/post-actions/coolwsd.action @@ -0,0 +1 @@ +coolwsd:update:/sbin/e-smith/signal-event smeserver-collabora-update diff --git a/root/usr/lib/systemd/system/coolwsd.service.d/50koozali.conf b/root/usr/lib/systemd/system/coolwsd.service.d/50koozali.conf new file mode 100644 index 0000000..aa4f147 --- /dev/null +++ b/root/usr/lib/systemd/system/coolwsd.service.d/50koozali.conf @@ -0,0 +1,2 @@ +[Install] +WantedBy=sme-server.target diff --git a/smeserver-collabora.spec b/smeserver-collabora.spec new file mode 100644 index 0000000..19469fe --- /dev/null +++ b/smeserver-collabora.spec @@ -0,0 +1,85 @@ +Summary: Koozali SME Server Collabora Online configuration +Name: smeserver-collabora +Version: 0.1.6 +Release: 8%{?dist} +License: GPL +Source: %{name}-%{version}.tar.xz + +BuildArch: noarch +Requires: CODE-brand >= 21.11 +Requires: coolwsd +Requires: collaboraoffice-dict-en + +BuildRequires: e-smith-devtools + +%description +Koozali SME Server Collabora Online configuration + +%prep +%setup -q + +%build +perl createlinks + +%install +rm -rf $RPM_BUILD_ROOT +(cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) +rm -f %{name}-%{version}-%{release}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ +> %{name}-%{version}-%{release}-filelist + +%post + +%files -f %{name}-%{version}-%{release}-filelist +%defattr(-,root,root) +%doc COPYING + +%changelog +* Sat Sep 07 2024 cvs2git.sh aka Brian Read 0.1.6-8.sme +- Roll up patches and move to git repo [SME: 12338] + +* Sat Sep 07 2024 BogusDateBot +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + +* Mon Aug 14 2023 Jean-Philippe Pialasse 0.1.6-7.sme +- workaround coolwsd not restarted after its rpm update [SME: 12372] + this will also ensure all is configured properly and not overwritten + +* Mon Feb 06 2023 Jean-Philippe Pialasse 0.1.6-6.sme +- dedicated log [SME: 12248] + +* Tue Mar 22 2022 Jean-Philippe Pialasse 0.1.6-5.sme +- make Collabo use a subfolder for its Virtualdomain [SME: 11895] +- and ability to have multiple collabora domains + +* Fri Mar 11 2022 Jean-Philippe Pialasse 0.1.6-3.sme +- fix httpd template path [SME: 11895] + +* Thu Mar 10 2022 Jean-Philippe Pialasse 0.1.6-2.sme +- fix missing systemd configuration [SME: 11893] + +* Wed Mar 09 2022 Jean-Philippe Pialasse - 0.1.6-1 +- Go to CODE 21.11 + +* Sat Dec 11 2021 mrmarkuz <31746411+mrmarkuz@users.noreply.github.com> - 0.1.5-1 +- Collabora 21.11 Update - NethServer/dev#6607 + +* Mon May 03 2021 Stephane de Labrusse - 0.1.4-1 +- Collabora: Require collaboraoffice6.4-dict-en - NethServer/dev#6501 + +* Tue Apr 20 2021 Stephane de Labrusse - 0.1.3-1 +- Collabora: Add CODE repository but disabled - NethServer/dev#6490 + +* Wed Feb 17 2021 Giacomo Sanchietti - 0.1.2-1 +- Collabora still uses rh-php72 but Nextcloud installs rh-php73 - Bug NethServer/dev#6426 + +* Fri Jan 24 2020 Giacomo Sanchietti - 0.1.1-1 +- Collabora still uses rh-php71 but Nextcloud installs rh-php72 - Bug NethServer/dev#6035 + +* Tue Feb 12 2019 Matteo Valentini - 0.1.0-1 +- Collabora Online integration - NethServer/dev#5700 +