From 7ae9ca322aee0315dbcec13cc5c18b74ab27e0cb Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:43:37 +0200 Subject: [PATCH 01/58] Applly example_ynh to readme --- README.md | 48 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 9212b7f..1790a7e 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Webtrees for YunoHost [![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) -[![Install webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=webtrees) +[![Install Webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=webtrees) + +> *This package allow you to install >ebtrees quickly and simply on a YunoHost server. +If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* **VERY IMPORTANT: There is a security fix in nginx. Please update as soon as posible regarless of any version you are on.** -Leading on-line collaborative genealogy application https://www.webtrees.net
-version: **1.7.13**, released **9 March 2019**
,
- -## Introduction +## Overview webtrees is the web's leading online collaborative genealogy application. @@ -18,8 +18,19 @@ webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin pannel when new version arrives.

-Demo:https://dev.webtrees.net/demo-dev/index.php?ctype=gedcom&ged=demo
-
+**Shipped version:** 1.7.13, released **9 March 2019** + +## Demo + +* [Official demo](https://dev.webtrees.net/demo-dev/index.php?ctype=gedcom&ged=demo) +## Documentation + + * Official documentation: https://wiki.webtrees.net + +## YunoHost specific features + +#### Multi-users support + No LDAP configuration is there for Webtrees yet.
Multi-instance: **yes** @@ -28,3 +39,26 @@ Multi-instance: **yes** * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/webtrees%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/webtrees/) + + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues + * App website: https://www.webtrees.net + * Git repository: https://github.com/fisharebest/webtrees + * YunoHost website: https://yunohost.org/ + +--- + +Developers info +---------------- + +**Only if you want to use a testing branch for coding, instead of merging directly into master.** +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +or +sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +``` From 94b60818be15c0731c1e3b03bcc3bdb9d92d5050 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:46:26 +0200 Subject: [PATCH 02/58] Fix license --- LICENSE | 678 +++++++++++++++++++++++++++++++++++++++++++++++++- manifest.json | 2 +- 2 files changed, 675 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 8e12a33..8f366df 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,677 @@ - Copyright (C) 2019 webtrees development team +GNU GENERAL PUBLIC LICENSE +========================== -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +Version 3, 29 June 2007 -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. + Copyright 2007 Free Software Foundation, Inc. <> -You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/. + 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 works +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 works +users, your or third parties legal rights to forbid circumvention of +technological measures. + +### 4. Conveying Verbatim Copies. + +You may convey verbatim copies of the Programs 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 compilations 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 contributors contributor version. + + A contributors 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 contributors 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 recipients 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 proxys +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 programs 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/manifest.json b/manifest.json index feeff13..abc567b 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version":"1.7.13~ynh1", "url": "https://www.webtrees.net", - "license": "GNU", + "license": "GPL-3.0-or-later", "maintainer": { "name": "Anmol Sharma", "email": "anmol@datamol.org" From 0898a0629bd451cc3d74574956ca41ae84faec97 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:50:10 +0200 Subject: [PATCH 03/58] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index abc567b..3a598ac 100644 --- a/manifest.json +++ b/manifest.json @@ -40,7 +40,7 @@ "en": "Choose a path for Webtrees", "fr": "Choisissez un chemin pour Webtrees" }, - "example": "/example", + "example": "/webtrees", "default": "/webtrees" }, { From 5086c146dc562ef825086da1fc68def3d746fdc5 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:50:19 +0200 Subject: [PATCH 04/58] Duplicate --- scripts/install | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/scripts/install b/scripts/install index 380364b..2aa61b9 100755 --- a/scripts/install +++ b/scripts/install @@ -46,18 +46,6 @@ admin_password=$(openssl passwd -1 -salt xyz $password) ### db names, ... app=$YNH_APP_INSTANCE_NAME -### If it's a multi-instance app, meaning it can be installed several times independently -### The id of the app as stated in the manifest is available as $YNH_APP_ID -### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) -### The app instance name is available as $YNH_APP_INSTANCE_NAME -### - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample -### - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 -### - ynhexample__{N} for the subsequent installations, with N=3,4, ... -### The app instance name is probably what interests you most, since this is -### guaranteed to be unique. This is a good unique identifier to define installation path, -### db names, ... -app=$YNH_APP_INSTANCE_NAME - #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= From 682acf74628095214a8e195b02643b87166802a6 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:52:01 +0200 Subject: [PATCH 05/58] remove not needed ynh_clean_setup --- scripts/backup | 4 ---- scripts/install | 4 ---- scripts/restore | 4 ---- 3 files changed, 12 deletions(-) diff --git a/scripts/backup b/scripts/backup index c2a6a4d..aa6eb48 100755 --- a/scripts/backup +++ b/scripts/backup @@ -14,10 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/install b/scripts/install index 2aa61b9..d92ad09 100755 --- a/scripts/install +++ b/scripts/install @@ -13,10 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - ### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors diff --git a/scripts/restore b/scripts/restore index 109ee4b..d8905c7 100644 --- a/scripts/restore +++ b/scripts/restore @@ -14,10 +14,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -ynh_clean_setup () { - #### Remove this function if there's nothing to clean before calling the remove script. - true -} # Exit if an error occurs during the execution of the script ynh_abort_if_errors From edc07a02a5d2725eca82120abbdf1ede224b2048 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:54:06 +0200 Subject: [PATCH 06/58] removing comments --- scripts/install | 53 ------------------------------------------------- scripts/upgrade | 2 -- 2 files changed, 55 deletions(-) diff --git a/scripts/install b/scripts/install index d92ad09..2795f2f 100755 --- a/scripts/install +++ b/scripts/install @@ -30,16 +30,6 @@ admin_email=$YNH_APP_ARG_EMAIL password=$(ynh_string_random 24) admin_password=$(openssl passwd -1 -salt xyz $password) -### If it's a multi-instance app, meaning it can be installed several times independently -### The id of the app as stated in the manifest is available as $YNH_APP_ID -### The instance number is available as $YNH_APP_INSTANCE_NUMBER (equals "1", "2", ...) -### The app instance name is available as $YNH_APP_INSTANCE_NAME -### - the first time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample -### - the second time the app is installed, YNH_APP_INSTANCE_NAME = ynhexample__2 -### - ynhexample__{N} for the subsequent installations, with N=3,4, ... -### The app instance name is probably what interests you most, since this is -### guaranteed to be unique. This is a good unique identifier to define installation path, -### db names, ... app=$YNH_APP_INSTANCE_NAME #================================================= @@ -47,8 +37,6 @@ app=$YNH_APP_INSTANCE_NAME #================================================= ynh_print_info "Validating installation parameters..." -### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". -### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app" final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" @@ -70,10 +58,6 @@ ynh_app_setting_set $app path $path_url #================================================= ynh_print_info "Setting up source files..." -### `ynh_setup_source` is used to install an app from a zip or tar.gz file, -### downloaded from an upstream source, like a git repository. -### `ynh_setup_source` use the file conf/app.src - ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" @@ -83,14 +67,6 @@ ynh_setup_source "$final_path" #================================================= ynh_print_info "Installing dependencies..." -### `ynh_install_app_dependencies` allows you to add any "apt" dependencies to the package. -### Those deb packages will be installed as dependencies of this package. -### If you're not using this helper: -### - Remove the section "REMOVE DEPENDENCIES" in the remove script -### - Remove the variable "pkg_dependencies" in _common.sh -### - As well as the section "REINSTALL DEPENDENCIES" in the restore script -### - And the section "UPGRADE DEPENDENCIES" in the upgrade script - ynh_install_app_dependencies $pkg_dependencies #================================================= @@ -98,15 +74,6 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_print_info "Creating a MySQL database..." -### Use these lines if you need a database for the application. -### `ynh_mysql_setup_db` will create a database, an associated user and a ramdom password. -### The password will be stored as 'mysqlpwd' into the app settings, -### and will be available as $db_pwd -### If you're not using these lines: -### - Remove the section "BACKUP THE MYSQL DATABASE" in the backup script -### - Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script -### - As well as the section "RESTORE THE MYSQL DATABASE" in the restore script - db_name=$(ynh_sanitize_dbid $app) ynh_app_setting_set $app db_name $db_name ynh_mysql_setup_db $db_name $db_name @@ -115,9 +82,6 @@ ynh_mysql_setup_db $db_name $db_name # MODIFY A CONFIG FILE #================================================= -### `ynh_replace_string` is used to replace a string in a file. -### (It's compatible with sed regular expressions syntax) - # Adding the details of the database to the config file ynh_replace_string "__dbuser__" "$db_name" "../conf/config.ini.php" ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" @@ -142,8 +106,6 @@ ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" #================================================= ynh_print_info "Configuring nginx web server..." -### `ynh_add_nginx_config` will use the file conf/nginx.conf - # Create a dedicated nginx config ynh_add_nginx_config @@ -160,17 +122,6 @@ ynh_system_user_create $app #================================================= ynh_print_info "Configuring php-fpm..." -### `ynh_add_fpm_config` is used to set up a PHP config. -### You can remove it if your app doesn't use PHP. -### `ynh_add_fpm_config` will use the files conf/php-fpm.conf and conf/php-fpm.ini -### If you're not using these lines: -### - You can remove these files in conf/. -### - Remove the section "BACKUP THE PHP-FPM CONFIGURATION" in the backup script -### - Remove also the section "REMOVE PHP-FPM CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE PHP-FPM CONFIGURATION" in the restore script -### With the reload at the end of the script. -### - And the section "PHP-FPM CONFIGURATION" in the upgrade script - # Create a dedicated php-fpm config ynh_add_fpm_config @@ -185,10 +136,6 @@ sudo chmod -R 700 $final_path/data # STORE THE CONFIG FILE CHECKSUM #================================================= -### `ynh_store_file_checksum` is used to store the checksum of a file. -### That way, during the upgrade script, by using `ynh_backup_if_checksum_is_different`, -### you can make a backup of this file before modifying it again if the admin had modified it. - # Calculate and store the config file checksum into the app settings ynh_store_file_checksum "$final_path/data/config.ini.php" diff --git a/scripts/upgrade b/scripts/upgrade index 290185b..629c429 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -119,8 +119,6 @@ ynh_add_fpm_config # ... #================================================= -### Verify the checksum of a file, stored by `ynh_store_file_checksum` in the install script. -### And create a backup of this file if the checksum is different. So the file will be backed up if the admin had modified it. ynh_backup_if_checksum_is_different "$final_path/data/config.ini.php" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum "$final_path/data/config.ini.php" From 00fc9fa3ab1824f47519816baaa2886d269ac17b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:55:45 +0200 Subject: [PATCH 07/58] reorder --- scripts/_common.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 48ee913..2beee30 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,5 +1,12 @@ #!/bin/bash +#================================================= +# COMMON VARIABLES +#================================================= + +# dependencies used by the app +pkg_dependencies="php-gd php-xml mailutils " + # ============= FUTURE YUNOHOST HELPER ============= # Delete a file checksum from the app settings # @@ -12,12 +19,6 @@ ynh_delete_file_checksum () { ynh_app_setting_delete $app $checksum_setting_name } -#================================================= -# COMMON VARIABLES -#================================================= - -# dependencies used by the app -pkg_dependencies="php-gd php-xml mailutils " # Send an email to inform the administrator # From d6549c9aec3441c4ed1552fd518d91881352b2ee Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:56:36 +0200 Subject: [PATCH 08/58] Update _common.sh --- scripts/_common.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2beee30..0d55ccb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,18 @@ # dependencies used by the app pkg_dependencies="php-gd php-xml mailutils " -# ============= FUTURE YUNOHOST HELPER ============= +#================================================= +# PERSONAL HELPERS +#================================================= + +#================================================= +# EXPERIMENTAL HELPERS +#================================================= + +#================================================= +# FUTURE OFFICIAL HELPERS +#================================================= + # Delete a file checksum from the app settings # # $app should be defined when calling this helper From c8a3a1bfd002b090388ae1551ae025e78d4ab897 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:57:31 +0200 Subject: [PATCH 09/58] reorder --- scripts/install | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 2795f2f..ab21410 100755 --- a/scripts/install +++ b/scripts/install @@ -52,16 +52,6 @@ ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path_url - -#================================================= -# DOWNLOAD, CHECK AND UNPACK SOURCE -#================================================= -ynh_print_info "Setting up source files..." - -ynh_app_setting_set $app final_path $final_path -# Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source "$final_path" - #================================================= # INSTALL DEPENDENCIES #================================================= @@ -78,6 +68,15 @@ db_name=$(ynh_sanitize_dbid $app) ynh_app_setting_set $app db_name $db_name ynh_mysql_setup_db $db_name $db_name +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= +ynh_print_info "Setting up source files..." + +ynh_app_setting_set $app final_path $final_path +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source "$final_path" + #================================================= # MODIFY A CONFIG FILE #================================================= From c7e4db187ad8daa050c172255657690aa53d8241 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:57:59 +0200 Subject: [PATCH 10/58] reorder --- scripts/install | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index ab21410..136f4b1 100755 --- a/scripts/install +++ b/scripts/install @@ -77,6 +77,14 @@ ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_print_info "Configuring nginx web server..." + +# Create a dedicated nginx config +ynh_add_nginx_config + #================================================= # MODIFY A CONFIG FILE #================================================= @@ -100,14 +108,6 @@ ynh_replace_string "__PASSWORD__" "$admin_password" "../conf/sql/admin.sql" ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_print_info "Configuring nginx web server..." - -# Create a dedicated nginx config -ynh_add_nginx_config - #================================================= # CREATE DEDICATED USER #================================================= From 3f638e9f75e0d3b75e05306102f62cb27bccbc9c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:58:41 +0200 Subject: [PATCH 11/58] reorder --- scripts/install | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/scripts/install b/scripts/install index 136f4b1..3bfddfc 100755 --- a/scripts/install +++ b/scripts/install @@ -85,29 +85,6 @@ ynh_print_info "Configuring nginx web server..." # Create a dedicated nginx config ynh_add_nginx_config -#================================================= -# MODIFY A CONFIG FILE -#================================================= - -# Adding the details of the database to the config file -ynh_replace_string "__dbuser__" "$db_name" "../conf/config.ini.php" -ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" -ynh_replace_string "__dbname__" "$db_name" "../conf/config.ini.php" - -# Copy the config file to the final path -sudo cp ../conf/config.ini.php $final_path/data/. - -# Load initial SQL into the new database -ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" - -# Replace variables in sql scripts -ynh_replace_string "__USER_NAME__" "$admin_username" "../conf/sql/admin.sql" -ynh_replace_string "__NAME__" "$admin_name" "../conf/sql/admin.sql" -ynh_replace_string "__USER_EMAIL__" "$admin_email" "../conf/sql/admin.sql" -ynh_replace_string "__PASSWORD__" "$admin_password" "../conf/sql/admin.sql" - -ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" - #================================================= # CREATE DEDICATED USER #================================================= @@ -131,6 +108,29 @@ ynh_add_fpm_config chown -R $app: $final_path sudo chmod -R 700 $final_path/data +#================================================= +# MODIFY A CONFIG FILE +#================================================= + +# Adding the details of the database to the config file +ynh_replace_string "__dbuser__" "$db_name" "../conf/config.ini.php" +ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" +ynh_replace_string "__dbname__" "$db_name" "../conf/config.ini.php" + +# Copy the config file to the final path +sudo cp ../conf/config.ini.php $final_path/data/. + +# Load initial SQL into the new database +ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" + +# Replace variables in sql scripts +ynh_replace_string "__USER_NAME__" "$admin_username" "../conf/sql/admin.sql" +ynh_replace_string "__NAME__" "$admin_name" "../conf/sql/admin.sql" +ynh_replace_string "__USER_EMAIL__" "$admin_email" "../conf/sql/admin.sql" +ynh_replace_string "__PASSWORD__" "$admin_password" "../conf/sql/admin.sql" + +ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" + #================================================= # STORE THE CONFIG FILE CHECKSUM #================================================= From 0f406b6ff09eab9a973f99c6711644a08fd24bfc Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 04:59:41 +0200 Subject: [PATCH 12/58] reorder --- scripts/install | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 3bfddfc..e832cb3 100755 --- a/scripts/install +++ b/scripts/install @@ -101,13 +101,6 @@ ynh_print_info "Configuring php-fpm..." # Create a dedicated php-fpm config ynh_add_fpm_config -#================================================= -# SET RIGHT PERMISSION FOR APP -#================================================= - -chown -R $app: $final_path -sudo chmod -R 700 $final_path/data - #================================================= # MODIFY A CONFIG FILE #================================================= @@ -138,6 +131,13 @@ ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" # Calculate and store the config file checksum into the app settings ynh_store_file_checksum "$final_path/data/config.ini.php" +#================================================= +# SET RIGHT PERMISSION FOR APP +#================================================= + +chown -R $app: $final_path +sudo chmod -R 700 $final_path/data + #================================================= # SETUP SSOWAT #================================================= From 284602213a557c33e7f47b2ed5ecb830526e32c8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:00:01 +0200 Subject: [PATCH 13/58] Update install --- scripts/install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index e832cb3..ad1ab49 100755 --- a/scripts/install +++ b/scripts/install @@ -132,9 +132,12 @@ ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" ynh_store_file_checksum "$final_path/data/config.ini.php" #================================================= -# SET RIGHT PERMISSION FOR APP +# GENERIC FINALIZATION +#================================================= +# SECURE FILES AND DIRECTORIES #================================================= +# Set permissions to app files chown -R $app: $final_path sudo chmod -R 700 $final_path/data From a5de60cd9faf48e71363910bad35b54353b8983b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:01:14 +0200 Subject: [PATCH 14/58] spacing --- scripts/install | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/install b/scripts/install index ad1ab49..775fd90 100755 --- a/scripts/install +++ b/scripts/install @@ -160,7 +160,6 @@ ynh_print_info "Reloading nginx web server..." systemctl reload nginx - #================================================= # SEND A README FOR THE ADMIN #================================================= @@ -176,10 +175,8 @@ If you facing an issue or want to improve this app, please open a new issue in t ynh_send_readme_to_admin "$message" - #================================================= # END OF SCRIPT #================================================= ynh_print_info "Installation of $app completed" - From 01827f1bac428be3cab69b9b05e9480016625d56 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:02:28 +0200 Subject: [PATCH 15/58] remove not needed db_pwd --- scripts/backup | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/backup b/scripts/backup index aa6eb48..b970cec 100755 --- a/scripts/backup +++ b/scripts/backup @@ -27,7 +27,6 @@ app=$YNH_APP_INSTANCE_NAME final_path=$(ynh_app_setting_get $app final_path) domain=$(ynh_app_setting_get $app domain) db_name=$(ynh_app_setting_get $app db_name) -db_pwd=$(ynh_app_setting_get $app mysqlpwd) #================================================= # STANDARD BACKUP STEPS From 94cf11987f9a2c49ae1800295c8409e18d83107d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:04:18 +0200 Subject: [PATCH 16/58] add mssing restore users --- scripts/restore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/restore b/scripts/restore index d8905c7..034e48c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -63,6 +63,13 @@ ynh_print_info "Recreating the dedicated system user..." # Create the dedicated user (if not existing) ynh_system_user_create $app +#================================================= +# RESTORE USER RIGHTS +#================================================= + +# Restore permissions on app files +chown -R $app: $final_path + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= From afc73d305c94e1677bf5e63c1486cbeb043862a6 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:05:19 +0200 Subject: [PATCH 17/58] reorder --- scripts/restore | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/scripts/restore b/scripts/restore index 034e48c..e3f8b14 100644 --- a/scripts/restore +++ b/scripts/restore @@ -67,8 +67,9 @@ ynh_system_user_create $app # RESTORE USER RIGHTS #================================================= -# Restore permissions on app files -chown -R $app: $final_path +# Restore permissions to app files +sudo chown -R $app: "${final_path}" +sudo chmod -R 700 $final_path/data #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -86,15 +87,6 @@ ynh_print_info "Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies -#================================================= -# RESTORE USER RIGHTS -#================================================= - -# Restore permissions to app files - -sudo chown -R $app: "${final_path}" -sudo chmod -R 700 $final_path/data - #================================================= # RESTORE THE MYSQL DATABASE #================================================= From 4b75deb40843e219f726fd04e6908202d3ce0f59 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:05:58 +0200 Subject: [PATCH 18/58] spacing --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 629c429..05f9ebb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,7 +49,6 @@ if [ -z $final_path ]; then ynh_app_setting_set $app final_path $final_path fi - #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From 9cb895b9a075396a7a9b31e98e676f95e0ef372e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:06:19 +0200 Subject: [PATCH 19/58] spacing --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index 05f9ebb..86c8b51 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -112,6 +112,7 @@ ynh_print_info "Upgrading php-fpm configuration..." # Create a dedicated php-fpm config ynh_add_fpm_config + #================================================= # SPECIFIC UPGRADE #================================================= From 94d5e6f993e31ae508326c52977fb9a57844d3c1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:07:29 +0200 Subject: [PATCH 20/58] reorder --- conf/nginx.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 5891e39..6abc79a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,13 +3,14 @@ location __PATH__ { # Path to source alias __FINALPATH__/ ; - # Example PHP configuration (remove if not used) - index index.php; - if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } + + # Example PHP configuration (remove if not used) + index index.php; + # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file #client_max_body_size 50M; From bc1aba9a754afeac96fedf2a5cb7c263abd94512 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:07:55 +0200 Subject: [PATCH 21/58] remove comment --- conf/nginx.conf | 2 -- 1 file changed, 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6abc79a..8798f65 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -8,7 +8,6 @@ location __PATH__ { rewrite ^ https://$server_name$request_uri? permanent; } - # Example PHP configuration (remove if not used) index index.php; # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file @@ -31,7 +30,6 @@ location __PATH__ { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } - # PHP configuration end # Include SSOWAT user panel. From 8f3890b25215c48e868e9314103a54eb3c5959c4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:08:35 +0200 Subject: [PATCH 22/58] spelling --- conf/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 8798f65..aed2a50 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,7 +10,7 @@ location __PATH__ { index index.php; - # Common parameter to increase upload size limit in conjuction with dedicated php-fpm file + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; try_files $uri $uri/ index.php; From 4e00d6219c9519cb0509ae23372e4572be3d2786 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:09:25 +0200 Subject: [PATCH 23/58] comments --- conf/nginx.conf | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index aed2a50..85a120a 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -3,7 +3,7 @@ location __PATH__ { # Path to source alias __FINALPATH__/ ; - + # Force usage of https if ($scheme = http) { rewrite ^ https://$server_name$request_uri? permanent; } @@ -18,19 +18,12 @@ location __PATH__ { fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; - # Filename to be changed if dedicated php-fpm process is required - # This is to be used INSTEAD of line above - # Don't forget to adjust scripts install/upgrade/remove/backup accordingly - # - #fastcgi_pass unix:/var/run/php5-fpm-YNH_WWW_APP.sock; - fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; - } - + } # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; From cbdc0c1a3b37b2e3d288c3f52d8a6c75dbc21083 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:09:43 +0200 Subject: [PATCH 24/58] apply example_ynh --- conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 85a120a..4b18c6c 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,4 +1,5 @@ -location __PATH__ { +#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; +location __PATH__/ { # Path to source alias __FINALPATH__/ ; From 5282bac5b94b8d300008411bd2e3dcc7f3a0ad30 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:10:05 +0200 Subject: [PATCH 25/58] spacing --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 0d55ccb..3db18de 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="php-gd php-xml mailutils " +pkg_dependencies="php-gd php-xml mailutils" #================================================= # PERSONAL HELPERS From 26d60a2e8385d8b581fe6d8e3b7e717c09f2eb96 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 18 Apr 2019 05:17:00 +0200 Subject: [PATCH 26/58] spacing --- README.md | 1 - conf/sql/webtrees.sql | 1 - scripts/_common.sh | 1 - scripts/upgrade | 1 - 4 files changed, 4 deletions(-) diff --git a/README.md b/README.md index 1790a7e..3314a1e 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,6 @@ Multi-instance: **yes** * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) * Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/webtrees%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/webtrees/) - ## Links * Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues diff --git a/conf/sql/webtrees.sql b/conf/sql/webtrees.sql index 07b2c33..7c9faa5 100644 --- a/conf/sql/webtrees.sql +++ b/conf/sql/webtrees.sql @@ -10,7 +10,6 @@ SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; SET time_zone = "+00:00"; - /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; /*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; diff --git a/scripts/_common.sh b/scripts/_common.sh index 3db18de..b1415ed 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -30,7 +30,6 @@ ynh_delete_file_checksum () { ynh_app_setting_delete $app $checksum_setting_name } - # Send an email to inform the administrator # # usage: ynh_send_readme_to_admin app_message [recipients] diff --git a/scripts/upgrade b/scripts/upgrade index 86c8b51..20e4653 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -16,7 +16,6 @@ ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME - # Retrieve app settings domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path) From e3387394c6826ac3aaaa16dc0eddf1fbb723a8f3 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:31:22 +0100 Subject: [PATCH 27/58] fix license --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index feeff13..58b27c1 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version":"1.7.13~ynh1", "url": "https://www.webtrees.net", - "license": "GNU", + "license": " GPL-3.0-or-later", "maintainer": { "name": "Anmol Sharma", "email": "anmol@datamol.org" From af31c9dbcd08ab058bf1c3ba529d2a8c6cb2af3a Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:35:58 +0100 Subject: [PATCH 28/58] fix few mistake in manifest.json --- manifest.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifest.json b/manifest.json index 58b27c1..81f9ce4 100644 --- a/manifest.json +++ b/manifest.json @@ -45,6 +45,7 @@ }, { "name": "username", + "type": "string", "ask": { "en": "Choose an admin username (Not a LDAP User)", "fr": "Choisissez un nom d'utilisateur pour l'administrateur de Webtrees (ne doit pas être un utilisateur YunoHost existant)" @@ -53,6 +54,7 @@ }, { "name": "name", + "type": "string", "ask": { "en": "Name of the user (Not a LDAP User)", "fr": "Nom de cet utilisateur" @@ -61,6 +63,7 @@ }, { "name": "email", + "type": "string", "ask": { "en": "Admin email (All the new registration will be sent on this email)", "fr": "Adresse email de l'administrateur (Toutes les nouvelles inscriptions seront envoyées à cette adresse)" From 2c4c0b124806d5513f2e3c951ac4513f49d6ba0c Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:37:18 +0100 Subject: [PATCH 29/58] sudo is not necessary, script run as root --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 380364b..2eb3d59 100755 --- a/scripts/install +++ b/scripts/install @@ -140,7 +140,7 @@ ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" ynh_replace_string "__dbname__" "$db_name" "../conf/config.ini.php" # Copy the config file to the final path -sudo cp ../conf/config.ini.php $final_path/data/. +cp ../conf/config.ini.php $final_path/data/. # Load initial SQL into the new database ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" @@ -195,7 +195,7 @@ ynh_add_fpm_config #================================================= chown -R $app: $final_path -sudo chmod -R 700 $final_path/data +chmod -R 700 $final_path/data #================================================= # STORE THE CONFIG FILE CHECKSUM From 9b6f9b14bcabc9796a0ef9066b60e85e384c41ff Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:38:47 +0100 Subject: [PATCH 30/58] sudo is not necessary, script run as root --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 290185b..544775f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -72,16 +72,16 @@ ynh_abort_if_errors ynh_print_info "Upgrading source files..." # Move old app dir -sudo mv ${final_path} ${final_path}.old +mv ${final_path} ${final_path}.old # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" # restore data -sudo cp -a ${final_path}.old/data ${final_path} +cp -a ${final_path}.old/data ${final_path} # delete temp directory -sudo rm -Rf ${final_path}.old +rm -Rf ${final_path}.old #================================================= # NGINX CONFIGURATION @@ -133,7 +133,7 @@ ynh_store_file_checksum "$final_path/data/config.ini.php" # Set permissions on app files chown -R $app: $final_path -sudo chmod -R 700 $final_path/data +chmod -R 700 $final_path/data #================================================= # SETUP SSOWAT From ac549bb7fdc6d2899d85f3b0be06951cc4d22d6a Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:41:23 +0100 Subject: [PATCH 31/58] fix typo --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 81f9ce4..151ac2d 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ }, "version":"1.7.13~ynh1", "url": "https://www.webtrees.net", - "license": " GPL-3.0-or-later", + "license": "GPL-3.0-or-later", "maintainer": { "name": "Anmol Sharma", "email": "anmol@datamol.org" From 9e03083c629ab7155bce4e6bc970eba4b091c314 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:42:11 +0100 Subject: [PATCH 32/58] sudo is not necessary, script run as root --- scripts/restore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 109ee4b..fd03e10 100644 --- a/scripts/restore +++ b/scripts/restore @@ -89,8 +89,8 @@ ynh_install_app_dependencies $pkg_dependencies # Restore permissions to app files -sudo chown -R $app: "${final_path}" -sudo chmod -R 700 $final_path/data +chown -R $app: "${final_path}" +chmod -R 700 $final_path/data #================================================= # RESTORE THE MYSQL DATABASE From 6891d7007434a7bb4a399370ee6a8b1b2268b226 Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 7 Dec 2019 18:49:00 +0100 Subject: [PATCH 33/58] fix closing quotation error --- scripts/install | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 2eb3d59..7e5bfa3 100755 --- a/scripts/install +++ b/scripts/install @@ -232,14 +232,7 @@ systemctl reload nginx # SEND A README FOR THE ADMIN #================================================= -message=" $app was successfully installed :) - -Please open https://$domain$path_url - -The admin username is: $admin_username -And the admin password is: $password - -If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" +message=" $app was successfully installed :) \n Please open https://$domain$path_url \n The admin username is: $admin_username \n And the admin password is: $password \n If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" ynh_send_readme_to_admin "$message" From 7ac156179912aa4e2c00859c947e6e18ce69bdaf Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 16:42:19 +0100 Subject: [PATCH 34/58] pull_request_template.md --- pull_request_template.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 pull_request_template.md diff --git a/pull_request_template.md b/pull_request_template.md new file mode 100644 index 0000000..2cef46f --- /dev/null +++ b/pull_request_template.md @@ -0,0 +1,22 @@ +## Problem +- *Description of why you made this PR* + +## Solution +- *And how do you fix that problem* + +## PR Status +- [ ] Code finished. +- [ ] Tested with Package_check. +- [ ] Fix or enhancement tested. +- [ ] Upgrade from last version tested. +- [ ] Can be reviewed and tested. + +## Validation +--- +- [ ] **Code review** : +- [ ] **Approval (LGTM)** : +*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* +- **CI succeeded** : +[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/) +*Please replace '-NUM-' in this link by the PR number.* +When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. From 6925e8ed5fc93e72b0fd87a4074af0ed73c87a70 Mon Sep 17 00:00:00 2001 From: antoine Date: Wed, 18 Dec 2019 16:44:42 +0100 Subject: [PATCH 35/58] fix help warning in package_check --- manifest.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.json b/manifest.json index 151ac2d..9272bcf 100644 --- a/manifest.json +++ b/manifest.json @@ -77,6 +77,10 @@ "en": "Is it a public application?", "fr": "Est-ce une application publique ?" }, + "help": { + "en": "If checked, the app will be public", + "fr": "Si cochée, votre application sera publique" + }, "default": true } ] From bc66b12db3718b7dd150f8060e88a596b80ebcc1 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 19 Dec 2019 23:58:54 +0100 Subject: [PATCH 36/58] Update pull_request_template.md --- pull_request_template.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pull_request_template.md b/pull_request_template.md index 2cef46f..c10c82f 100644 --- a/pull_request_template.md +++ b/pull_request_template.md @@ -11,12 +11,8 @@ - [ ] Upgrade from last version tested. - [ ] Can be reviewed and tested. -## Validation +## Package_check results --- -- [ ] **Code review** : -- [ ] **Approval (LGTM)** : -*Code review and approval have to be from a member of @YunoHost-Apps/apps-group* -- **CI succeeded** : -[![Build Status](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/badge/icon)](https://ci-apps-hq.yunohost.org/jenkins/job/APP_ynh%20PR-NUM-/) -*Please replace '-NUM-' in this link by the PR number.* -When the PR is marked as ready to merge, you have to wait for 3 days before really merging it. +*If you have access to [App Continuous Integration for packagers](https://yunohost.org/#/packaging_apps_ci) you can provide a link to the package_check results like below, replacing '-NUM-' in this link by the PR number and USERNAME by your username on the ci-apps-dev. Or you provide a screenshot or a pastebin of the results* + +[![Build Status](https://ci-apps-dev.yunohost.org/jenkins/job/webtrees_ynh%20PR-NUM-%20(USERNAME)/badge/icon)](https://ci-apps-dev.yunohost.org/jenkins/job/webtrees_ynh%20PR-NUM-%20(USERNAME)/) From cb9a21c56d56dabfe42bd4004c130de79518089e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 20 Dec 2019 00:00:30 +0100 Subject: [PATCH 37/58] Spelling --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3314a1e..e1c289e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) [![Install Webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=webtrees) -> *This package allow you to install >ebtrees quickly and simply on a YunoHost server. +> *This package allow you to install Webtrees quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* **VERY IMPORTANT: There is a security fix in nginx. Please update as soon as posible regarless of any version you are on.** From 28cc6325f9656b2dfd317e862d6cb9cc12a47104 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 20 Dec 2019 00:02:08 +0100 Subject: [PATCH 38/58] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index e1c289e..021b19d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ Multi-instance: **yes** * x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) * ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) -* Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/webtrees%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/webtrees/) ## Links From a223cc03614e5a25c622b8844be3fe4d41e2e2df Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 20 Dec 2019 00:02:51 +0100 Subject: [PATCH 39/58] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index a68ce59..ed6dd06 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">> 3.0.0" + "yunohost": ">= 3.5" }, "multi_instance": true, "services": [ From 37f95f5dc42f07cda85c4bc1ec11007600d844fc Mon Sep 17 00:00:00 2001 From: antoine Date: Sat, 21 Dec 2019 01:15:57 +0100 Subject: [PATCH 40/58] update to 2.0.0 --- README.md | 6 +++--- conf/app.src | 6 +++--- manifest.json | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 021b19d..df361f1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ > *This package allow you to install Webtrees quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* -**VERY IMPORTANT: There is a security fix in nginx. Please update as soon as posible regarless of any version you are on.** +**VERY IMPORTANT: There is a security fix in nginx. Please update as soon as possible regarless of any version you are on.** ## Overview @@ -16,9 +16,9 @@ webtrees is the web's leading online collaborative genealogy application. webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. -**Note:** Its better to upgrade from the Webtrees admin pannel when new version arrives.

+**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.

-**Shipped version:** 1.7.13, released **9 March 2019** +**Shipped version:** 2.0.0, released **7 December 2019** ## Demo diff --git a/conf/app.src b/conf/app.src index 84f963a..a71617f 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/1.7.13/webtrees-1.7.13.zip -SOURCE_SUM=553331245d696ab1c082ecdb7037f8d67a2c5e735fe2db06bd1f909c4dd3ab27 +SOURCE_URL=https://github.com/fisharebest/webtrees/archive/2.0.0.tar.gz +SOURCE_SUM=8fd263da34e6161ef8a8d8b2f64461a7fcc7d20cc0249f9b16b3427900534b50 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=zip +SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index ed6dd06..5c5ccf0 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Webtrees is a free open source web-based genealogy application.", "fr": "Webtrees est un logiciel libre de généalogie en ligne." }, - "version":"1.7.13~ynh1", + "version":"2.0.0~ynh1", "url": "https://www.webtrees.net", "license": "GPL-3.0-or-later", "maintainer": { From 7382d6f84a8c3723d8dde49f52ddbd712031d4f7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 23 Feb 2020 19:45:22 +0100 Subject: [PATCH 41/58] Applying example_ynh --- scripts/install | 2 +- scripts/remove | 8 ++++---- scripts/upgrade | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index 8915cb6..9086088 100755 --- a/scripts/install +++ b/scripts/install @@ -64,7 +64,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= ynh_print_info "Creating a MySQL database..." -db_name=$(ynh_sanitize_dbid $app) +db_name=$(ynh_sanitize_dbid --db_name=$app) ynh_app_setting_set $app db_name $db_name ynh_mysql_setup_db $db_name $db_name diff --git a/scripts/remove b/scripts/remove index 2e7b5a1..546464e 100755 --- a/scripts/remove +++ b/scripts/remove @@ -33,7 +33,7 @@ ynh_mysql_remove_db $db_user $db_name #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_print_info "Removing dependencies" +ynh_print_info "Removing dependencies..." # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -41,7 +41,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_print_info "Removing app main directory" +ynh_print_info "Removing app main directory..." # Remove the app directory securely ynh_secure_remove "$final_path" @@ -49,7 +49,7 @@ ynh_secure_remove "$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_print_info "Removing nginx web server configuration" +ynh_print_info "Removing nginx web server configuration..." # Remove the dedicated nginx config ynh_remove_nginx_config @@ -67,7 +67,7 @@ ynh_remove_fpm_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_print_info "Removing the dedicated system user" +ynh_print_info "Removing the dedicated system user..." # Delete a system user ynh_system_user_delete $app diff --git a/scripts/upgrade b/scripts/upgrade index a4b820c..07a94e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ fi # If db_name doesn't exist, create it if [ -z $db_name ]; then - db_name=$(ynh_sanitize_dbid $app) + db_name=$(ynh_sanitize_dbid --db_name=$app) ynh_app_setting_set $app db_name $db_name fi From ac07839f1e849640abfa5569001f6daf15619dd3 Mon Sep 17 00:00:00 2001 From: antoine Date: Thu, 30 Jul 2020 18:02:59 +0200 Subject: [PATCH 42/58] update to 2.0.7 --- README.md | 2 +- conf/app.src | 4 ++-- manifest.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index df361f1..05f2a4f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.

-**Shipped version:** 2.0.0, released **7 December 2019** +**Shipped version:** 2.0.7, released **27 July 2020** ## Demo diff --git a/conf/app.src b/conf/app.src index a71617f..58c13ec 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/fisharebest/webtrees/archive/2.0.0.tar.gz -SOURCE_SUM=8fd263da34e6161ef8a8d8b2f64461a7fcc7d20cc0249f9b16b3427900534b50 +SOURCE_URL=https://github.com/fisharebest/webtrees/archive/2.0.7.tar.gz +SOURCE_SUM=4c309b0bbe1d20b1080c36e13dc7441f27987d74f766a52cebaf4487c2dd1b9f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 5c5ccf0..8ed091c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Webtrees is a free open source web-based genealogy application.", "fr": "Webtrees est un logiciel libre de généalogie en ligne." }, - "version":"2.0.0~ynh1", + "version":"2.0.7~ynh1", "url": "https://www.webtrees.net", "license": "GPL-3.0-or-later", "maintainer": { @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.0-fpm", + "php7.1-fpm", "mysql" ], "arguments": { From d24745a9fc68ab316e870b68bcf3010050d77029 Mon Sep 17 00:00:00 2001 From: antoine Date: Thu, 30 Jul 2020 18:44:39 +0200 Subject: [PATCH 43/58] fix Package linter error message --- README.md | 32 ++++++++++++++++++++++++-------- manifest.json | 10 +++++----- scripts/_common.sh | 20 ++------------------ scripts/install | 8 ++++---- scripts/restore | 4 ++-- 5 files changed, 37 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 05f2a4f..403eebe 100644 --- a/README.md +++ b/README.md @@ -23,36 +23,52 @@ webtrees allows you to view and edit your genealogy on your website. It has full ## Demo * [Official demo](https://dev.webtrees.net/demo-dev/index.php?ctype=gedcom&ged=demo) + +## Configuration + +How to configure this app: From an admin panel, a plain file with SSH, or any other way. + ## Documentation * Official documentation: https://wiki.webtrees.net + * YunoHost documentation: If specific documentation is needed, feel free to contribute. ## YunoHost specific features -#### Multi-users support +#### Multi-user support -No LDAP configuration is there for Webtrees yet.
-Multi-instance: **yes** +Are LDAP and HTTP auth supported? +Can the app be used by multiple users? #### Supported architectures -* x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) +## Limitations + +* Any known limitations. + +## Additional information + +* Other info you would like to add about this app. + +**More info on the documentation page:** +https://yunohost.org/packaging_apps ## Links * Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues * App website: https://www.webtrees.net - * Git repository: https://github.com/fisharebest/webtrees + * Upstream app repository: https://github.com/fisharebest/webtrees * YunoHost website: https://yunohost.org/ --- -Developers info +Developer info ---------------- **Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). To try the testing branch, please proceed like that. ``` diff --git a/manifest.json b/manifest.json index 8ed091c..1ae7eea 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "webtrees", "packaging_format": 1, "description": { - "en": "Webtrees is a free open source web-based genealogy application.", - "fr": "Webtrees est un logiciel libre de généalogie en ligne." + "en": "This app is a free open source web-based genealogy application.", + "fr": "Cette application est un logiciel libre de généalogie en ligne." }, "version":"2.0.7~ynh1", "url": "https://www.webtrees.net", @@ -14,12 +14,12 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 3.5" + "yunohost": ">= 3.8" }, "multi_instance": true, "services": [ - "nginx", - "php7.1-fpm", + "nginx", + "php7.3-fpm", "mysql" ], "arguments": { diff --git a/scripts/_common.sh b/scripts/_common.sh index b1415ed..60c4ab5 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="php-gd php-xml mailutils" +pkg_dependencies="php7.3-gd php7.3-xml mailutils php7.3-fpm" #================================================= # PERSONAL HELPERS @@ -19,17 +19,6 @@ pkg_dependencies="php-gd php-xml mailutils" # FUTURE OFFICIAL HELPERS #================================================= -# Delete a file checksum from the app settings -# -# $app should be defined when calling this helper -# -# usage: ynh_remove_file_checksum file -# | arg: file - The file for which the checksum will be deleted -ynh_delete_file_checksum () { - local checksum_setting_name=checksum_${1//[\/ ]/_} # Replace all '/' and ' ' by '_' - ynh_app_setting_delete $app $checksum_setting_name -} - # Send an email to inform the administrator # # usage: ynh_send_readme_to_admin app_message [recipients] @@ -68,12 +57,7 @@ ynh_send_readme_to_admin() { local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - local mail_message="This is an automated message from your beloved YunoHost server. -Specific information for the application $app. -$app_message ---- -Automatic diagnosis data from YunoHost -$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" + local mail_message="This is an automated message from your beloved YunoHost server. \nSpecific information for the application $app.\n$app_message\n---\nAutomatic diagnosis data from YunoHost\n$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" # Define binary to use for mail command if [ -e /usr/bin/bsd-mailx ] diff --git a/scripts/install b/scripts/install index 9086088..3802a17 100755 --- a/scripts/install +++ b/scripts/install @@ -111,7 +111,7 @@ ynh_replace_string "__dbpass__" "$db_pwd" "../conf/config.ini.php" ynh_replace_string "__dbname__" "$db_name" "../conf/config.ini.php" # Copy the config file to the final path -sudo cp ../conf/config.ini.php $final_path/data/. +cp ../conf/config.ini.php $final_path/data/. # Load initial SQL into the new database ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" @@ -139,7 +139,7 @@ ynh_store_file_checksum "$final_path/data/config.ini.php" # Set permissions to app files chown -R $app: $final_path -sudo chmod -R 700 $final_path/data +chmod -R 700 $final_path/data #================================================= # SETUP SSOWAT @@ -149,8 +149,8 @@ ynh_print_info "Configuring SSOwat..." # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" + # unprotected_uris allows SSO credentials to be passed anyway. + ynh_app_setting_set $app unprotected_uris "/" fi #================================================= diff --git a/scripts/restore b/scripts/restore index e3f8b14..773be0d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -68,8 +68,8 @@ ynh_system_user_create $app #================================================= # Restore permissions to app files -sudo chown -R $app: "${final_path}" -sudo chmod -R 700 $final_path/data +chown -R $app: "${final_path}" +chmod -R 700 $final_path/data #================================================= # RESTORE THE PHP-FPM CONFIGURATION From a7469fc8ab8946bae2685f50079b0f35bb408641 Mon Sep 17 00:00:00 2001 From: antoine Date: Thu, 30 Jul 2020 18:45:05 +0200 Subject: [PATCH 44/58] add issue template --- issue_template.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 issue_template.md diff --git a/issue_template.md b/issue_template.md new file mode 100644 index 0000000..452161c --- /dev/null +++ b/issue_template.md @@ -0,0 +1,46 @@ +--- +name: Bug report +about: Create a report to help us debug, it would be nice to fill the template as much as you can to help us, help you and help us all. + +--- + +**How to post a meaningful bug report** +1. *Read this whole template first.* +2. *Determine if you are on the right place:* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* + - *Otherwise, the issue may be due to REPLACEBYYOURAPP itself. Refer to its documentation or repository for help.* + - *If you have a doubt, post here, we will figure it out together.* +3. *Delete the italic comments as you write over them below, and remove this guide.* +--- + +**Describe the bug** +*A clear and concise description of what the bug is.* + +**Versions** +- Hardware: *VPS bought online / Old laptop or computer / Raspberry Pi at home / Internet Cube with VPN / Other ARM board / ...* +- YunoHost version: x.x.x +- I have access to my server: *Through SSH | through the webadmin | direct access via keyboard / screen | ...* +- Are you in a special context or did you perform some particular tweaking on your YunoHost instance ?: *no / yes* + - If yes, please explain: +- Using, or trying to install package version/branch: +- If upgrading, current package version: *can be found in the admin, or with `yunohost app info $app_id`* + +**To Reproduce** +*Steps to reproduce the behavior.* +- *If you performed a command from the CLI, the command itself is enough. For example:* + ```sh + sudo yunohost app install Webtrees + ``` +- *If you used the webadmin, please perform the equivalent command from the CLI first.* +- *If the error occurs in your browser, explain what you did:* + 1. *Go to '...'* + 2. *Click on '....'* + 3. *Scroll down to '....'* + 4. *See error* + +**Expected behavior** +*A clear and concise description of what you expected to happen. You can remove this section if the command above is enough to understand your intent.* + +**Logs** +*After a failed command, YunoHost makes the log available to you, but also to others, thanks to `yunohost log display [log name] --share`. The actual command, with the correct log name, is displayed at the end of the failed attempt in the CLI. Execute it and copy here the share link it outputs.* +*If applicable and useful, add screenshots to help explain your problem.* From 23f30c65964bc70e3e1e162d4398c83fde05c513 Mon Sep 17 00:00:00 2001 From: antoine Date: Thu, 30 Jul 2020 18:54:44 +0200 Subject: [PATCH 45/58] update nginx and install --- conf/nginx.conf | 14 +++++++------ scripts/install | 52 ++++++++++++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 4b18c6c..f38409f 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -5,27 +5,29 @@ location __PATH__/ { alias __FINALPATH__/ ; # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; } +### Example PHP configuration (remove it if not used) index index.php; - + # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file #client_max_body_size 50M; try_files $uri $uri/ index.php; location ~ [^/]\.php(/|$) { fastcgi_split_path_info ^(.+?\.php)(/.*)$; - fastcgi_pass unix:/var/run/php/php7.0-fpm-__NAME__.sock; + fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock; fastcgi_index index.php; include fastcgi_params; fastcgi_param REMOTE_USER $remote_user; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; - } - + } +### End of PHP configuration part + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } diff --git a/scripts/install b/scripts/install index 3802a17..1915f06 100755 --- a/scripts/install +++ b/scripts/install @@ -35,18 +35,20 @@ app=$YNH_APP_INSTANCE_NAME #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_print_info "Validating installation parameters..." +ynh_script_progression --message="Validating installation parameters..." +### If the app uses nginx as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". +### If the app provides an internal web server (or uses another application server such as uwsgi), the final path should be "/opt/yunohost/$app" final_path=/var/www/$app -test ! -e "$final_path" || ynh_die "This path already contains a folder" +test ! -e "$final_path" || ynh_die --message="This path already contains a folder" # Register (book) web path -ynh_webpath_register $app $domain $path_url +ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_print_info "Storing installation settings..." +ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set $app is_public $is_public ynh_app_setting_set $app domain $domain @@ -55,14 +57,14 @@ ynh_app_setting_set $app path $path_url #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_print_info "Installing dependencies..." +ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A MYSQL DATABASE #================================================= -ynh_print_info "Creating a MySQL database..." +ynh_script_progression --message="Creating a MySQL database..." db_name=$(ynh_sanitize_dbid --db_name=$app) ynh_app_setting_set $app db_name $db_name @@ -71,16 +73,22 @@ ynh_mysql_setup_db $db_name $db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_print_info "Setting up source files..." +ynh_script_progression --message="Setting up source files..." -ynh_app_setting_set $app final_path $final_path +### `ynh_setup_source` is used to install an app from a zip or tar.gz file, +### downloaded from an upstream source, like a git repository. +### `ynh_setup_source` use the file conf/app.src + +ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source "$final_path" +ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_print_info "Configuring nginx web server..." +ynh_script_progression --message="Configuring nginx web server..." + +### `ynh_add_nginx_config` will use the file conf/nginx.conf # Create a dedicated nginx config ynh_add_nginx_config @@ -88,15 +96,15 @@ ynh_add_nginx_config #================================================= # CREATE DEDICATED USER #================================================= -ynh_print_info "Configuring system user..." +ynh_script_progression --message="Configuring system user..." # Create a system user -ynh_system_user_create $app +ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Configuring php-fpm..." +ynh_script_progression --message="Configuring php-fpm..." # Create a dedicated php-fpm config ynh_add_fpm_config @@ -129,7 +137,7 @@ ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" #================================================= # Calculate and store the config file checksum into the app settings -ynh_store_file_checksum "$final_path/data/config.ini.php" +ynh_store_file_checksum --file="$final_path/data/config.ini.php" #================================================= # GENERIC FINALIZATION @@ -137,6 +145,10 @@ ynh_store_file_checksum "$final_path/data/config.ini.php" # SECURE FILES AND DIRECTORIES #================================================= +### For security reason, any app should set the permissions to root: before anything else. +### Then, if write authorization is needed, any access should be given only to directories +### that really need such authorization. + # Set permissions to app files chown -R $app: $final_path chmod -R 700 $final_path/data @@ -144,21 +156,21 @@ chmod -R 700 $final_path/data #================================================= # SETUP SSOWAT #================================================= -ynh_print_info "Configuring SSOwat..." +ynh_script_progression --message="Configuring SSOwat..." # Make app public if necessary if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" + # unprotected_uris allows SSO credentials to be passed anyway. + ynh_app_setting_set --app=$app --key=unprotected_uris --value="/" fi #================================================= # RELOAD NGINX #================================================= -ynh_print_info "Reloading nginx web server..." +ynh_script_progression --message="Reloading nginx web server..." -systemctl reload nginx +ynh_systemd_action --service_name=nginx --action=reload #================================================= # SEND A README FOR THE ADMIN @@ -172,4 +184,4 @@ ynh_send_readme_to_admin "$message" # END OF SCRIPT #================================================= -ynh_print_info "Installation of $app completed" +ynh_script_progression --message="Installation of $app completed" From b5dabfac6758a7aaa40f2874c1741d8fb7c15fb9 Mon Sep 17 00:00:00 2001 From: antoine Date: Thu, 30 Jul 2020 19:21:42 +0200 Subject: [PATCH 46/58] webtrees on buster --- conf/php-fpm.conf | 2 +- manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index ab5dca9..ab1a471 100644 --- a/conf/php-fpm.conf +++ b/conf/php-fpm.conf @@ -33,7 +33,7 @@ group = __USER__ ; (IPv6 and IPv4-mapped) on a specific port; ; '/path/to/unix/socket' - to listen on a unix socket. ; Note: This value is mandatory. -listen = /var/run/php/php7.0-fpm-__NAMETOCHANGE__.sock +listen = /var/run/php/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock ; Set listen(2) backlog. ; Default Value: 511 (-1 on FreeBSD and OpenBSD) diff --git a/manifest.json b/manifest.json index 1ae7eea..8341c03 100644 --- a/manifest.json +++ b/manifest.json @@ -14,7 +14,7 @@ "email": "anmol@datamol.org" }, "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 4.0" }, "multi_instance": true, "services": [ From ee7b96f8eea15390260464b0f9989a036ef4cbe6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 10:54:10 +0200 Subject: [PATCH 47/58] v.2.0.9 --- README.md | 2 +- check_process | 11 ----------- conf/app.src | 7 ++++--- conf/nginx.conf | 2 -- issue_template.md | 6 +++--- manifest.json | 2 +- 6 files changed, 9 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 403eebe..989dd48 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.

-**Shipped version:** 2.0.7, released **27 July 2020** +**Shipped version:** 2.0.9 ## Demo diff --git a/check_process b/check_process index 8dfb4dd..ffe783e 100644 --- a/check_process +++ b/check_process @@ -25,18 +25,7 @@ port_already_use=0 change_url=0 ;;; Levels - Level 1=auto - Level 2=auto - Level 3=auto -# Level 4: If the app supports LDAP and SSOwat, turn level 4 to '1' and add a link to an issue or a part of your code to show it. -# If the app does not use LDAP nor SSOwat, and can't use them, turn level 4 to 'na' and explain as well. - Level 4=0 # Not supported by the core app yet Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email=anmol@datamol.org Notification=change diff --git a/conf/app.src b/conf/app.src index 58c13ec..290ae55 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,7 @@ -SOURCE_URL=https://github.com/fisharebest/webtrees/archive/2.0.7.tar.gz -SOURCE_SUM=4c309b0bbe1d20b1080c36e13dc7441f27987d74f766a52cebaf4487c2dd1b9f +SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.0.9/webtrees-2.0.9.zip +SOURCE_SUM=65d8e51706f91ea9e376bad8a0d2bf48c9c15bf399bf2e4874392b12dba30cf8 SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=tar.gz +SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true SOURCE_FILENAME= + diff --git a/conf/nginx.conf b/conf/nginx.conf index f38409f..1b31226 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -9,7 +9,6 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } -### Example PHP configuration (remove it if not used) index index.php; # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file @@ -26,7 +25,6 @@ location __PATH__/ { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $request_filename; } -### End of PHP configuration part # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/issue_template.md b/issue_template.md index 452161c..54280a6 100644 --- a/issue_template.md +++ b/issue_template.md @@ -7,8 +7,8 @@ about: Create a report to help us debug, it would be nice to fill the template a **How to post a meaningful bug report** 1. *Read this whole template first.* 2. *Determine if you are on the right place:* - - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change url...), you are on the right place!* - - *Otherwise, the issue may be due to REPLACEBYYOURAPP itself. Refer to its documentation or repository for help.* + - *If you were performing an action on the app from the webadmin or the CLI (install, update, backup, restore, change_url...), you are on the right place!* + - *Otherwise, the issue may be due to Webtrees itself. Refer to its documentation or repository for help.* - *If you have a doubt, post here, we will figure it out together.* 3. *Delete the italic comments as you write over them below, and remove this guide.* --- @@ -29,7 +29,7 @@ about: Create a report to help us debug, it would be nice to fill the template a *Steps to reproduce the behavior.* - *If you performed a command from the CLI, the command itself is enough. For example:* ```sh - sudo yunohost app install Webtrees + sudo yunohost app install webtrees ``` - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* diff --git a/manifest.json b/manifest.json index 8341c03..8d48726 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "This app is a free open source web-based genealogy application.", "fr": "Cette application est un logiciel libre de généalogie en ligne." }, - "version":"2.0.7~ynh1", + "version":"2.0.9~ynh1", "url": "https://www.webtrees.net", "license": "GPL-3.0-or-later", "maintainer": { From bf8b206096fd94b52129e96420aa9b21796148db Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 10:57:23 +0200 Subject: [PATCH 48/58] Update README.md --- README.md | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 989dd48..a0542b1 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,28 @@ # Webtrees for YunoHost -[![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) + +[![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) [![Install Webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=webtrees) > *This package allow you to install Webtrees quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* -**VERY IMPORTANT: There is a security fix in nginx. Please update as soon as possible regarless of any version you are on.** - ## Overview - -webtrees is the web's leading online collaborative genealogy application. +Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. -It works from standard GEDCOM files, and is therefore compatible with every major desktop application. -It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards. -webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. - -**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.

+**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. **Shipped version:** 2.0.9 +## Screenshots + +![](https://webtrees.net/assets/img/tree-mock-screen.png) + ## Demo -* [Official demo](https://dev.webtrees.net/demo-dev/index.php?ctype=gedcom&ged=demo) +* [Official demo](https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo) ## Configuration @@ -37,23 +37,13 @@ How to configure this app: From an admin panel, a plain file with SSH, or any ot #### Multi-user support -Are LDAP and HTTP auth supported? -Can the app be used by multiple users? + * Are LDAP and HTTP auth supported? **No** + * Can the app be used by multiple users? **Yes** #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) -## Limitations - -* Any known limitations. - -## Additional information - -* Other info you would like to add about this app. - -**More info on the documentation page:** -https://yunohost.org/packaging_apps +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/) ## Links @@ -64,11 +54,9 @@ https://yunohost.org/packaging_apps --- -Developer info ----------------- +## Developer info -**Only if you want to use a testing branch for coding, instead of merging directly into master.** -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). +Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). To try the testing branch, please proceed like that. ``` From 7c2d4946be411eb80519c610886284cef8ca9348 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 10:57:42 +0200 Subject: [PATCH 49/58] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8d48726..ee9ec0e 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "multi_instance": true, "services": [ "nginx", - "php7.3-fpm", + "php7.0-fpm", "mysql" ], "arguments": { From 8262b57c868784ac3832a45a6edeac6fc02be423 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 10:58:28 +0200 Subject: [PATCH 50/58] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index ee9ec0e..ba26239 100644 --- a/manifest.json +++ b/manifest.json @@ -3,8 +3,8 @@ "id": "webtrees", "packaging_format": 1, "description": { - "en": "This app is a free open source web-based genealogy application.", - "fr": "Cette application est un logiciel libre de généalogie en ligne." + "en": "Web-based genealogy application", + "fr": "Logiciel libre de généalogie en ligne" }, "version":"2.0.9~ynh1", "url": "https://www.webtrees.net", From 214804c84c1da093c9eff5a3f65cb8c936638df6 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 11:21:00 +0200 Subject: [PATCH 51/58] Small typos --- issue_template.md | 4 ++-- scripts/_common.sh | 4 +++- scripts/backup | 21 ++++++++++----------- scripts/install | 27 +++++++++++---------------- scripts/remove | 32 ++++++++++++++++---------------- scripts/restore | 25 ++++++++++++------------- scripts/upgrade | 35 +++++++++++++++++++---------------- 7 files changed, 73 insertions(+), 75 deletions(-) diff --git a/issue_template.md b/issue_template.md index 54280a6..a212547 100644 --- a/issue_template.md +++ b/issue_template.md @@ -34,8 +34,8 @@ about: Create a report to help us debug, it would be nice to fill the template a - *If you used the webadmin, please perform the equivalent command from the CLI first.* - *If the error occurs in your browser, explain what you did:* 1. *Go to '...'* - 2. *Click on '....'* - 3. *Scroll down to '....'* + 2. *Click on '...'* + 3. *Scroll down to '...'* 4. *See error* **Expected behavior** diff --git a/scripts/_common.sh b/scripts/_common.sh index 60c4ab5..c047f44 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,8 +4,10 @@ # COMMON VARIABLES #================================================= +YNH_PHP_VERSION="7.3" + # dependencies used by the app -pkg_dependencies="php7.3-gd php7.3-xml mailutils php7.3-fpm" +pkg_dependencies="php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-xml mailutils" #================================================= # PERSONAL HELPERS diff --git a/scripts/backup b/scripts/backup index b970cec..a3ce283 100755 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -14,7 +13,6 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= @@ -24,32 +22,33 @@ ynh_print_info "Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -final_path=$(ynh_app_setting_get $app final_path) -domain=$(ynh_app_setting_get $app domain) -db_name=$(ynh_app_setting_get $app db_name) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +domain=$(ynh_app_setting_get --app=$app --key=domain) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info "Backing up the main app directory..." ynh_backup "$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info "Backing up nginx web server configuration..." ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Backing up php-fpm configuration..." -ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" +ynh_backup "/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE @@ -62,4 +61,4 @@ ynh_mysql_dump_db "$db_name" > db.sql # END OF SCRIPT #================================================= -ynh_print_info "Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." +ynh_print_info "Backup script completed for Webtrees. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index 1915f06..ebf1659 100755 --- a/scripts/install +++ b/scripts/install @@ -50,9 +50,9 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= ynh_script_progression --message="Storing installation settings..." -ynh_app_setting_set $app is_public $is_public -ynh_app_setting_set $app domain $domain -ynh_app_setting_set $app path $path_url +ynh_app_setting_set --app=$app --key=is_public --value=$is_public +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url #================================================= # INSTALL DEPENDENCIES @@ -67,18 +67,14 @@ ynh_install_app_dependencies $pkg_dependencies ynh_script_progression --message="Creating a MySQL database..." db_name=$(ynh_sanitize_dbid --db_name=$app) -ynh_app_setting_set $app db_name $db_name -ynh_mysql_setup_db $db_name $db_name +ynh_app_setting_set --app=$app --key=db_name --value=$db_name +ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression --message="Setting up source files..." -### `ynh_setup_source` is used to install an app from a zip or tar.gz file, -### downloaded from an upstream source, like a git repository. -### `ynh_setup_source` use the file conf/app.src - ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" @@ -86,9 +82,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." - -### `ynh_add_nginx_config` will use the file conf/nginx.conf +ynh_script_progression --message="Configuring NGINX web server..." # Create a dedicated nginx config ynh_add_nginx_config @@ -104,10 +98,11 @@ ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring php-fpm..." +ynh_script_progression --message="Configuring PHP-FPM..." # Create a dedicated php-fpm config -ynh_add_fpm_config +ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # MODIFY A CONFIG FILE @@ -168,7 +163,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." ynh_systemd_action --service_name=nginx --action=reload @@ -184,4 +179,4 @@ ynh_send_readme_to_admin "$message" # END OF SCRIPT #================================================= -ynh_script_progression --message="Installation of $app completed" +ynh_script_progression --message="Installation of Webtrees completed" diff --git a/scripts/remove b/scripts/remove index 546464e..30d3685 100755 --- a/scripts/remove +++ b/scripts/remove @@ -12,28 +12,28 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_print_info "Loading installation settings..." +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME # Retrieve app settings -domain=$(ynh_app_setting_get "$app" domain) -db_name=$(ynh_app_setting_get $app db_name) +domain=$(ynh_app_setting_get --app=$app --key=domain) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name -final_path=$(ynh_app_setting_get $app final_path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # REMOVE THE MYSQL DATABASE #================================================= -ynh_print_info "Removing the MySQL database" +ynh_script_progression --message="Removing the MySQL database" # Remove a database if it exists, along with the associated user -ynh_mysql_remove_db $db_user $db_name +ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name #================================================= # REMOVE DEPENDENCIES #================================================= -ynh_print_info "Removing dependencies..." +ynh_script_progression --message="Removing dependencies..." # Remove metapackage and its dependencies ynh_remove_app_dependencies @@ -41,25 +41,25 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_print_info "Removing app main directory..." +ynh_script_progression --message="Removing Webtrees main directory..." # Remove the app directory securely -ynh_secure_remove "$final_path" +ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_print_info "Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= # REMOVE PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Removing php-fpm configuration" +ynh_script_progression --message="Removing PHP-FPM configuration" -# Remove the dedicated php-fpm config +# Remove the dedicated PHP-FPM config ynh_remove_fpm_config #================================================= @@ -67,13 +67,13 @@ ynh_remove_fpm_config #================================================= # REMOVE DEDICATED USER #================================================= -ynh_print_info "Removing the dedicated system user..." +ynh_script_progression --message="Removing the dedicated system user..." # Delete a system user -ynh_system_user_delete $app +ynh_system_user_delete --username=$app #================================================= # END OF SCRIPT #================================================= -ynh_print_info "Removal of $app completed" +ynh_script_progression --message="Removal of $app completed" diff --git a/scripts/restore b/scripts/restore index 773be0d..50542e6 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,6 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -14,13 +13,12 @@ source /usr/share/yunohost/helpers # MANAGE SCRIPT FAILURE #================================================= -# Exit if an error occurs during the execution of the script ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_print_info "Loading settings..." +ynh_script_progression --message="Loading settings..." app=$YNH_APP_INSTANCE_NAME @@ -29,11 +27,12 @@ domain=$(ynh_app_setting_get "$app" domain) path_url=$(ynh_app_setting_get "$app" path) final_path=$(ynh_app_setting_get $app final_path) db_name=$(ynh_app_setting_get $app db_name) +phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) #================================================= # CHECK IF THE APP CAN BE RESTORED #================================================= -ynh_print_info "Validating restoration parameters..." +ynh_script_progression --message="Validating restoration parameters..." ynh_webpath_available $domain $path_url \ || ynh_die "Path not available: ${domain}${path_url}" @@ -51,14 +50,14 @@ ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # RESTORE THE APP MAIN DIR #================================================= -ynh_print_info "Restoring the app main directory..." +ynh_script_progression --message="Restoring Webtrees main directory..." ynh_restore_file "$final_path" #================================================= # RECREATE THE DEDICATED USER #================================================= -ynh_print_info "Recreating the dedicated system user..." +ynh_script_progression --message="Recreating the dedicated system user..." # Create the dedicated user (if not existing) ynh_system_user_create $app @@ -75,14 +74,14 @@ chmod -R 700 $final_path/data # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_restore_file "/etc/php/7.0/fpm/pool.d/$app.conf" +ynh_restore_file "/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # SPECIFIC RESTORATION #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_print_info "Reinstalling dependencies..." +ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -90,7 +89,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE MYSQL DATABASE #================================================= -ynh_print_info "Restoring the MySQL database..." +ynh_script_progression --message="Restoring the MySQL database..." db_pwd=$(ynh_app_setting_get $app mysqlpwd) ynh_mysql_setup_db $db_name $db_name $db_pwd @@ -101,13 +100,13 @@ ynh_mysql_connect_as $db_name $db_pwd $db_name < ./db.sql #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_print_info "Reloading nginx web server and php-fpm..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." -systemctl reload php7.0-fpm -systemctl reload nginx +ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload +ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_print_info "Restoration completed for $app" +ynh_script_progression --message="Restoration completed for Webtrees" diff --git a/scripts/upgrade b/scripts/upgrade index 07a94e8..8db744e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # LOAD SETTINGS #================================================= -ynh_print_info "Loading installation settings..." +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -25,7 +25,7 @@ final_path=$(ynh_app_setting_get $app final_path) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_print_info "Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." # Fix is_public as a boolean value if [ "$is_public" = "Yes" ]; then @@ -51,7 +51,7 @@ fi #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= -ynh_print_info "Backing up the app before upgrading (may take a while)..." +ynh_script_progression --message="Backing up Webtrees before upgrading (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade @@ -67,7 +67,7 @@ ynh_abort_if_errors #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_print_info "Upgrading source files..." +ynh_script_progression --message="Upgrading source files..." # Move old app dir mv ${final_path} ${final_path}.old @@ -84,33 +84,33 @@ rm -Rf ${final_path}.old #================================================= # NGINX CONFIGURATION #================================================= -ynh_print_info "Upgrading nginx web server configuration..." +ynh_script_progression --message="Upgrading NGINX web server configuration..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= # UPGRADE DEPENDENCIES #================================================= -ynh_print_info "Upgrading dependencies..." +ynh_script_progression --message="Upgrading dependencies..." ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER #================================================= -ynh_print_info "Making sure dedicated system user exists..." +ynh_script_progression --message="Making sure dedicated system user exists..." # Create a dedicated user (if not existing) -ynh_system_user_create $app +ynh_system_user_create --username=$app #================================================= # PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Upgrading php-fpm configuration..." +ynh_script_progression --message="Upgrading PHP-FPM configuration..." -# Create a dedicated php-fpm config -ynh_add_fpm_config +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION #================================================= # SPECIFIC UPGRADE @@ -135,7 +135,7 @@ chmod -R 700 $final_path/data #================================================= # SETUP SSOWAT #================================================= -ynh_print_info "Upgrading SSOwat configuration..." +ynh_script_progression --message="Upgrading SSOwat configuration..." # Make app public if necessary if [ $is_public -eq 1 ] @@ -144,15 +144,18 @@ then ynh_app_setting_set $app unprotected_uris "/" fi +#================================================= +# GENERIC FINALIZATION #================================================= # RELOAD NGINX #================================================= -ynh_print_info "Reloading nginx web server..." +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 -systemctl reload nginx +ynh_systemd_action --service_name=nginx --action=reload #================================================= # END OF SCRIPT #================================================= -ynh_print_info "Upgrade of $app completed" +ynh_script_progression --message="Upgrade of $app completed" --last + From 63d9361046e18044807e92d92f0039106e91bed5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 11:28:38 +0200 Subject: [PATCH 52/58] Update install --- scripts/install | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ebf1659..ce95962 100755 --- a/scripts/install +++ b/scripts/install @@ -171,7 +171,15 @@ ynh_systemd_action --service_name=nginx --action=reload # SEND A README FOR THE ADMIN #================================================= -message=" $app was successfully installed :) \n Please open https://$domain$path_url \n The admin username is: $admin_username \n And the admin password is: $password \n If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" +message=" $app was successfully installed :) \n + +Please open https://$domain$path_url \n + +The admin username is: $admin_username \n + +And the admin password is: $password \n + +If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" ynh_send_readme_to_admin "$message" From 803ab6c08d2c45e65c440688b31e13ad006a01e1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 11:35:13 +0200 Subject: [PATCH 53/58] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index ce95962..70110ea 100755 --- a/scripts/install +++ b/scripts/install @@ -175,9 +175,9 @@ message=" $app was successfully installed :) \n Please open https://$domain$path_url \n -The admin username is: $admin_username \n - -And the admin password is: $password \n +Your credentials for the admin panel are: +- admin username: $admin_username +- admin password: $password If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" From eecfb66ac013130eda71aa3bad64c5ac8c2956e5 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 11:35:59 +0200 Subject: [PATCH 54/58] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 70110ea..d0251cd 100755 --- a/scripts/install +++ b/scripts/install @@ -173,7 +173,7 @@ ynh_systemd_action --service_name=nginx --action=reload message=" $app was successfully installed :) \n -Please open https://$domain$path_url \n +Please open https://$domain$path_url Your credentials for the admin panel are: - admin username: $admin_username From 74e0a9e2a0d99bc82fcc28c2e2e394173d9ca36e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 11:51:29 +0200 Subject: [PATCH 55/58] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a0542b1..0b98d31 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full ## Screenshots -![](https://webtrees.net/assets/img/tree-mock-screen.png) +![](https://upload.wikimedia.org/wikipedia/commons/thumb/0/01/Webtrees.png/1200px-Webtrees.png) ## Demo From a7078863ac42723cfd29854b5c3e354fb31ae5f4 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 14:06:51 +0200 Subject: [PATCH 56/58] improve mail message --- scripts/_common.sh | 4 +++- scripts/install | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c047f44..1c686cb 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -59,7 +59,9 @@ ynh_send_readme_to_admin() { local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - local mail_message="This is an automated message from your beloved YunoHost server. \nSpecific information for the application $app.\n$app_message\n---\nAutomatic diagnosis data from YunoHost\n$(yunohost tools diagnosis | grep -B 100 "services:" | sed '/services:/d')" + local mail_message="This is an automated message from your beloved YunoHost server. + Specific information for $app. + $app_message" # Define binary to use for mail command if [ -e /usr/bin/bsd-mailx ] diff --git a/scripts/install b/scripts/install index d0251cd..b117ac5 100755 --- a/scripts/install +++ b/scripts/install @@ -171,7 +171,7 @@ ynh_systemd_action --service_name=nginx --action=reload # SEND A README FOR THE ADMIN #================================================= -message=" $app was successfully installed :) \n +message=" Webtrees was successfully installed :) Please open https://$domain$path_url @@ -179,7 +179,7 @@ Your credentials for the admin panel are: - admin username: $admin_username - admin password: $password -If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/Webtrees_ynh" +If you facing an issue or want to improve Webtrees, please open a new issue in this project: https://github.com/YunoHost-Apps/webtrees_ynh" ynh_send_readme_to_admin "$message" From 4ecc6d27b649ad625f1715e723a6bdfafda52324 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 14:11:19 +0200 Subject: [PATCH 57/58] Update _common.sh --- scripts/_common.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 1c686cb..f042f41 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -59,9 +59,8 @@ ynh_send_readme_to_admin() { local mail_subject="☁️🆈🅽🅷☁️: \`$app\` has important message for you" - local mail_message="This is an automated message from your beloved YunoHost server. - Specific information for $app. - $app_message" + local mail_message="This is an automated message from your beloved YunoHost server. Specific information for $app. +$app_message" # Define binary to use for mail command if [ -e /usr/bin/bsd-mailx ] From 6527e55bd674bc5d6b0a262014ce092c64084106 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 16 Oct 2020 14:16:10 +0200 Subject: [PATCH 58/58] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index b117ac5..f0d4e47 100755 --- a/scripts/install +++ b/scripts/install @@ -171,7 +171,7 @@ ynh_systemd_action --service_name=nginx --action=reload # SEND A README FOR THE ADMIN #================================================= -message=" Webtrees was successfully installed :) +message="Webtrees was successfully installed :) Please open https://$domain$path_url