From 992e6627600a621dff1a1c17d2144f0069fc4877 Mon Sep 17 00:00:00 2001 From: Trevor Batley Date: Sat, 7 Sep 2024 20:46:17 +1000 Subject: [PATCH] initial commit of file from CVS for smeserver-nextcloud on Sat Sep 7 20:46:17 AEST 2024 --- .gitignore | 4 + Makefile | 21 + README.md | 17 +- additional/COPYING | 674 ++++++++++++++++++ contriborbase | 1 + createlinks | 74 ++ .../db/accounts/defaults/nextcloud/type | 1 + .../defaults/nextcloud/AdminUser | 1 + .../configuration/defaults/nextcloud/DbName | 1 + .../configuration/defaults/nextcloud/DbUser | 1 + .../defaults/nextcloud/TrustedDomains | 0 .../configuration/defaults/nextcloud/access | 1 + .../configuration/defaults/nextcloud/status | 1 + .../db/configuration/defaults/nextcloud/type | 1 + .../db/configuration/migrate/nextcloud | 16 + .../etc/e-smith/events/actions/nextcloud-conf | 95 +++ .../e-smith/events/actions/nextcloud-del-user | 97 +++ .../e-smith/events/actions/nextcloud-occ-conf | 332 +++++++++ .../e-smith/templates/etc/crontab/98nextcloud | 14 + .../fail2ban/jail.conf/30Service55nextcloud | 9 + .../etc/httpd/conf/httpd.conf/98nextcloud | 104 +++ .../conf/httpd.conf/VirtualHosts/28nextcloud | 41 ++ .../remi/php74/php.d/20-opcache.ini/10base | 9 + .../php74/php.d/20-opcache.ini/template-begin | 0 .../remi/php81/php.d/20-opcache.ini/10base | 9 + .../php81/php.d/20-opcache.ini/template-begin | 0 .../etc/php-fpm.d/www.conf/15Nextcloud | 89 +++ root/etc/fail2ban/filter.d/nextcloud.conf | 5 + root/etc/logrotate.d/nextcloud | 9 + root/etc/sudoers.d/90_nextcloud | 1 + .../e-smith/files/nextcloud/data/.gitignore | 0 root/usr/bin/nc_dbupdate | 5 + root/usr/bin/occ | 8 + root/var/lib/php/nextcloud/opcache/.gitignore | 0 root/var/lib/php/nextcloud/session/.gitignore | 0 root/var/lib/php/nextcloud/tmp/.gitignore | 0 smeserver-nextcloud.spec | 271 +++++++ 37 files changed, 1910 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 additional/COPYING create mode 100644 contriborbase create mode 100755 createlinks create mode 100644 root/etc/e-smith/db/accounts/defaults/nextcloud/type create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/AdminUser create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/DbName create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/DbUser create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/TrustedDomains create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/access create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/status create mode 100644 root/etc/e-smith/db/configuration/defaults/nextcloud/type create mode 100644 root/etc/e-smith/db/configuration/migrate/nextcloud create mode 100755 root/etc/e-smith/events/actions/nextcloud-conf create mode 100755 root/etc/e-smith/events/actions/nextcloud-del-user create mode 100755 root/etc/e-smith/events/actions/nextcloud-occ-conf create mode 100644 root/etc/e-smith/templates/etc/crontab/98nextcloud create mode 100644 root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service55nextcloud create mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud create mode 100644 root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud create mode 100644 root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base create mode 100644 root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/template-begin create mode 100644 root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base create mode 100644 root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/template-begin create mode 100644 root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud create mode 100644 root/etc/fail2ban/filter.d/nextcloud.conf create mode 100644 root/etc/logrotate.d/nextcloud create mode 100644 root/etc/sudoers.d/90_nextcloud create mode 100644 root/home/e-smith/files/nextcloud/data/.gitignore create mode 100644 root/usr/bin/nc_dbupdate create mode 100644 root/usr/bin/occ create mode 100644 root/var/lib/php/nextcloud/opcache/.gitignore create mode 100644 root/var/lib/php/nextcloud/session/.gitignore create mode 100644 root/var/lib/php/nextcloud/tmp/.gitignore create mode 100644 smeserver-nextcloud.spec 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..d2811ea --- /dev/null +++ b/Makefile @@ -0,0 +1,21 @@ +# Makefile for source rpm: smeserver-nextcloud +# $Id: Makefile,v 1.1 2020/11/08 20:18:13 jpp Exp $ +NAME := smeserver-nextcloud +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 9c73158..15d8980 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,16 @@ -# smeserver-nextcloud +# smeserver-nextcloud -SMEServer Koozali developed git repo for smeserver-nextcloud smecontribs \ No newline at end of file +SMEServer Koozali developed git repo for smeserver-nextcloud smecontribs + +## Wiki +
https://wiki.koozali.org/Nextcloud +
https://wiki.koozali.org/Nextcloud/fr + +## Bugzilla +Show list of outstanding bugs: [here](https://bugs.koozali.org/buglist.cgi?component=smeserver-nextcloud&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/COPYING b/additional/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/additional/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. 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 +them 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 prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. 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. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU 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 that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + 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. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +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. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + 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 +state 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) + + 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 3 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, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program 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, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU 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 Lesser General +Public License instead of this License. But first, please read +. 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 100755 index 0000000..1147b8b --- /dev/null +++ b/createlinks @@ -0,0 +1,74 @@ +#!/usr/bin/perl -w +use esmith::Build::CreateLinks qw(:all); + +event_actions("nextcloud-update", qw( + nextcloud-conf 04 + nextcloud-occ-conf 30 +)); + +event_templates("nextcloud-update", qw( + /etc/httpd/conf/httpd.conf + /etc/opt/remi/php74/php.d/20-opcache.ini + /etc/opt/remi/php81/php.d/20-opcache.ini + /etc/crontab + /etc/opt/remi/php74/php-fpm.d/www.conf + /etc/opt/remi/php81/php-fpm.d/www.conf +)); + +event_services("nextcloud-update", qw( + httpd-e-smith sigusr1 + php74-php-fpm reload-or-restart + php81-php-fpm reload-or-restart +)); + +event_actions("nextcloud-save", qw( + nextcloud-occ-conf 30 +)); + +event_actions("user-delete", qw( + nextcloud-del-user 60 + )); + +foreach my $event (qw(ibay-create ibay-modify ibay-modify-files group-create group-delete group-modify user-create user-modify domain-create domain-delete domain-modify share-create share-delete share-modify)){ + event_link("nextcloud-occ-conf", $event, "30"); + } + +foreach my $event (qw(bootstrap-console-save console-save webapps-update post-upgrade )){ + event_link("nextcloud-occ-conf", $event, "30"); + + } + +my $event="smeserver-nextcloud-update"; +event_templates($event, qw( + /etc/httpd/conf/httpd.conf + /etc/opt/remi/php74/php.d/20-opcache.ini + /etc/opt/remi/php81/php.d/20-opcache.ini + /etc/crontab + /etc/opt/remi/php74/php-fpm.d/www.conf + /etc/opt/remi/php81/php-fpm.d/www.conf +)); + +event_services($event, qw( + httpd-e-smith sigusr1 + php74-php-fpm reload-or-restart + php81-php-fpm reload-or-restart +)); +# this is after service restart as it depends on installation of mariadb +# however if we increase initial version of nextcloud >25 then we need to +# change the default of php to 81 or re expand templates a second time +# or web serice will fail +event_link("nextcloud-conf", $event, "91"); +event_link("nextcloud-occ-conf", $event, "92"); +#maybe changing to +#event_link("nextcloud-conf", $event, "91"); +#event_link("generic_template_expand", $event, "92"); +#event_link("nextcloud-occ-conf", $event, "93"); +#event_link("adjust-services", $event, "95"); +# or adding the key element in script + +# Backup +use esmith::Build::Backup qw(:all); +backup_includes("smeserver-nextcloud", qw( +/usr/share/nextcloud/ +)); + diff --git a/root/etc/e-smith/db/accounts/defaults/nextcloud/type b/root/etc/e-smith/db/accounts/defaults/nextcloud/type new file mode 100644 index 0000000..96cdd3b --- /dev/null +++ b/root/etc/e-smith/db/accounts/defaults/nextcloud/type @@ -0,0 +1 @@ +url diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/AdminUser b/root/etc/e-smith/db/configuration/defaults/nextcloud/AdminUser new file mode 100644 index 0000000..d3a17f4 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/nextcloud/AdminUser @@ -0,0 +1 @@ +nextcloudadmin diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/DbName b/root/etc/e-smith/db/configuration/defaults/nextcloud/DbName new file mode 100644 index 0000000..705c7f8 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/nextcloud/DbName @@ -0,0 +1 @@ +nextcloud diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/DbUser b/root/etc/e-smith/db/configuration/defaults/nextcloud/DbUser new file mode 100644 index 0000000..705c7f8 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/nextcloud/DbUser @@ -0,0 +1 @@ +nextcloud diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/TrustedDomains b/root/etc/e-smith/db/configuration/defaults/nextcloud/TrustedDomains new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/access b/root/etc/e-smith/db/configuration/defaults/nextcloud/access new file mode 100644 index 0000000..3e18ebf --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/nextcloud/access @@ -0,0 +1 @@ +private diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/status b/root/etc/e-smith/db/configuration/defaults/nextcloud/status new file mode 100644 index 0000000..86981e6 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/nextcloud/status @@ -0,0 +1 @@ +enabled diff --git a/root/etc/e-smith/db/configuration/defaults/nextcloud/type b/root/etc/e-smith/db/configuration/defaults/nextcloud/type new file mode 100644 index 0000000..f92f363 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/nextcloud/type @@ -0,0 +1 @@ +configuration diff --git a/root/etc/e-smith/db/configuration/migrate/nextcloud b/root/etc/e-smith/db/configuration/migrate/nextcloud new file mode 100644 index 0000000..426d467 --- /dev/null +++ b/root/etc/e-smith/db/configuration/migrate/nextcloud @@ -0,0 +1,16 @@ +{ + +my $nextcloud = $DB->get('nextcloud') || $DB->new_record('nextcloud', {type => 'service'}); + +my $dbpass = $nextcloud->prop('DbPassword') || + $nextcloud->set_prop('DbPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`); +my $dbAdminPass = $nextcloud->prop('AdminPassword') || + $nextcloud->set_prop('AdminPassword', `/usr/bin/openssl rand -base64 40 | /usr/bin/tr -c -d '[:graph:]'`); + +if (my $CloudDomain = $DB->get_prop_and_delete('nextcloud', 'CloudDomain')) { + $nextcloud->merge_props('VirtualHost', $CloudDomain); + } + +} + + diff --git a/root/etc/e-smith/events/actions/nextcloud-conf b/root/etc/e-smith/events/actions/nextcloud-conf new file mode 100755 index 0000000..99cd64d --- /dev/null +++ b/root/etc/e-smith/events/actions/nextcloud-conf @@ -0,0 +1,95 @@ +#!/bin/bash + +# does /usr/share/nextcloud exists ? no: we create it from sources +if [ ! -d /usr/share/nextcloud ]; then + cp -a /usr/share/nextcloud-src /usr/share/nextcloud +fi + +# important configuration variables +password=`/sbin/e-smith/db configuration getprop nextcloud DbPassword || echo "missing"` +dbname=`/sbin/e-smith/db configuration getprop nextcloud DbName || echo "nextcloud"` +dbuser=`/sbin/e-smith/db configuration getprop nextcloud DbUser || echo "nextcloud"` +adminuser=`/sbin/e-smith/db configuration getprop nextcloud AdminUser || echo "admin"` +adminpass=`/sbin/e-smith/db configuration getprop nextcloud AdminPassword ||/sbin/e-smith/db configuration getprop sysconfig SystemID || echo "password;109"` + +host="localhost:/var/lib/mysql/mariadb105.sock" +socket="--socket=/var/lib/mysql/mariadb105.sock" +# need to check what db we are supposed to use. starting NC 21 mariadb >= 102 is needed core is 55 +# are we fresh install or update ? +installed=$(/usr/bin/occ status --output json |jq -r '.installed') +# what version +majversion=$(/usr/bin/occ status --output json |jq -r '.version'|cut -d'.' -f1) +# is there a nextcloud db in core mariadb +if [ "$installed" != "true" ]; then host="localhost:/var/lib/mysql/mariadb105.sock"; socket="--socket=/var/lib/mysql/mariadb105.sock"; fi +if [ "$installed" == "true" ]; then host=$(occ config:system:get dbhost); socket="--socket=$(echo $host|awk -F'[:]' '{print $2}')" ; fi +if [ "$socket" == "--socket=" ]; then socket=""; fi + +# initialize grants mysql nextcloud database +/usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "CREATE DATABASE IF NOT EXISTS $dbname;" +/usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "grant all on $dbname.* to '$dbuser'@'localhost' identified by '$password';" +/usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "FLUSH PRIVILEGES" + +res=`/usr/bin/mysql --defaults-file=/root/.my.cnf $socket -e "select count(*) from information_schema.tables where table_type = 'BASE TABLE' and table_schema = '$dbname'" | tail -n1`; + +if [[ $res == '0' ]]; then + /usr/bin/occ maintenance:install --database mysql --database-host $host --database-name $dbname --database-user $dbuser --database-pass $password --admin-user $adminuser --admin-pass $adminpass --data-dir /home/e-smith/files/nextcloud/data/ + + /usr/bin/occ app:enable user_ldap + # might create s01 or empty id depending on version + /usr/bin/occ ldap:create-empty-config + # create config with id s01 if not already present + /usr/bin/occ ldap:show-config s01 1>/dev/null || /usr/bin/occ ldap:create-empty-config + # delete config with empty id if exist + /usr/bin/occ ldap:delete-config '' 1>/dev/null + mkdir -p /home/e-smith/files/nextcloud/skeleton/ibays +fi + +mkdir -p /home/e-smith/files/nextcloud/skeleton/ibays +/usr/bin/occ config:system:set skeletondirectory --value="/home/e-smith/files/nextcloud/skeleton" +#/usr/bin/occ config:system:set templatedirectory --value="" + +# to satisfy code integrity check +if [ -f /usr/share/nextcloud/.htaccess.rpmsave ]; then + rm -f /usr/share/nextcloud/.htaccess.rpmsave +fi +if [ -f /usr/share/nextcloud/.htaccess.rpmnew ]; then + rm -f /usr/share/nextcloud/.htaccess.rpmnew +fi + +# upgrade and check integrity +/usr/bin/occ upgrade +/usr/bin/occ maintenance:mode --off +/usr/bin/occ integrity:check-core +## Catch 'Nextcloud is already latest version' message +#if [ $? -eq 3 ]; then +# exit 0 +#fi + +# remove signup link +/usr/bin/occ config:system:set --type=bool --value=false simpleSignUpLink.shown + +#set default loglevel SME 12412 +/usr/bin/occ config:system:set loglevel --value=3 + +#Redis index File Cache +/usr/bin/occ config:system:set redis host --value="localhost" +/usr/bin/occ config:system:set redis port --value="6379" +/usr/bin/occ config:system:set redis timeout --value="0.0" +/usr/bin/occ config:system:set redis password --value="" +/usr/bin/occ config:system:set memcache.locking --value="\OC\Memcache\Redis" +/usr/bin/occ config:system:set --type=bool --value=true filelocking.enabled + +# cron maintenance windows +/usr/bin/occ config:system:set maintenance_window_start --type=integer --value=1 + +#samba needed folder to put gencache.tdb +if [ ! -d /var/www/.cache/samba ]; then + mkdir -p /var/www/.cache/samba + chown www:shared /var/www/.cache/samba +fi +if [ ! -d /home/e-smith/.cache/samba ]; then + mkdir -p /home/e-smith/.cache/samba + chown www:admin /home/e-smith/.cache/samba +fi + + diff --git a/root/etc/e-smith/events/actions/nextcloud-del-user b/root/etc/e-smith/events/actions/nextcloud-del-user new file mode 100755 index 0000000..093701d --- /dev/null +++ b/root/etc/e-smith/events/actions/nextcloud-del-user @@ -0,0 +1,97 @@ +#!/usr/bin/perl -w + +#---------------------------------------------------------------------- +# copyright (C) 2018 Koozali SME Server Foundation +# +# 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 3 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. +# +#---------------------------------------------------------------------- + + +package esmith; + +use strict; +use Errno; +use esmith::ConfigDB; +use JSON; + +my $conf = esmith::ConfigDB->open_ro + or die "Could not open Config DB"; + + +sub OCCr +{ + my $params = join(" ", @_); + my $json =`TERM=dumb /usr/bin/occ $params` ; + return $json; +} + +sub listLocalMounts +{ + my %localmounts; + my $json = JSON->new->allow_nonref->convert_blessed->escape_slash; + my $result = $json->decode(OCCr " files_external:list --output json"); + + for my $report ( @{$result} ) { + next unless ( $report->{'storage'} =~ m/Local$/ || $report->{'storage'} =~ m/SMB$/ ) ; + $localmounts{$report->{'mount_id'}}{'mount_point'}=$report->{mount_point}; + $localmounts{$report->{'mount_id'}}{'datadir'}=$report->{'configuration'}->{'datadir'}; + $localmounts{$report->{'mount_id'}}{'applicable_groups'}=$report->{'applicable_groups'}; + $localmounts{$report->{'mount_id'}}{'applicable_users'}=$report->{'applicable_users'}; + $localmounts{$report->{'mount_id'}}{'storage'}= ( $report->{'storage'} =~ m/Local$/ ) ? "local" : "smb"; + # for SMB + $localmounts{$report->{'mount_id'}}{'share'} = $report->{'configuration'}->{'share'}; + $localmounts{$report->{'mount_id'}}{'host'} = $report->{'configuration'}->{'host'}; + } + return %localmounts; +} + +sub listUsers +{ + my %NCusers; + my $json = JSON->new->allow_nonref->convert_blessed->escape_slash; + my $result = $json->decode(OCCr " user:list --output json"); + for my $key (keys %$result){ + my $name = $result->{$key}; + next unless $name =~ m/\((.*)\)$/; + my $uid = $1 if $name =~ /\((.*)\)$/; + $NCusers{$uid}=$key; + } + return %NCusers; +} + +my $event = $ARGV [0]; +my $userName = $ARGV [1]; +my %NCusers= listUsers; +my %localmounts = listLocalMounts; +my $x = 0; # exit value + +#------------------------------------------------------------ +# Delete the Nextcloud account. +#------------------------------------------------------------ + +die "Username argument missing." unless defined ($userName); + +my $id = $NCusers{$userName} || ""; + +# delete user home access +my @matching_keys = grep { defined $localmounts{$_}{'host'} && $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/$userName$/} keys %localmounts; +while (my $bad = pop @matching_keys) { + system("TERM=dumb /usr/bin/occ files_external:delete -y $bad ") == 0 + or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" ); + +} + +# delete user +system("TERM=dumb /usr/bin/occ user:delete -y $id ") == 0 + or ( $x = 255 , warn "Failed to delete (nextcloud) account $userName : $id .\n" ) if ($id ne ""); + +exit($x); diff --git a/root/etc/e-smith/events/actions/nextcloud-occ-conf b/root/etc/e-smith/events/actions/nextcloud-occ-conf new file mode 100755 index 0000000..9cd0cde --- /dev/null +++ b/root/etc/e-smith/events/actions/nextcloud-occ-conf @@ -0,0 +1,332 @@ +#!/usr/bin/perl + +use strict; +use esmith::ConfigDB; +use esmith::util; +use esmith::AccountsDB; +use JSON; +use Array::Compare; + +sub OCC +{ + my $params = join(" ", @_); + system("TERM=dumb /usr/bin/occ $params 2>/dev/null"); +} + +sub OCCr +{ + my $params = join(" ", @_); + my $json =`TERM=dumb /usr/bin/occ $params` ; + $json =~ s/\s+$//; + return $json; +} + +sub listLocalMounts +{ + my %localmounts; + my $json = JSON->new->allow_nonref->convert_blessed->escape_slash; + my $result = $json->decode(OCCr " files_external:list --output json"); + + for my $report ( @{$result} ) { + next unless ( $report->{'storage'} =~ m/Local$/ || $report->{'storage'} =~ m/SMB$/ ) ; + $localmounts{$report->{'mount_id'}}{'mount_point'}=$report->{mount_point}; + $localmounts{$report->{'mount_id'}}{'datadir'}=$report->{'configuration'}->{'datadir'}; + $localmounts{$report->{'mount_id'}}{'applicable_groups'}=$report->{'applicable_groups'}; + $localmounts{$report->{'mount_id'}}{'applicable_users'}=$report->{'applicable_users'}; + $localmounts{$report->{'mount_id'}}{'storage'}= ( $report->{'storage'} =~ m/Local$/ ) ? "local" : "smb"; + # for SMB + $localmounts{$report->{'mount_id'}}{'share'} = $report->{'configuration'}->{'share'}; + $localmounts{$report->{'mount_id'}}{'host'} = $report->{'configuration'}->{'host'}; + } + return %localmounts; +} + +sub listUsers +{ + my %NCusers; + my $json = JSON->new->allow_nonref->convert_blessed->escape_slash; + my $result = $json->decode(OCCr " user:list --output json"); + for my $key (keys %$result){ + my $name = $result->{$key}; + next unless $name =~ m/\((.*)\)$/; + my $uid = $1 if $name =~ /\((.*)\)$/; + $NCusers{$uid}=$key; + } + return %NCusers; +} + +sub listGroups +{ + my %NCgroups; + my $json = JSON->new->allow_nonref->convert_blessed->escape_slash; + my $result = $json->decode(OCCr " group:list -i --output json"); + for my $key (keys %$result){ + my $type = $result->{$key}{'backends'}[0]; + next unless $type eq "LDAP"; + my $subresult = $json->decode(OCCr " group:info $key --output json"); + my $name = $subresult->{'displayName'};# not editable for this backend! + $NCgroups{$name}=$key; + } + return %NCgroups; +} + +my $cdb = esmith::ConfigDB->open_ro(); +my $adb = esmith::AccountsDB->open_ro(); +my @ibays = $adb->ibays(); +my @users = $adb->users(); +push @users,$adb->get('admin'); +my @shares = $adb->get_all_by_prop(type => 'share' ); +my %localmounts; +my @idOK; +my $nextcloud = $cdb->get('nextcloud') or exit; +my $status = $nextcloud->prop('status') || 'disabled'; +exit if $status eq "disabled"; +my $doshare = $nextcloud->prop('Shares') || 'enabled'; +push @ibays,@shares unless $doshare eq "disabled"; +my $includeI = $nextcloud->prop('IncludeIbay') || ""; +my $excludeI = $nextcloud->prop('ExcludeIbay') || "Primary"; +my @incI = split ',' , $includeI ; +my @excI =split ',' , $excludeI; +my $smb = $cdb->get('smb'); +$status = $smb->prop('status') || 'disabled'; +$status = $nextcloud->prop('UseSMB') || $status; +my %NCusers; +my %NCgroups; +my $storage = ( $status eq "enabled" ) ? 'smb' : 'local' ; +my $domain = $cdb->get_value('DomainName'); +my $host = $cdb->get_value('SystemName'); +my $fqdn = join('.', $host , $domain); +my $baseDN = esmith::util::ldapBase($cdb->get_value('DomainName')); +my $local = $cdb->get_value('LocalIP'); +my $remote = $cdb->get_value('ExternalIP') || ""; +my $comp1 = Array::Compare->new; +my $workgroup = $cdb->get_prop('smb','Workgroup'); + +# update trusted domains +OCC "config:system:set trusted_domains 0 --value=$fqdn"; +OCC "config:system:set trusted_domains 1 --value=$host"; +OCC "config:system:set trusted_domains 2 --value=$domain"; +OCC "config:system:set trusted_domains 3 --value=localhost"; +my $i = 4; +OCC "config:system:set trusted_domains $i --value=$local" ; $i++; + +if ($cdb->get_value('SystemMode') eq "servergateway") { +OCC "config:system:set trusted_domains $i --value=$remote" ; $i++;}; + +# Add extra trusted domains +my $trusted_domains = $cdb->get_prop('nextcloud','TrustedDomains') || ''; +foreach (split(',', $trusted_domains)) { + OCC "config:system:set trusted_domains $i --value=".$_; + $i++; +} + +my $VirtualHost = $cdb->get_prop('nextcloud','VirtualHost') || ''; +OCC "config:system:set trusted_domains 99 --value=$VirtualHost" unless $VirtualHost eq ""; + +#set local domain to send emails +if ( ($nextcloud->prop('cliurl') ||'enabled') eq 'enabled') { + my $url= ($VirtualHost eq "")? "$domain/nextcloud" : $VirtualHost; + OCC "config:system:set overwrite.cli.url --value 'https://$url'" +} + +# enable files_external and allow auto refresh +OCC "app:enable files_external"; +OCC "config:system:set filesystem_check_changes --value=1"; + +# set memcache +OCC "config:system:set memcache.local --value='\\OC\\Memcache\\APCu'"; + +# Update user authentication + +#my $sssd = new NethServer::SSSD(); +#my $quotedBindPass = $sssd->bindPassword(); +#$quotedBindPass =~ s/\'/\\'/g; +#$quotedBindPass =~ s/\$/\\\$/g; + OCC "ldap:set-config s01 ldapHost 'localhost'"; + OCC "ldap:set-config s01 ldapPort 389"; +# OCC "ldap:set-config s01 ldapAgentName '" . $sssd->bindDN() . "'"; +# OCC "ldap:set-config s01 ldapAgentPassword '$quotedBindPass'"; + OCC "ldap:set-config s01 ldapBase ".$baseDN; + OCC "ldap:set-config s01 ldapBaseGroups ou=Groups,$baseDN"; + OCC "ldap:set-config s01 ldapBaseUsers ou=Users,$baseDN"; + + OCC "ldap:set-config s01 ldapGroupDisplayName cn"; + OCC "ldap:set-config s01 ldapGroupFilter '(&(|(objectclass=posixGroup)))'"; + OCC "ldap:set-config s01 ldapGroupFilterObjectclass posixGroup"; + OCC "ldap:set-config s01 ldapGroupMemberAssocAttr memberUid"; + OCC "ldap:set-config s01 ldapLoginFilter '(&(|(objectclass=inetOrgPerson))(|(uid=%uid)(|(mail=%uid))))'"; + OCC "ldap:set-config s01 ldapLoginFilterEmail 1"; + OCC "ldap:set-config s01 ldapLoginFilterMode 0"; + OCC "ldap:set-config s01 ldapLoginFilterUsername 1"; + OCC "ldap:set-config s01 ldapUserDisplayName cn"; + OCC "ldap:set-config s01 ldapUserDisplayName2 uid"; + OCC "ldap:set-config s01 ldapUserFilter '(|(objectclass=inetOrgPerson))'"; + OCC "ldap:set-config s01 ldapUserFilterObjectclass inetOrgPerson"; + OCC "ldap:set-config s01 ldapEmailAttribute mail"; + OCC "ldap:set-config s01 useMemberOfToDetectMembership 0"; + OCC "ldap:set-config s01 ldapConfigurationActive 1"; + OCC "ldap:set-config s01 turnOffCertCheck 1"; + # changes to use username in place of ldap uuid as id + OCC "ldap:set-config s01 ldapExpertUUIDGroupAttr cn"; + OCC "ldap:set-config s01 ldapExpertUUIDUserAttr uid"; + OCC "ldap:set-config s01 ldapExpertUsernameAttr uid"; + # test new config to make it available, and sync user/groups + OCC "ldap:test-config s01"; + %NCusers= listUsers; + %NCgroups= listGroups; + #my $totrash = OCCr "group:list"; + +# set ibays shares +foreach ( @ibays) { + my $group = $_->prop('Group') ||''; + my $key = $_->key; + #print "Configuring file repo : $key\n"; + my $id = ""; + my $typ = $_->prop('type'); + my @wgroups = split(',', $_->prop('WriteGroups')||''); + my @rgroups = split(',', $_->prop('ReadGroups')||''); + my @groups ; + push @groups, @rgroups,@wgroups, split(',',$group); + my @rusers = split(',', $_->prop('ReadUsers')||''); + my @wusers = split(',', $_->prop('WriteUsers')||''); + my @Users; + push @Users,@wusers,@rusers; + my @uUsers ; + for (@Users) { push @uUsers, $NCusers{$_}; } ; + # next if includeI not empty and if not in includeI + next unless (scalar(@incI) == 0 || grep(/^$key$/i, @incI) ); + # next if in excludeI + next if (grep(/^$key$/i, @excI) ); + + # get existing mount + %localmounts = listLocalMounts; + # search for our current one + my @matching_keys = grep { $localmounts{$_}{'mount_point'} =~ m/ibays\/$key$/ && $localmounts{$_}{'storage'} eq $storage } keys %localmounts; + + if (scalar(@matching_keys) == 0) { + print "Configuring file repo : $key\n"; + #if none create + if ($storage eq "smb") { + $id = OCCr "files_external:create -c share=$key -c host=localhost -c domain=$workgroup -c root='' -c show_hidden=false -c check_acl=false -c timeout='' 'ibays/$key' smb password::logincredentials --output json"; + } else { + $id = OCCr "files_external:create -c datadir=/home/e-smith/files/$typ/$key 'ibays/$key' local null::null --output json"; + } + for $group (@groups) { + $group = $NCgroups{$group} || next; + print " adding group $group to file repo $id\n"; + OCC "files_external:applicable --add-group $group $id --output json"; + } + for my $u (@uUsers) { + print " adding user $u to file repo $id\n"; + OCC "files_external:applicable --add-user $u $id --output json" ; + } + push @idOK,$id; + print "created $typ $key : $id\n"; + next; + } + if (scalar(@matching_keys) > 1) { + #if more than 1 delete all but older + print "more than one $key, deleting the latest, keeping first\n"; + while (scalar(@matching_keys) > 1){ + my $bad = pop @matching_keys; + OCC "files_external:delete $bad -y"; + } + } + + #if one: update if necessary + $id = pop @matching_keys; + my @a = sort(@{$localmounts{$id}{'applicable_groups'}} ); + my @b = sort(@groups); + my @ua = sort(@{$localmounts{$id}{'applicable_users'}} ); + my @ub = sort(@uUsers); + if ( ! $comp1->compare(\@ua, \@ub) || ! $comp1->compare(\@a, \@b) ) { + print "updating $key\n"; + OCC "files_external:applicable --remove-all $id --output json"; + for $group (@groups) { + $group = $NCgroups{$group} || next; + OCC "files_external:applicable --add-group $group $id --output json" ; + } + for my $u (@uUsers) { + OCC "files_external:applicable --add-user $u $id --output json" ; + } + + } + push @idOK,$id; +} + + +#remove ibays that exist not anymore +%localmounts = listLocalMounts; +my %params = map { $_ => 1 } @idOK; +for my $key (keys %localmounts){ + ## TODO : adapt if SMB and if changing from one to the other. + if( $localmounts{$key}{'mount_point'} =~ m/ibays\/.*$/ && ! exists($params{$key})) { + my $mount= $localmounts{$key}{'mount_point'}; + print "delete $key : $mount\n"; + OCC "files_external:delete -y $key "; + } +} + + +# now we could mount home folder for each user using samba +foreach (@users) { + my $key = $_->key; + my $id = ""; + my $user = $NCusers{$key}; + print "Configuring user $user ($key)\n"; + # in case user not already know by NC, skip + # normally not necessary, thanks to LDAP!! + next if ($user eq ""); + # let's create the root "ibays" folder to mount every ibays in nextcloud user space + my ($login,$pass,$uid,$gid) = getpwnam("www"); + my $idir = "/home/e-smith/files/nextcloud/data/$user"; + unless ( !-d $idir || !-d "$idir/files" || -d "$idir/files/ibays") + { + mkdir "$idir/files/ibays", 0770; + print " created $idir/files/ibays\n"; + } + # we do this on every turn in case it was wrong + chown $uid, $gid,"$idir/files/ibays"; + chmod 0770, "$idir/files/ibays"; + # we proceed next only if we want the user homes + next unless ($status eq "enabled"); + # get existing mount + %localmounts = listLocalMounts; + # search for our current one + my @matching_keys = grep { $localmounts{$_}{'host'} =~ m/localhost$/ && $localmounts{$_}{'share'} =~ m/^$key$/} keys %localmounts; + + # if none create + if (scalar(@matching_keys) == 0) { + #if none create + $id = OCCr "files_external:create -c share=$key -c host=localhost -c domain=$workgroup -c root='' -c show_hidden=false -c check_acl=false -c timeout='' '$key' smb password::logincredentials --output json"; + OCC "files_external:applicable --add-user $user $id"; + push @idOK,$id; + print " created home dir for $key $user\n"; + next; + } + + if (scalar(@matching_keys) > 1) { + #if more than 1 delete all but older + print " more than one $key, deleting the latest, keeping first\n"; + while (scalar(@matching_keys) > 1){ + my $bad = pop @matching_keys; + OCC "files_external:delete -y $bad "; + } + } + $id = pop @matching_keys; + if (scalar(@{$localmounts{$id}{'applicable_groups'}}) >0 || scalar(@{$localmounts{$id}{'applicable_users'}}) >1 || scalar(@{$localmounts{$id}{'applicable_users'}}) == 0 || $localmounts{$id}{'applicable_users'}[0] ne $user) { + print " updating $key\n"; + OCC "files_external:applicable --remove-all $id"; + OCC "files_external:applicable --add-user $user $id" ; + } + push @idOK,$id; + +} + +# set cron +OCC "background:cron"; + +# and finally let's set SME admin as admin, shall we ? +my $admin = $NCusers{'admin'}; +OCC "group:adduser admin $admin"; + diff --git a/root/etc/e-smith/templates/etc/crontab/98nextcloud b/root/etc/e-smith/templates/etc/crontab/98nextcloud new file mode 100644 index 0000000..c085c5b --- /dev/null +++ b/root/etc/e-smith/templates/etc/crontab/98nextcloud @@ -0,0 +1,14 @@ +# nextcloud cron +*/5 * * * * www { + $OUT="/usr/bin/php81"; + $version="26"; + $search=qr/\s*'version'\s*=>\s*'([0-9]{2})\.[0-9]{1,2}.*/; + if ( open NC, "; + close NC; + } + $OUT="/usr/bin/php74" if $version <= 24; +} --define apc.enable_cli=1 --define memory_limit={ $memory=$nextcloud{'memory_limit'}||'1024M';} -f /usr/share/nextcloud/cron.php > /dev/null 2>&1 + +# nextcloud db update +19 2 * * * root /usr/bin/nc_dbupdate > /dev/null 2>&1 diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service55nextcloud b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service55nextcloud new file mode 100644 index 0000000..1f60a4e --- /dev/null +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service55nextcloud @@ -0,0 +1,9 @@ +[nextcloud] +enabled = true +filter = nextcloud +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] +logpath = /home/e-smith/files/nextcloud/data/nextcloud.log +maxretry = 3 +port = 80,443 +protocol = tcp + diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud new file mode 100644 index 0000000..c15389d --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98nextcloud @@ -0,0 +1,104 @@ +{ +my $access = $nextcloud{'access'} || 'private'; +my $allow = ($access eq 'public')?'all granted':"ip $localAccess $externalSSLAccess"; +my $authtype = $nextcloud{'Authentication'} || 'none'; + +my $alias = (($nextcloud{'AliasOnPrimary'} || 'enabled') eq 'enabled') ? + 'Alias /nextcloud /usr/share/nextcloud' : ''; + +my $maxupload = $nextcloud{'MaxUploadSize'} || '1024'; +my $maxpost = $maxupload+1; +$maxupload .= 'M'; +$maxpost .= 'M'; + +my $auth = ''; +if ($authtype eq 'http'){ + $auth =<<'EOF'; + + SSLRequireSSL on + AuthName "nextcloud" + AuthType Basic + AuthBasicProvider external + AuthExternal pwauth + Require valid-user + +EOF +} + +if ($nextcloud{'status'} eq 'enabled'){ + +if ((exists $php{status} and $php{status} eq "enabled") and $phpModule eq "enabled") + { + my $php =<<_EOF; + AddType application/x-httpd-php .php + php_admin_flag file_upload On + php_admin_flag magic_quotes Off + php_admin_flag magic_quotes_gpc Off + php_admin_value upload_max_filesize $maxupload + php_admin_value post_max_size $maxpost + php_admin_value memory_limit 512M + php_admin_flag output_buffering Off + php_admin_value max_execution_time 0 + php_admin_value upload_tmp_dir /var/lib/nextcloud/tmp + php_admin_value session.save_path /var/lib/nextcloud/tmp + php_admin_value session.gc_maxlifetime 86400 + php_admin_value open_basedir /usr/share/nextcloud:/var/lib/nextcloud:/var/log/nextcloud.log:/var/lib/php/nextcloud:/home/e-smith/files/nextcloud:/dev/urandom:/proc/meminfo +_EOF +} + if ($fastcgi_mod eq 'mod_proxy_fcgi'){ + my $phpversion="81"; + my $version="26"; + my $search=qr/\s*'version'\s*=>\s*'([0-9]{2})\.[0-9]{1,2}.*/; + if ( open NC, "; + close NC; + } + $phpversion="74" if $version <= 24; + + $php =<<"_EOF"; + + SetHandler "proxy:unix:/var/run/php-fpm/php${phpversion}-nextcloud.sock|fcgi://localhost" + +_EOF + } + +my $config =<<_EOF; + + Options +FollowSymLinks + AllowOverride All +$php + Require $allow +$auth + + + Dav off + + + SetEnv HOME /usr/share/nextcloud + SetEnv HTTP_HOME /usr/share/nextcloud + SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=\$1 + + + + # just in case if .htaccess gets disabled + Require all denied + +_EOF + + +$OUT .=<<"END" +# nextcloud Configuration + + Header always set Strict-Transport-Security "max-age=15552000" + +$alias + +$config + +END +} +else{ + $OUT .= "# nextcloud is disabled\n"; +} +} + diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud new file mode 100644 index 0000000..222fd34 --- /dev/null +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/28nextcloud @@ -0,0 +1,41 @@ +# +# 28nextcloud +# + +{ + my $CloudDomain = $nextcloud{'VirtualHost'} || 'none';#using CloudDomain, not to confuse for the template virtualHost variable + $OUT = ''; + if ((${'nextcloud'}{'status'} || 'disabled') eq 'enabled' ){ + + if (($port eq "80") && ($haveSSL eq 'yes')){ + $OUT .= " RewriteRule ^/nextcloud(/.*|\$) https://%{HTTP_HOST}/nextcloud\$1 [L,R=301]\n"; + } + elsif ( $CloudDomain eq "none" or $CloudDomain ne $virtualHost ) + { + $OUT .= " + RewriteEngine on + RewriteRule ^/\\.well-known/host-meta /nextcloud/public.php?service=host-meta [QSA,L] + RewriteRule ^/\\.well-known/host-meta\.json /nextcloud/public.php?service=host-meta-json [QSA,L] + #RewriteRule ^/\\.well-known/webfinger /nextcloud/public.php?service=webfinger [QSA,L] + RewriteRule ^/\\.well-known/webfinger /nextcloud/index.php/.well-known/webfinger [R=301,L] + RewriteRule ^/\\.well-known/nodeinfo /nextcloud/index.php/.well-known/nodeinfo [R=301,L] + RewriteRule ^/\\.well-known/carddav /nextcloud/remote.php/dav [R=301,L] + RewriteRule ^/\\.well-known/caldav /nextcloud/remote.php/dav [R=301,L] + RewriteRule ^/remote.php/dav /nextcloud/remote.php/dav [R=301,L]\n"; + } + elsif ( $CloudDomain eq $virtualHost ) + { + $OUT .= " + RewriteEngine on + RewriteRule ^/\\.well-known/host-meta /public.php?service=host-meta [QSA,L] + RewriteRule ^/\\.well-known/host-meta\.json /public.php?service=host-meta-json [QSA,L] + #RewriteRule ^/\\.well-known/webfinger /public.php?service=webfinger [QSA,L] + RewriteRule ^/\\.well-known/webfinger /index.php/.well-known/webfinger [R=301,L] + RewriteRule ^/\\.well-known/nodeinfo /index.php/.well-known/nodeinfo [R=301,L] + RewriteRule ^/\\.well-known/carddav /remote.php/dav [R=301,L] + RewriteRule ^/\\.well-known/caldav /remote.php/dav [R=301,L]\n"; + } + + } +} + diff --git a/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base b/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base new file mode 100644 index 0000000..9106034 --- /dev/null +++ b/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/10base @@ -0,0 +1,9 @@ +opcache.enable=1 +opcache.file_cache= /var/opt/remi/php74/lib/php/opcache +opcache.enable_cli= 1 ++opcache.interned_strings_buffer= {$nextcloud{'opcache.interned_strings_buffer'} || 64;} ++opcache.max_accelerated_files= {$nextcloud{'opcache.max_accelerated_files'} || 65406;} ++opcache.memory_consumption= {$nextcloud{'opcache.memory_consumption'} || 512;} +opcache.save_comments= 1 +opcache.revalidate_freq= 1 + diff --git a/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/template-begin b/root/etc/e-smith/templates/etc/opt/remi/php74/php.d/20-opcache.ini/template-begin new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base b/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base new file mode 100644 index 0000000..da8cb27 --- /dev/null +++ b/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/10base @@ -0,0 +1,9 @@ +opcache.enable=1 +opcache.file_cache= /var/opt/remi/php81/lib/php/opcache +opcache.enable_cli= 1 +opcache.interned_strings_buffer= {$nextcloud{'opcache.interned_strings_buffer'} || 64;} +opcache.max_accelerated_files= {$nextcloud{'opcache.max_accelerated_files'} || 65406;} +opcache.memory_consumption= {$nextcloud{'opcache.memory_consumption'} || 512;} +opcache.save_comments= 1 +opcache.revalidate_freq= 1 + diff --git a/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/template-begin b/root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/template-begin new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud new file mode 100644 index 0000000..45474f9 --- /dev/null +++ b/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15Nextcloud @@ -0,0 +1,89 @@ +{ + my $phpversion="81"; + my $version="26"; + my $search=qr/\s*'version'\s*=>\s*'([0-9]{2})\.[0-9]{1,2}.*/; + if ( open NC, "; + close NC; + } + $phpversion="74" if $version <= 24; + +if ($PHP_VERSION eq $phpversion){ + if (($nextcloud{'status'} || 'disabled') eq 'enabled'){ + my $max_upload_size = ($nextcloud{MaxUploadSize} || '4096'); + $max_upload_size .= 'M' if ($max_upload_size =~ m/^\d+$/); + my $memory_limit = ($nextcloud{MemoryLimit} || '512M'); + $memory_limit .= 'M' if ($memory_limit =~ m/^\d+$/); + my $open_basedir= $nextcloud{PHPBaseDir} || ''; + $open_basedir = "/usr/share/nextcloud:/var/lib/nextcloud:/var/log/nextcloud.log:/var/lib/php/nextcloud:/home/e-smith/files/nextcloud:/dev/urandom:/proc/meminfo:/usr/share/GeoIP/GeoLite2-Country.mmdb:/proc/cpuinfo:$open_basedir"; + my $id = 'nextcloud'; + my $max_children = $nextcloud{'PHPmaxChildren'} || 20; + my $min_spare_servers = $nextcloud{'PHPminServers'} || 4; + my $start_servers = $nextcloud{'PHPstartServers'} || 6; + my $max_spare_servers = $nextcloud{'PHPmaxServers'} || 8; + my $max_requests = $nextcloud{'PHPmaxRequests'} || 1000; + my $opcacheBuff = $nextcloud{'opcache.interned_strings_buffer'} || 64; + my $opcacheMem = $nextcloud{'opcache.memory_consumption'} || 512; + my $opcacheAccFiles = $nextcloud{'opcache.max_accelerated_files'} || 65406; + $min_spare_servers = ( $min_spare_servers > $max_spare_servers ) ? printf("%.0f",$max_spare_servers/2) : $min_spare_servers; + $start_servers = ( $start_servers > $max_spare_servers ) ? printf("%.0f", $max_spare_servers /2 + $min_spare_servers/2 ) : $start_servers; + + $OUT .=<<_EOF; + +[php$PHP_VERSION-$id] +user = www +group = www +listen.owner = root +listen.group = www +listen.mode = 0660 +listen = /var/run/php-fpm/php$PHP_VERSION-$id.sock +pm = dynamic +pm.max_children = $max_children +pm.start_servers = $start_servers +pm.min_spare_servers = $min_spare_servers +pm.max_spare_servers = $max_spare_servers +pm.max_requests = $max_requests +php_admin_value[sys_temp_dir] = /var/lib/php/$id/tmp +php_admin_value[session.save_path] = /var/lib/php/$id/session +php_admin_value[session.gc_maxlifetime] = 86400 +php_admin_value[upload_tmp_dir] = /var/lib/php/$id/tmp +php_admin_value[error_log] = /var/log/php/$id/error.log +slowlog = /var/log/php/nextcloud/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_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[open_basedir] = $open_basedir +php_admin_flag[allow_url_fopen] = on +php_admin_flag[file_upload] = on +php_admin_flag[session.cookie_httponly] = on +php_admin_flag[allow_url_include] = off +php_admin_value[session.save_handler] = files +php_admin_flag[output_buffering] = off + +; Set opcache settings +;php_value[opcache.enable]=1 ;if already set in php.d/20-opcache.ini will issue warning +; we disable file caching as it crashes opcache on php81 (/var/lib/php/$id/opcache) +; will only slow on php restart as it needs cache rebuilding instead of loading the file cache. +php_value[opcache.file_cache] = +php_value[opcache.enable_cli] = 1 +php_value[opcache.interned_strings_buffer] = $opcacheBuff +php_value[opcache.max_accelerated_files] = $opcacheAccFiles +php_value[opcache.memory_consumption] = $opcacheMem +php_value[opcache.save_comments] = 1 +php_value[opcache.revalidate_freq] = 1 +php_value[opcache.jit] = off +_EOF + + } + else{ + $OUT .= '; Nextcloud is disabled'; + } +} +} + diff --git a/root/etc/fail2ban/filter.d/nextcloud.conf b/root/etc/fail2ban/filter.d/nextcloud.conf new file mode 100644 index 0000000..69dd923 --- /dev/null +++ b/root/etc/fail2ban/filter.d/nextcloud.conf @@ -0,0 +1,5 @@ +[Definition] +failregex={"reqId":".*","remoteAddr":".*","app":"core","message":"Login failed: '.*' \(Remote IP: '\)","level":2,"time":".*"} + +ignoreregex = + diff --git a/root/etc/logrotate.d/nextcloud b/root/etc/logrotate.d/nextcloud new file mode 100644 index 0000000..f7dcf70 --- /dev/null +++ b/root/etc/logrotate.d/nextcloud @@ -0,0 +1,9 @@ +/home/e-smith/files/nextcloud/data/nextcloud.log { + compress + delaycompress + missingok + notifempty + su www www + create 640 www www +} + diff --git a/root/etc/sudoers.d/90_nextcloud b/root/etc/sudoers.d/90_nextcloud new file mode 100644 index 0000000..1663152 --- /dev/null +++ b/root/etc/sudoers.d/90_nextcloud @@ -0,0 +1 @@ +Defaults:root !requiretty diff --git a/root/home/e-smith/files/nextcloud/data/.gitignore b/root/home/e-smith/files/nextcloud/data/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/usr/bin/nc_dbupdate b/root/usr/bin/nc_dbupdate new file mode 100644 index 0000000..3fe4295 --- /dev/null +++ b/root/usr/bin/nc_dbupdate @@ -0,0 +1,5 @@ +#!/bin/bash + +/usr/bin/occ db:add-missing-indices +/usr/bin/occ db:add-missing-primary-keys +/usr/bin/occ db:convert-filecache-bigint diff --git a/root/usr/bin/occ b/root/usr/bin/occ new file mode 100644 index 0000000..8a3d4b9 --- /dev/null +++ b/root/usr/bin/occ @@ -0,0 +1,8 @@ +#!/bin/bash +majversion=$((/usr/bin/grep -Eo "'version'.*[0-9]{2}\." /usr/share/nextcloud/config/config.php 2>/dev/null || echo "26" )|/usr/bin/grep -Eo "[0-9]{2}"|head -1) +memory=$(/sbin/e-smith/config getprop nextcloud memory_limit|| echo "1024M") +myphp=/usr/bin/php81 +if [[ $majversion -le '24' ]]; then + myphp=/usr/bin/php74 +fi +/usr/sbin/runuser -u www -- $myphp -d memory_limit=$memory -d apc.enable_cli=1 /usr/share/nextcloud/occ "$@" diff --git a/root/var/lib/php/nextcloud/opcache/.gitignore b/root/var/lib/php/nextcloud/opcache/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/var/lib/php/nextcloud/session/.gitignore b/root/var/lib/php/nextcloud/session/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/root/var/lib/php/nextcloud/tmp/.gitignore b/root/var/lib/php/nextcloud/tmp/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/smeserver-nextcloud.spec b/smeserver-nextcloud.spec new file mode 100644 index 0000000..13841fd --- /dev/null +++ b/smeserver-nextcloud.spec @@ -0,0 +1,271 @@ +%define release 32 +%define version 1.2.0 + +Summary: Koozali SME Server Nextcloud configuration +Name: smeserver-nextcloud +Version: %{version} +Release: %{release}%{?dist} +License: GPL +Source: %{name}-%{version}.tar.xz + +BuildArch: noarch +URL: https://www.nextcloud.com + +BuildRequires: e-smith-devtools + +Requires: nextcloud-src >= 26.0.1 +Requires: e-smith-apache +Requires: e-smith-mysql +Requires: smeserver-webapps-common +Requires: smeserver-php >= 3.0.0-15 +Requires: samba-client +Requires: perl-JSON +Requires: perl-Exporter-Tiny +Requires: perl-Sub-Quote +Requires: php74-php-smbclient +Requires: php74-php-opcache +Requires: php74-php-pecl-apcu +Requires: php74-php-pecl-inotify +Requires: php74-php-pecl-zip +Requires: php74-php-pecl-imagick +Requires: php74-php-gmp +Requires: php81-php-smbclient +Requires: php81-php-opcache +Requires: php81-php-pecl-apcu +Requires: php81-php-pecl-inotify +Requires: php81-php-pecl-zip +Requires: php81-php-pecl-imagick +Requires: php81-php-gmp +Requires: php81-php-redis +Requires: smeserver-redis +Requires: jq +Requires: smeserver-mariadb105 +Requires: e-smith-apache >= 2.6.0-19 +Requires: smeserver-php >= 3.0.0-43 + +%description +Koozali SME Server Nextcloud files and configuration. + + +%prep +%setup +touch root/etc/e-smith/templates/etc/opt/remi/php81/php.d/20-opcache.ini/template-begin + +%build +perl createlinks + +%install +rm -rf %{buildroot} +mkdir -p root/var/log/php/nextcloud +(cd root; find . -depth -print | cpio -dump %{buildroot}) +/sbin/e-smith/genfilelist %{buildroot} \ + --dir /var/log/php/nextcloud 'attr(0755,www,www)' \ + --dir /var/lib/php/nextcloud 'attr(0755,www,www)' \ + --dir /var/lib/php/nextcloud/tmp 'attr(0755,www,www)' \ + --dir /var/lib/php/nextcloud/opcache 'attr(0755,www,www)' \ + --dir /var/lib/php/nextcloud/session 'attr(0755,www,www)' \ + --dir /home/e-smith/files/nextcloud 'attr(0755,www,www)' \ + --dir /home/e-smith/files/nextcloud/data 'attr(0755,www,www)' \ + --ignoredir "/etc/sudoers.d" \ + --file "/etc/sudoers.d/90_nextcloud" "attr(0440,root,root)" \ + --file /usr/bin/occ 'attr(0755,root,root)'\ + --file /usr/bin/nc_dbupdate 'attr(0755,root,root)'\ + > %{name}-%{version}-filelist + +cat %{name}-%{version}-filelist +%files -f %{name}-%{version}-filelist +%defattr(-,root,root) +%doc COPYING + + +%changelog +* Sat Sep 07 2024 cvs2git.sh aka Brian Read 1.2.0-32.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. + +* Thu May 16 2024 Jean-Philippe Pialasse 1.2.0-31.sme +- fix php version on initial install [SME: 12685] + +* Fri Apr 12 2024 Jean-Philippe Pialasse 1.2.0-30.sme +- add maintenance windows start [SME: 12611] + increase frequency of cron task every 5 min +- fix missing full path [SME: 12486] + +* Mon Jan 29 2024 Jean-Philippe Pialasse 1.2.0-29.sme +- require nextcloud-src >= 26 [SME: 12318] + multiple fixes and rewrites +- restore default log level [SME: 12412] + +* Sat Sep 09 2023 Jean-Philippe Pialasse 1.2.0-28.sme +- workaround opcache segfault with php 81 using in memory only [SME: 12298] +- index file cache using Redis [SME: 12401] + +* Sat Sep 09 2023 John Crisp 1.2.0-27.sme +- Fix syntax error in 20opcache.ini [SME: 12298] + +* Sat Aug 19 2023 Jean-Philippe Pialasse 1.2.0-26.sme +- fix missing template-begin + +* Tue Aug 08 2023 Jean-Philippe Pialasse 1.2.0-25.sme +- make php81 compatible for NC 25 and higher [SME: 12298] +- requires php81-redis [SME: 12401] +- recognize need cpuinfo access [SME: 12339 ] +- remove simple signup link [SME: 12329] + +* Wed Feb 08 2023 Jean-Philippe Pialasse 1.2.0-24.sme +- increase action script speed [SME: 12319] + +* Sat Jan 21 2023 Jean-Philippe Pialasse 1.2.0-23.sme +- typo fix [SME: 11890] + +* Wed Jan 11 2023 Jean-Philippe Pialasse 1.2.0-22.sme +- use of runuser in place of sudo -u [SME: 11890] + usage of /usr/bin/occ where possible + removal of /usr/bin/OCC + +* Mon Jan 09 2023 Jean-Philippe Pialasse 1.2.0-21.sme +- update disabled_fucntions list [SME: 12277] +- allow customization of opcache for Nextcloud see wiki [SME: 12299] +- actions scripts update + +* Wed Nov 23 2022 Jean-Philippe Pialasse 1.2.0-20.sme +- set overwrite.cli.url [SME: 12208] +- allow shell_exec [SME: 12187] +- fix username conflict with group name [SME: 12241] + +* Sat Jul 30 2022 Brian Read 1.2.0-19.sme +- Re-build and link to latest devtools [SME: 11997] + +* Fri Jul 08 2022 Jean-Philippe Pialasse 1.2.0-18.sme +- update httpd fragment for httpd2.4 syntax [SME: 12053] + +* Fri Jul 08 2022 Jean-Philippe Pialasse 1.2.0-17.sme +- Re-build and link to latest devtools gencache again [SME: 12096] +- Re-build and link to latest devtools ldap users/groups not availables on first run [SME: 12095] + +* Thu Jul 07 2022 Jean-Philippe Pialasse 1.2.0-16.sme +- migrate property CloudDomain to VirtualHost [SME: 11918] +- use mariadb105 on new installs [SME: 11343] +- update rewriterules [SME: 11972] +- update to NC24 [SME: 12094] + use a nextcloud-src rpm and avoid conflicts between web and rpm updates +- add to backup [SME: 12016] + +* Fri May 20 2022 Terry Fage 1.2.0-15.sme +- Re-build and link to latest devtools cron syntax error [SME: 11854] + +* Wed May 18 2022 Jean-Philippe Pialasse 1.2.0-14.sme +- Re-build and link to latest devtools gencache_init failed [SME: 11855] + fix missing nextcloud-conf action in update event + +* Wed May 18 2022 Jean-Philippe Pialasse 1.2.0-12.sme +- use php_pecl-apcu for cli [SME: 11920] +- db update of keys and indexes [SME: 11854] +- few nextcloud-occ-conf fixes [SME: 11973] + make occ used in scripts rather than OCC + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-11.sme +- Re-build and link to latest devtools logrotate error [SME: 11172] +- Re-build and link to latest devtools noise in error log + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-9.sme +- Re-build and link to latest devtools dav redirections for domain use and subdir [SME: 11086] +- refresh externalfs on loading, best for ibays +- tidying + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-8.sme +- add update event [SME: 11086] +- add occ as hard link of OCC + +* Fri Dec 18 2020 John Crisp 1.2.0-7.sme +- Fix typo in php pool template [SME: 11268] + +* Tue Dec 01 2020 John Crisp 1.2.0-6.sme +- Add a check for the Min/Max/Start servers [SME: 11171] +- https://bugs.contribs.org/show_bug.cgi?id=11171#c4 + +* Mon Nov 16 2020 John Crisp 1.2.0-5.sme +- Template missing Min/Start/Max Servers and Children [SME: 11171] + +* Thu Nov 12 2020 John Crisp 1.2.0-4.sme +- Add missing SMB configuration details including domain/workgroup + +* Mon Nov 09 2020 John Crisp 1.2.0-3.sme +- Fix sudoer file permissions in file list +- Fix some install bugs +- typo in httpd.conf +- switch db from mysql to maria db +- update php version +- add Requires + +* Sun Nov 08 2020 Jean-Philipe Pialasse 1.2.0-2.sme +- use username as id in place of ldap uuid [SME: 10876] + +* Sun Nov 08 2020 Jean-Philipe Pialasse 1.2.0-1.sme +- initial SME10 import [SME: 11086] + +* Sun Nov 08 2020 Jean-Philipe Pialasse 1.1.0-19.sme +- use php73-fpm [SME: 11003] +- Require php-gmp for Nextcloud 19 and newer [SME: 11004] +- add phpbasedir support so you can add individual access to dir or files [SME: 11083] + simply use nextcloud PHPBaseDir property +- increase FastCgiExternalServer php pool timeout to 300 [SME: 11084] +- ease use of a dedicated domaine with https [SME: 10885] + +* Mon Jan 27 2020 Jean-Philipe Pialasse 1.1.0-16.sme +- Re-build and link to latest devtools missing Requirement and template-begins [SME: 10852] + +* Mon Dec 16 2019 Jean-Philipe Pialasse 1.1.0-15.sme +- use php72-fpm instead of php71-fpm [SME: 10852] + +* Sun Feb 17 2019 Jean-Philipe Pialasse 1.1.0-14.sme +- Re-build and link to latest devtools 512MB error on events [SME: 10728] +- add requirement for inotify support [SME: 10733] + +* Wed Jan 16 2019 Jean-Philipe Pialasse 1.1.0-13.sme +- Re-build and link to latest devtools /.well-known check [SME: 10709] +- created a OCC command you can call as root as if you were the right user. [SME: 10711] +- night cron to fix db [SME: 10710 ] + +* Mon Jan 07 2019 Jean-Philipe Pialasse 1.1.0-11.sme +- increase memory limit to new default from 128M to 512M [SME: 10695] + add property to nextcloud db key MemoryLimit to set to local value if needed. + +* Thu Dec 20 2018 Jean-Philipe Pialasse 1.1.0-10.sme +- Re-build and link to latest devtools /var/log/php/nextcloud/ is missing [SME: 10601] + +* Wed Dec 19 2018 Jean-Philipe Pialasse 1.1.0-9.sme +- Re-build and link to latest devtools timeout on update [SME: 10596] + +* Wed Jul 04 2018 Jean-Philipe Pialasse 1.1.0-8.sme +- Re-build and link to latest devtools wrong filter name for fail2ban jail.conf [SME: 10608] + +* Wed Apr 11 2018 Jean-Philipe Pialasse 1.1.0-7.sme +- Re-build and link to latest devtools long update [SME: 10564] +- Re-build and link to latest devtools IncludeIbay not working. + +* Wed Apr 11 2018 Jean-Philipe Pialasse 1.1.0-6.sme +- Re-build and link to latest devtools shares not correctly handled [SME: 10564] +- improve shares support +- reload file cache after creation of ibays folder, so it displays to users. +- improve output to message log + +* Mon Apr 09 2018 Jean-Philipe Pialasse 1.1.0-5.sme +- Re-build and link to latest devtools signal-event nextcloud-update hang [SME: 10560] + +* Sun Apr 08 2018 Jean-Philipe Pialasse 1.1.0-4.sme +- Re-build and link to latest devtools wrong logrotate option [SME: 10560] +- change password storage mode for smb share to allow access from portable devices [SME: 10558] +- create the "ibays" main folder to mount all ibays in every user nextcloud space [SME: 10557] +- add Shared folders in nextcloud under the ibays folder [SME: 10559] + +* Sat Apr 07 2018 Jean-Philipe Pialasse 1.1.0-3.sme +- tidying templates, set cron update +- Re-build and link to latest devtools bad folder name for ibays [SME: 10556] + +* Fri Mar 30 2018 Jean-Philipe Pialasse 1.1.0-1.sme +- initial release +