From 7a8e4365a5f076474e519560abc277a8a6296550 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:09:39 +0100 Subject: [PATCH 01/32] Upgrade to v.8.0 --- LICENSE | 676 +++++++++++++++++++++++++++++++++++++++++- README.md | 36 ++- README_fr.md | 44 ++- check_process.default | 13 - conf/app.src | 8 +- conf/nginx.conf | 4 +- conf/noalyss.conf | 71 +++-- conf/php-fpm.conf | 2 +- scripts/_common.sh | 15 +- scripts/backup | 50 +--- scripts/install | 227 ++++---------- scripts/remove | 71 ++--- scripts/restore | 28 +- 13 files changed, 896 insertions(+), 349 deletions(-) diff --git a/LICENSE b/LICENSE index f3cff84..f288702 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,674 @@ -File containing the license of your package. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 -More information here: -https://github.com/YunoHost/doc/blob/master/packaging_apps_guidelines_fr.md#yep-13---indiquer-la-licence-associ%C3%A9e-au-paquet---brouillon--auto--working- + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md index 8fe9357..a44a18f 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Noalyss](http://noalyss.eu) is a belgian and french accountant software available in english, dutch and french. -**Included version:** 7.2 +**Included version:** 8.0 ## Screenshots @@ -27,7 +27,7 @@ At the end of the installation process, you need to open https://domain/path/ins ## Documentation -* [documentation officielle](http://www.noalyss.eu/?page_id=1031). + * Official documentation: https://wiki.noalyss.eu/doku.php ## YunoHost specific features @@ -38,15 +38,33 @@ At the end of the installation process, you need to open https://domain/path/ins #### Supported architectures -* TODO x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/noalyss/) -* TODO ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/noalyss/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/noalyss/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/noalyss/) -See the [french README](./README_fr.md#architectures-supportées) +## Limitations -## Questions and Todos - -See the [french README](./README_fr.md#questions-et-todos) +* Any known limitations. ## Additional information -See the [french README](./README_fr.md) because it's the current main README. +* Other info you would like to add about this app. + +## Links + + * Report a bug: https://github.com/YunoHost-Apps/noalyss_ynh/issues + * App website: https://www.noalyss.eu/ + * Upstream app repository: Link to the official repository of the upstream app. + * YunoHost website: https://yunohost.org/ + +--- + +## Developer info + +Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/noalyss_ynh/tree/testing). + +To try the testing branch, please proceed like that. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/noalyss_ynh/tree/testing --debug +or +sudo yunohost app upgrade noalyss -u https://github.com/YunoHost-Apps/noalyss_ynh/tree/testing --debug +``` diff --git a/README_fr.md b/README_fr.md index aa89606..07600f0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ ## Noalyss pour Yunohost -[![Integration level](https://dash.yunohost.org/integration/noalyss.svg)](https://dash.yunohost.org/appci/app/noalyss) -[![Install noalyss with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=noalyss) +[![Integration level](https://dash.yunohost.org/integration/noalyss.svg)](https://dash.yunohost.org/appci/app/noalyss) ![](https://ci-apps.yunohost.org/ci/badges/noalyss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/noalyss.maintain.svg) +[![Installer noalyss avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=noalyss) *[Read this readme in english.](./README.md)* @@ -10,9 +10,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ### Vue d'ensemble -[Noalyss](http://noalyss.eu) est une application de comptabilité belge et française que vous pourrez modifier suivant vos envies. L'interface est disponible en anglais, français et néerlandais. +[Noalyss](http://noalyss.eu) est une application de comptabilité belge et française que vous pourrez modifier suivant vos envies. L'interface est disponible en anglais, français et néerlandais. -**Version incluse:** 7.2 +**Version incluse:** 8.0 ### Captures d'écran @@ -28,7 +28,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ### Documentation -* [documentation officielle](http://www.noalyss.eu/?page_id=1031). + * Documentation officielle : https://wiki.noalyss.eu/doku.php + * Documentation YunoHost : ### Caractéristiques spécifiques YunoHost @@ -39,9 +40,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ##### Architectures supportées -* TODO x86-64b - [![Build Status](https://ci-apps.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/noalyss/) -* TODO ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/noalyss/) -* TODO Jessie x86-64b - [![Build Status](https://ci-stretch.nohost.me/ci/logs/noalyss%20%28Community%29.svg)](https://ci-stretch.nohost.me/ci/apps/noalyss/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps.yunohost.org/ci/apps/noalyss/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/noalyss%20%28Community%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/noalyss/) ##### sur LIME2 (Ynh 3.2.1, sur carte microSD) _(les essais portent sur install,backup,remove,restore)_ @@ -98,3 +98,31 @@ Il faut les sources de Noalyss et différentes versions sont disponibles. Actuel - [Version actuelle 7.2](http://download.noalyss.eu/derniere-version/) - [Versions antérieures](http://download.noalyss.eu/noalyss-package/) + +## Limitations + +* Limitations connues. + +## Informations additionnelles + +* Autres informations que vous souhaitez ajouter sur cette application. + +## Liens + + * Signaler un bug : https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/issues + * Site de l'application : https://www.noalyss.eu/ + * Dépôt de l'application principale : Lien vers le dépôt officiel de l'application principale. + * Site web YunoHost : https://yunohost.org/ + +--- + +## Informations pour les développeurs + +Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/noalyss_ynh/tree/testing). + +Pour essayer la branche testing, procédez comme suit. +``` +sudo yunohost app install https://github.com/YunoHost-Apps/noalyss_ynh/tree/testing --debug +ou +sudo yunohost app upgrade noalyss -u https://github.com/YunoHost-Apps/noalyss_ynh/tree/testing --debug +``` diff --git a/check_process.default b/check_process.default index cbf2d12..3bd13be 100644 --- a/check_process.default +++ b/check_process.default @@ -26,19 +26,6 @@ incorrect_path=1 port_already_use=0 change_url=1 -;;; 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 - Level 5=auto - Level 6=auto - Level 7=auto - Level 8=0 - Level 9=0 - Level 10=0 ;;; Options Email= Notification=none diff --git a/conf/app.src b/conf/app.src index e72b837..c2f50ca 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=http://download.noalyss.eu/derniere-version/noalyss-7201.tar.gz +SOURCE_URL=https://download.noalyss.eu/dernier-version/noalyss-8002.tar.gz +SOURCE_SUM=c6d0f4a1c213f2975601fb2f4af34419232558095b079e7536994204dda86b74 +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=noalyss-7201.tar.gz -SOURCE_SUM=90d7f2b4644eff4170d8049b90687530ce2eb49bf98ebc2ec638354b3bb64068 -SOURCE_SUM_PRG=sha256sum \ No newline at end of file +SOURCE_FILENAME= diff --git a/conf/nginx.conf b/conf/nginx.conf index 2a33f67..873ea75 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 @@ -18,7 +17,7 @@ location __PATH__/ { 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; @@ -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/conf/noalyss.conf b/conf/noalyss.conf index 7d6c4a0..75f4a19 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -1,35 +1,72 @@ - +// To allow to access the Info system +// define ("SYSINFO_DISPLAY",true); +// For developpement +// define ("NOALYSS VERSION",9999); + +// If you want to override the parameters you have to define OVERRIDE_PARAM +// and give your own parameters for max_execution_time and memory limit +// define ('OVERRIDE_PARAM',1); +// ini_set ('max_execution_time',240); +// ini_set ('memory_limit','256M'); +// For converting file to PDF +// define ('OFFICE','/usr/bin/unoconv'); +// define ('GENERATE_PDF','YES'); + +// If you want to use open_basedir or if you are limited by the server's config +// you can uncomment this +// after replace NOALYSS_HOME by the path of the local installation of Noalyss +// ini_alter("open_basedir", "/usr/bin:/tmp/:NOALYSS_HOME"); + +// In recent distribution linux, pdftk is a snap, you should set the path +// for exporting document in PDF +// $pdftk = /usr/bin/pdftk +// $pdftk = /snap/bin/pdftk diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf index 9147379..b4c2372 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/scripts/_common.sh b/scripts/_common.sh index b3b9f3d..285be8f 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -2,16 +2,17 @@ #================================================= # COMMON VARIABLES #================================================= -# TODO : remove p7zip-full if not needed -# for jessie -pkg_dependencies="postgresql php5 php5-pgsql php5-gd php-gettext p7zip-full libgd2-xpm-dev" -if [ "$(lsb_release --codename --short)" != "jessie" ]; then - pkg_dependencies="postgresql php-pgsql php-gd php-gettext p7zip-full php-zip php-bcmath" -fi +YNH_PHP_VERSION="7.3" + +pkg_dependencies="postgresql libgd2-xpm-dev" + +extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-gd php-gettext" #================================================= # COMMON HELPERS #================================================= -# None for the moment. \ No newline at end of file +#================================================= +# EXPERIMENTAL HELPERS +#================================================= diff --git a/scripts/backup b/scripts/backup index eae7c3e..001ea7d 100755 --- a/scripts/backup +++ b/scripts/backup @@ -28,64 +28,44 @@ 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" +ynh_backup --src_path="$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" +ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Backing up php-fpm configuration..." +ynh_print_info "Backing up PHP-FPM configuration..." -ynh_backup "/etc/php/7.0/fpm/pool.d/$app.conf" +ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP THE POSTGRES DATABASE #================================================= -ynh_print_info "Backing up the Postgres database..." +ynh_print_info --message="Backing up the PostgreSQL database..." -ynh_psql_dump_db $app > db.sql - -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= -#ynh_print_info "Backing up logrotate configuration..." - -#ynh_backup "/etc/logrotate.d/$app" - -#================================================= -# BACKUP SYSTEMD -#================================================= -#ynh_print_info "Backing up systemd configuration..." - -#ynh_backup "/etc/systemd/system/$app.service" - -#================================================= -# BACKUP A CRON FILE -#================================================= - -#ynh_backup "/etc/cron.d/$app" +ynh_psql_dump_db --database="$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 --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/install b/scripts/install index 99ff657..044dca3 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 @@ -26,31 +22,16 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH -#admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE -#password=$YNH_APP_ARG_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 #================================================= # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS #================================================= -ynh_print_info "Validating installation parameters..." +ynh_script_progression --message="Validating installation parameters..." --weight=1 -### 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" -### NOTICE : for Noalyss the .tgz contains a /html, a /include and other files. only the /html have to be exposed and it is specified in ./conf/nginx.conf final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" @@ -58,74 +39,46 @@ test ! -e "$final_path" || ynh_die "This path already contains a folder" path_url=$(ynh_normalize_url_path $path_url) # 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 domain $domain -ynh_app_setting_set $app path $path_url -#ynh_app_setting_set $app admin $admin -ynh_app_setting_set $app is_public $is_public -ynh_app_setting_set $app language $language +ynh_app_setting_set --app=$app --key=domain --value=$domain +ynh_app_setting_set --app=$app --key=path --value=$path_url +ynh_app_setting_set --app=$app --key=is_public --value=$is_public +ynh_app_setting_set --app=$app --key=language --value=$language #================================================= # STANDARD MODIFICATIONS #================================================= # INSTALL DEPENDENCIES #================================================= -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 -### - As well as the section "REINSTALL DEPENDENCIES" in the restore script -### - And the section "UPGRADE DEPENDENCIES" in the upgrade script +ynh_script_progression --message="Installing dependencies..." ynh_install_app_dependencies $pkg_dependencies #================================================= -# CREATE A MYSQL DATABASE +# CREATE A POSTGRESQL DATABASE #================================================= -#ynh_print_info "Creating a MySQL database..." +ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 -### 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: -### done - Remove the section "BACKUP THE MYSQL DATABASE" in the backup script -### done - Remove also the section "REMOVE THE MYSQL DATABASE" in the remove script -### TODO - As well as the section "RESTORE THE MYSQL DATABASE" in the restore script +db_name=$(ynh_sanitize_dbid --db_name=$app) +db_user=$db_name +db_pwd=$(ynh_string_random --length=30) -#db_name=$(ynh_sanitize_dbid $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_app_setting_set --app=$app --key=db_pwd --value=$db_pwd -#================================================= -# CREATE A POSTGRESS DATABASE -#================================================= - -ynh_print_info "Testing if Postgress is installed..." ynh_psql_test_if_first_run - -ynh_print_info "Creating a Postgress database..." -db_name=$(ynh_sanitize_dbid $app) -ynh_app_setting_set $app db_name $db_name -ynh_psql_setup_db $db_name $db_name - +ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -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_script_progression --message="Setting up source files..." ynh_app_setting_set $app final_path $final_path # Download, check integrity, uncompress and patch the source from app.src @@ -134,116 +87,67 @@ ynh_setup_source "$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 +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= # CREATE DEDICATED USER #================================================= -ynh_print_info "Configuring system user..." +ynh_script_progression --message="Configuring system user..." --weight=1 # 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..." --weight=3 -### `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 --package="$extra_php_dependencies" +phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) -# Create a dedicated php-fpm config -ynh_add_fpm_config +# #================================================= +# # SETUP APPLICATION WITH CURL +# #================================================= -#================================================= -# SPECIFIC SETUP -#================================================= -# ... -#================================================= +# # Set the app as temporarily public for cURL call +# ynh_permission_update --permission "main" --add "visitors" -#================================================= -# SETUP SYSTEMD -#================================================= -#ynh_print_info "Configuring a systemd service..." +# # Reload NGINX +# ynh_systemd_action --service_name=nginx --action=reload -### `ynh_systemd_config` is used to configure a systemd script for an app. -### It can be used for apps that use sysvinit (with adaptation) or systemd. -### Have a look at the app to be sure this app needs a systemd script. -### `ynh_systemd_config` will use the file conf/systemd.service -### If you're not using these lines: -### - You can remove those files in conf/. -### - Remove the section "BACKUP SYSTEMD" in the backup script -### - Remove also the section "STOP AND REMOVE SERVICE" in the remove script -### - As well as the section "RESTORE SYSTEMD" in the restore script -### - And the section "SETUP SYSTEMD" in the upgrade script +# ynh_script_progression --message="Finalizing installation..." --weight=10 -# Create a dedicated systemd config -#ynh_add_systemd_config +# # Installation with cURL +# installUrl="/admin/install.php?submit" -#================================================= -# SETUP APPLICATION WITH CURL -#================================================= +# ynh_local_curl $installUrl "install=2" "db_type=psql" "hostname=localhost" "db_username=$db_user" "db_password=$db_pwd" "database_name=$db_name" "admin_username=" "admin_password=" "db_table_prefix=$db_name" "db_table_plugin_prefix=plugin" "db_table_suffix=_table" "timezone=UTC" -### Use these lines only if the app installation needs to be finalized through -### web forms. We generally don't want to ask the final user, -### so we're going to use curl to automatically fill the fields and submit the -### forms. +# # Remove the `admin/` directory from within the MantisBT installation path. +# # The scripts within this directory should not be accessible on a live MantisBT site +# # or on any installation that is accessible via the Internet. +# ynh_secure_remove "$final_path/admin" -# Set right permissions for curl install -chown -R $app: $final_path - -# Set the app as temporarily public for curl call -ynh_print_info "Configuring SSOwat..." -ynh_app_setting_set $app skipped_uris "/" -# Reload SSOwat config -yunohost app ssowatconf - -# Reload Nginx -systemctl reload nginx - -# Installation with curl -# ynh_print_info "Finalizing installation..." -# ynh_local_curl "/INSTALL_PATH" "key1=value1" "key2=value2" "key3=value3" - -# Remove the public access -if [ $is_public -eq 0 ] -then - ynh_app_setting_delete $app skipped_uris -fi +# # Set the user chosen at installation as administrator +# #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;" #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_print_info "Modifying $app config file..." +ynh_script_progression --message="Modifying $app config file..." + cp ../conf/noalyss.conf $final_path/include/config.inc.php -### `ynh_replace_string` is used to replace a string in a file. -### (It's compatible with sed regular expressions syntax) -#psqlpwd=$(ynh_app_setting_get $app psqlpwd) -#ynh_print_info "dbpass : $psqlpwd " -ynh_replace_string "DATABASE_PASSWORD" "$(ynh_app_setting_get $app psqlpwd)" "$final_path/include/config.inc.php" +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" #================================================= # 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/include/config.inc.php" @@ -253,25 +157,13 @@ ynh_store_file_checksum "$final_path/include/config.inc.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 root: $final_path +chown -R $app: $final_path #================================================= # SETUP LOGROTATE #================================================= -ynh_print_info "Configuring log rotation..." - -### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app. -### Use this helper only if there is effectively a log file for this app. -### If you're not using this helper: -### - Remove the section "BACKUP LOGROTATE" in the backup script -### - Remove also the section "REMOVE LOGROTATE CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE LOGROTATE CONFIGURATION" in the restore script -### - And the section "SETUP LOGROTATE" in the upgrade script +ynh_script_progression --message="Configuring log rotation..." # Use logrotate to manage application logfile(s) ynh_use_logrotate @@ -280,36 +172,25 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -### `yunohost service add` is a CLI yunohost command to add a service in the admin panel. -### You'll find the service in the 'services' section of YunoHost admin panel. -### This CLI command would be useless if the app does not have any services (systemd or sysvinit) -### If you're not using these lines: -### - You can remove these files in conf/. -### - Remove the section "REMOVE SERVICE FROM ADMIN PANEL" in the remove script -### - As well as the section "ADVERTISE SERVICE IN ADMIN PANEL" in the restore script - -# yunohost service add $app --log "/var/log/$app/$app.log" -# if using yunohost version 3.2 or more in the 'manifest.json', a description can be added -#yunohost service add $app --description "$app daemon for XXX" --log "/var/log/$app/$app.log" +yunohost service add $app --log "/var/log/$app/$app.log" #================================================= # SETUP SSOWAT #================================================= -ynh_print_info "Configuring SSOwat..." +ynh_script_progression --message="Configuring SSOwat..." -# Make app public if necessary +# Make app public if necessary or protect it if [ $is_public -eq 1 ] then - # unprotected_uris allows SSO credentials to be passed anyway. - ynh_app_setting_set $app unprotected_uris "/" + ynh_permission_update --permission "main" --add "visitors" fi #================================================= # 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 diff --git a/scripts/remove b/scripts/remove index 39d7511..89cc877 100755 --- a/scripts/remove +++ b/scripts/remove @@ -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 @@ -28,33 +28,25 @@ final_path=$(ynh_app_setting_get $app final_path) # REMOVE SERVICE FROM ADMIN PANEL #================================================= -# Remove a service from the admin panel, added by `yunohost service add` -#if yunohost service status $app >/dev/null 2>&1 -#then -# ynh_print_info "Removing $app service" -# yunohost service remove $app -#fi +# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +if ynh_exec_warn_less yunohost service status $app >/dev/null +then + ynh_script_progression --message="Removing $app service integration..." --weight=1 + yunohost service remove $app +fi #================================================= -# STOP AND REMOVE SERVICE +# REMOVE THE POSTGRESQL DATABASE #================================================= -#ynh_print_info "Stopping and removing the systemd service" - -# Remove the dedicated systemd config -#ynh_remove_systemd_config - -#================================================= -# REMOVE THE POSTGRES DATABASE -#================================================= -ynh_print_info "Removing the Postgres database" +ynh_script_progression --message="Removing the PostgreSQL database" # Remove a database if it exists, along with the associated user -ynh_psql_remove_db $db_user +ynh_psql_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 @@ -62,7 +54,7 @@ ynh_remove_app_dependencies #================================================= # REMOVE APP MAIN DIR #================================================= -ynh_print_info "Removing app main directory" +ynh_script_progression --message="Removing app main directory" # Remove the app directory securely ynh_secure_remove "$final_path" @@ -70,58 +62,33 @@ ynh_secure_remove "$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 #================================================= # REMOVE LOGROTATE CONFIGURATION #================================================= -ynh_print_info "Removing logrotate configuration" +ynh_script_progression --message="Removing logrotate configuration" # Remove the app-specific logrotate config ynh_remove_logrotate -#================================================= -# CLOSE A PORT -#================================================= - -#if yunohost firewall list | grep -q "\- $port$" -#then -# ynh_print_info "Closing port $port" -# ynh_exec_warn_less yunohost firewall disallow TCP $port -#fi - -#================================================= -# SPECIFIC REMOVE -#================================================= -# REMOVE THE CRON FILE -#================================================= - -# Remove a cron file -#ynh_secure_remove "/etc/cron.d/$app" - -# Remove a directory securely -#ynh_secure_remove "/etc/$app/" - -# Remove the log files -#ynh_secure_remove "/var/log/$app/"# -# ##================================================= ## GENERIC FINALIZATION #================================================= # 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 @@ -130,4 +97,4 @@ ynh_system_user_delete $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 125bfaf..50a008c 100755 --- a/scripts/restore +++ b/scripts/restore @@ -77,7 +77,7 @@ chown -R $app: $final_path # 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 @@ -99,40 +99,20 @@ ynh_psql_test_if_first_run ynh_psql_setup_db $db_name $db_name $(ynh_app_setting_get $app psqlpwd) ynh_psql_execute_file_as_root ./db.sql $db_name -#================================================= -# RESTORE SYSTEMD -#================================================= -#ynh_print_info "Restoring the systemd configuration..." - -#ynh_restore_file "/etc/systemd/system/$app.service" -#systemctl enable $app.service - #================================================= # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -#yunohost service add $app --log "/var/log/$app/$app.log" - -#================================================= -# RESTORE THE CRON FILE -#================================================= - -#ynh_restore_file "/etc/cron.d/$app" - -#================================================= -# RESTORE THE LOGROTATE CONFIGURATION -#================================================= - -#ynh_restore_file "/etc/logrotate.d/$app" +yunohost service add $app --log "/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_print_info "Reloading nginx web server and php-fpm..." +ynh_print_info "Reloading nginx web server and PHP-FPM..." -systemctl reload php7.0-fpm +systemctl reload php$phpversion-fpm systemctl reload nginx #================================================= From a973171c83f2a1b39476682bb9c82b77bd9ddc45 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:11:19 +0100 Subject: [PATCH 02/32] fix --- check_process.default => check_process | 0 scripts/remove | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename check_process.default => check_process (100%) diff --git a/check_process.default b/check_process similarity index 100% rename from check_process.default rename to check_process diff --git a/scripts/remove b/scripts/remove index 89cc877..fb5524f 100755 --- a/scripts/remove +++ b/scripts/remove @@ -91,7 +91,7 @@ ynh_remove_logrotate 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 From 8552d42eb42a5575e5084bd30e778a6294f222ab Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:19:04 +0100 Subject: [PATCH 03/32] Update _common.sh --- scripts/_common.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 285be8f..e3b4548 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,11 +3,11 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.3" +YNH_PHP_VERSION="7.4" -pkg_dependencies="postgresql libgd2-xpm-dev" +pkg_dependencies="postgresql postgresql apt-transport-https libgd-dev" -extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-gd php-gettext" +extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd" #================================================= # COMMON HELPERS From e528a302467fdae831aa7899f215e04d9e5759ec Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:38:48 +0100 Subject: [PATCH 04/32] fix --- check_process | 4 ---- scripts/backup | 7 ------- scripts/install | 7 +++++-- scripts/remove | 2 +- scripts/restore | 1 - 5 files changed, 6 insertions(+), 15 deletions(-) diff --git a/check_process b/check_process index 3bd13be..0441658 100644 --- a/check_process +++ b/check_process @@ -11,7 +11,6 @@ language="fr" is_public=1 (PUBLIC|public=1|private=0) password="pass" - port="666" (PORT) ; Checks pkg_linter=1 setup_sub_dir=1 @@ -20,11 +19,8 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=CommitHash backup_restore=1 multi_instance=1 - incorrect_path=1 - port_already_use=0 change_url=1 ;;; Options Email= diff --git a/scripts/backup b/scripts/backup index 001ea7d..cd87c45 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,11 +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 #================================================= @@ -53,7 +47,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP THE PHP-FPM CONFIGURATION #================================================= -ynh_print_info "Backing up PHP-FPM configuration..." ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" diff --git a/scripts/install b/scripts/install index 044dca3..597908c 100755 --- a/scripts/install +++ b/scripts/install @@ -159,6 +159,7 @@ ynh_store_file_checksum "$final_path/include/config.inc.php" # Set permissions to app files chown -R $app: $final_path +chown $app: $final_path/include/constant.php #================================================= # SETUP LOGROTATE @@ -172,7 +173,7 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" #================================================= # SETUP SSOWAT @@ -196,6 +197,8 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_print_info "Installation of $app completed" +ynh_script_progression --message="Installation of $app completed" --last + + ynh_print_info "Default Noalyss admin / pass are phpcompta. Enjoy !" ynh_print_info "Go to https://$domain$path_url/install.php to continue !" diff --git a/scripts/remove b/scripts/remove index fb5524f..5161b95 100755 --- a/scripts/remove +++ b/scripts/remove @@ -28,7 +28,7 @@ final_path=$(ynh_app_setting_get $app final_path) # REMOVE SERVICE FROM ADMIN PANEL #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." --weight=1 diff --git a/scripts/restore b/scripts/restore index 50a008c..4cd0abf 100755 --- 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 From 744a976bc2a889113c2526ce8490ab053590f09e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:44:49 +0100 Subject: [PATCH 05/32] Update _common.sh --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index e3b4548..827ceef 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -3,11 +3,11 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="7.3" pkg_dependencies="postgresql postgresql apt-transport-https libgd-dev" -extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd" +extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php-gettext" #================================================= # COMMON HELPERS From 3788c661700553e8c94228e90f03b4e95d374586 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 10:57:02 +0100 Subject: [PATCH 06/32] Fix --- conf/noalyss.conf | 8 ++++---- manifest.json | 33 +++++++++++++++++++++++++++------ scripts/install | 5 +++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/conf/noalyss.conf b/conf/noalyss.conf index 75f4a19..4f01960 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -12,13 +12,13 @@ define ("noalyss_psql_host","localhost"); // If you change the NOALYSS_ADMINISTRATOR , you will need to rerun http://..../noalyss/html/install.php // But it doesn't change the password -define ("NOALYSS_ADMINISTRATOR","admin"); +define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); // used only for install -define ("NOALYSS_ADMIN_PASSWORD",""); +define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__"); define ("LOCALE",1); -define ("domaine",""); +define ("domaine","__DOMAIN__"); define ("MULTI",1); -define ("dbname",""); +define ("dbname","__DB_NAME__"); // Uncomment to DEBUG // define ("DEBUG",TRUE); // Uncomment to log your input diff --git a/manifest.json b/manifest.json index a03a5ab..8336a0b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,21 +1,21 @@ { - "name": "NOALYSS (phpcompta)", + "name": "Noalyss", "id": "noalyss", "packaging_format": 1, "description": { "en": "Accounting free software (Beligum and French accounting)", "fr": "Logiciel libre de comptabilité (comptabilité Belge et Française)" }, - "version": "7.2~ynh1", + "version": "8.0~ynh1", "url": "http://noalyss.eu", - "license": "free", + "license": "AGPL-3.0-only", "maintainer": { "name": "datatierce", "email": "github@computhings.be", "url": "https://computhings.be" }, "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 4.0.0" }, "multi_instance": false, "services": [ @@ -40,8 +40,29 @@ "en": "Choose a path for Noalyss", "fr": "Choisissez un chemin pour Noalyss" }, - "example": "/compta", - "default": "/compta" + "example": "/noalyss", + "default": "/noalyss" + }, + { + "name": "admin", + "type": "user", + "ask": { + "en": "Choose the Mantis administrator", + "fr": "Choisissez l’administrateur de Mantis" + } + }, + { + "name": "password", + "type": "password", + "ask": { + "en": "Set the administrator password", + "fr": "Définissez le mot de passe administrateur" + }, + "help": { + "en": "Use the help field to add an information for the admin about this question.", + "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." + }, + "example": "Choose a password" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 597908c..eb34203 100755 --- a/scripts/install +++ b/scripts/install @@ -24,6 +24,8 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE +password=$YNH_APP_ARG_PASSWORD +admin=$YNH_APP_ARG_ADMIN app=$YNH_APP_INSTANCE_NAME @@ -50,6 +52,7 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=language --value=$language +ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= # STANDARD MODIFICATIONS @@ -143,6 +146,8 @@ cp ../conf/noalyss.conf $final_path/include/config.inc.php ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" #================================================= # STORE THE CONFIG FILE CHECKSUM From e3dc1fb3e1d922b5484c5f7bc5607be852634342 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 11:00:57 +0100 Subject: [PATCH 07/32] Update install --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index eb34203..87ae848 100755 --- a/scripts/install +++ b/scripts/install @@ -148,6 +148,7 @@ ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --ta ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/include/config.inc.php" #================================================= # STORE THE CONFIG FILE CHECKSUM From 55a10dbdef6fd5b5ab15cb92109602139d689257 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 11:16:22 +0100 Subject: [PATCH 08/32] fix --- check_process | 4 +- scripts/install | 8 +-- scripts/upgrade | 173 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 scripts/upgrade diff --git a/check_process b/check_process index 0441658..521a2ff 100644 --- a/check_process +++ b/check_process @@ -20,8 +20,8 @@ setup_public=1 upgrade=1 backup_restore=1 - multi_instance=1 - change_url=1 + multi_instance=0 + change_url=0 ;;; Options Email= Notification=none diff --git a/scripts/install b/scripts/install index 87ae848..8686d64 100755 --- a/scripts/install +++ b/scripts/install @@ -125,14 +125,14 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # ynh_script_progression --message="Finalizing installation..." --weight=10 # # Installation with cURL -# installUrl="/admin/install.php?submit" +# installUrl="/install.php?submit" # ynh_local_curl $installUrl "install=2" "db_type=psql" "hostname=localhost" "db_username=$db_user" "db_password=$db_pwd" "database_name=$db_name" "admin_username=" "admin_password=" "db_table_prefix=$db_name" "db_table_plugin_prefix=plugin" "db_table_suffix=_table" "timezone=UTC" -# # Remove the `admin/` directory from within the MantisBT installation path. -# # The scripts within this directory should not be accessible on a live MantisBT site +# # Remove the `install.php` directory from within the Noalyss installation path. +# # The scripts within this directory should not be accessible on a live Noalyss site # # or on any installation that is accessible via the Internet. -# ynh_secure_remove "$final_path/admin" +# ynh_secure_remove "$final_path/html/install.php" # # Set the user chosen at installation as administrator # #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;" diff --git a/scripts/upgrade b/scripts/upgrade new file mode 100644 index 0000000..d2df90a --- /dev/null +++ b/scripts/upgrade @@ -0,0 +1,173 @@ +#!/bin/bash + +#================================================= +# GENERIC START +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source _common.sh +source /usr/share/yunohost/helpers + +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading installation settings..." --weight=1 + +app=$YNH_APP_INSTANCE_NAME + +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +is_public=$(ynh_app_setting_get --app=$app --key=is_public) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) +db_user=$db_name +phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) + +#================================================= +# CHECK VERSION +#================================================= + +upgrade_type=$(ynh_check_app_version_changed) + +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 + +# Fix is_public as a boolean value +if [ "$is_public" = "Yes" ]; then + ynh_app_setting_set --app=$app --key=is_public --value=1 + is_public=1 +elif [ "$is_public" = "No" ]; then + ynh_app_setting_set --app=$app --key=is_public --value=0 + is_public=0 +fi + +# If db_name doesn't exist, create it +if [ -z "$db_name" ]; then + db_name=$(ynh_sanitize_dbid --db_name=$app) + ynh_app_setting_set --app=$app --key=db_name --value=$db_name +fi + +# If final_path doesn't exist, create it +if [ -z "$final_path" ]; then + final_path=/var/www/$app + ynh_app_setting_set --app=$app --key=final_path --value=$final_path +fi + +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up $app before upgrading (may take a while)..." --weight=5 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# DOWNLOAD, CHECK AND UNPACK SOURCE +#================================================= + +if [ "$upgrade_type" == "UPGRADE_APP" ] +then + ynh_script_progression --message="Upgrading source files..." --weight=5 + + # Create a temporary directory + tmpdir="$(mktemp -d)" + + cp -a "$final_path/include/config.inc.php" "$tmpdir/config.inc.php" + + # Remove the app directory securely + ynh_secure_remove --file=$final_path + + # Download, check integrity, uncompress and patch the source from app.src + ynh_setup_source --dest_dir=$final_path + + cp -a "$tmpdir/config.inc.php" "$final_path/include/config.inc.php" + + # Remove the tmp directory securely + ynh_secure_remove --file="$tmpdir" +fi + +#================================================= +# NGINX CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 + +# Create a dedicated NGINX config +ynh_add_nginx_config + +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." --weight=2 + +ynh_install_app_dependencies $pkg_dependencies + +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1 + +# Create a dedicated user (if not existing) +ynh_system_user_create --username=$app + +#================================================= +# PHP-FPM CONFIGURATION +#================================================= +ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 + +# Create a dedicated PHP-FPM config +ynh_add_fpm_config --package="$extra_php_dependencies" + +#================================================= +# SECURE FILES AND DIRECTORIES +#================================================= + +# Set permissions to app files +chown -R $app: $final_path +chown $app: $final_path/include/constant.php + +#================================================= +# SETUP APPLICATION WITH CURL +#================================================= + +# # Set the app as temporarily public for cURL call +# ynh_permission_update --permission "main" --add "visitors" + +# # Reload NGINX +# ynh_systemd_action --service_name=nginx --action=reload + +# ynh_script_progression --message="Finalizing installation..." --weight=10 + +# # Installation with cURL +# installUrl="/install.php?submit" + +# ynh_local_curl $installUrl "install=2" "lang=fr_FR.utf8" + +# # Remove the `install.php` directory from within the Noalyss installation path. +# # The scripts within this directory should not be accessible on a live Noalyss site +# # or on any installation that is accessible via the Internet. +# ynh_secure_remove "$final_path/html/install.php" + +# # Set the user chosen at installation as administrator +# #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;" + +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= +ynh_script_progression --message="Upgrade of $app completed" --last From 34a539c61818041da0ebf267cbed046c40d95913 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 11:36:27 +0100 Subject: [PATCH 09/32] Fix --- scripts/remove | 7 +++---- scripts/restore | 28 ++++++++++++---------------- scripts/upgrade | 6 ++++++ 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/scripts/remove b/scripts/remove index 5161b95..8aa1549 100755 --- a/scripts/remove +++ b/scripts/remove @@ -16,11 +16,10 @@ ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME -domain=$(ynh_app_setting_get $app domain) -port=$(ynh_app_setting_get $app port) -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) #===============#================================== # STANDARD REMOVE diff --git a/scripts/restore b/scripts/restore index 4cd0abf..736e3c7 100755 --- a/scripts/restore +++ b/scripts/restore @@ -13,11 +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 #================================================= @@ -27,15 +22,16 @@ ynh_print_info "Loading settings..." app=$YNH_APP_INSTANCE_NAME -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) +domain=$(ynh_app_setting_get --app=$app --key=domain) +path_url=$(ynh_app_setting_get --app=$app --key=path) +final_path=$(ynh_app_setting_get --app=$app --key=final_path) +db_name=$(ynh_app_setting_get --app=$app --key=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}" @@ -53,14 +49,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 the app 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 @@ -83,7 +79,7 @@ ynh_restore_file "/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # REINSTALL DEPENDENCIES #================================================= -ynh_print_info "Reinstalling dependencies..." +ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies @@ -91,7 +87,7 @@ ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE POSTGRES DATABASE #================================================= -ynh_print_info "Restoring the Postgres database..." +ynh_script_progression --message="Restoring the Postgres database..." db_pwd=$(ynh_app_setting_get $app mysqlpwd) ynh_psql_test_if_first_run @@ -109,7 +105,7 @@ yunohost service add $app --log "/var/log/$app/$app.log" #================================================= # 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 php$phpversion-fpm systemctl reload nginx @@ -118,4 +114,4 @@ systemctl reload nginx # END OF SCRIPT #================================================= -ynh_print_info "Restoration completed for $app" +ynh_script_progression --message="Restoration completed for $app" diff --git a/scripts/upgrade b/scripts/upgrade index d2df90a..22ee326 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -135,6 +135,12 @@ ynh_add_fpm_config --package="$extra_php_dependencies" chown -R $app: $final_path chown $app: $final_path/include/constant.php +#================================================= +# ADVERTISE SERVICE IN ADMIN PANEL +#================================================= + +yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" + #================================================= # SETUP APPLICATION WITH CURL #================================================= From 5f1f5a54f96a7efd20ea49e6dd9daa27d0aedeac Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 11:41:46 +0100 Subject: [PATCH 10/32] Fix --- scripts/install | 4 ++-- scripts/restore | 23 ++++++++++++++--------- scripts/upgrade | 2 +- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/scripts/install b/scripts/install index 8686d64..eb5e836 100755 --- a/scripts/install +++ b/scripts/install @@ -109,7 +109,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring PHP-FPM..." --weight=3 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # #================================================= @@ -127,7 +127,7 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # # Installation with cURL # installUrl="/install.php?submit" -# ynh_local_curl $installUrl "install=2" "db_type=psql" "hostname=localhost" "db_username=$db_user" "db_password=$db_pwd" "database_name=$db_name" "admin_username=" "admin_password=" "db_table_prefix=$db_name" "db_table_plugin_prefix=plugin" "db_table_suffix=_table" "timezone=UTC" +# ynh_local_curl $installUrl "install=2" "lang=fr_FR.utf8" # # Remove the `install.php` directory from within the Noalyss installation path. # # The scripts within this directory should not be accessible on a live Noalyss site diff --git a/scripts/restore b/scripts/restore index 736e3c7..e21afba 100755 --- a/scripts/restore +++ b/scripts/restore @@ -25,8 +25,10 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) -db_name=$(ynh_app_setting_get --app=$app --key=db_name) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name +db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) #================================================= # CHECK IF THE APP CAN BE RESTORED @@ -71,9 +73,13 @@ chown -R $app: $final_path #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= +ynh_script_progression --message="Restoring PHP-FPM configuration..." ynh_restore_file "/etc/php/$phpversion/fpm/pool.d/$app.conf" +# Recreate a dedicated PHP-FPM config +ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" + #================================================= # SPECIFIC RESTORATION #================================================= @@ -85,14 +91,13 @@ ynh_script_progression --message="Reinstalling dependencies..." ynh_install_app_dependencies $pkg_dependencies #================================================= -# RESTORE THE POSTGRES DATABASE +# RESTORE THE POSTGRESQL DATABASE #================================================= -ynh_script_progression --message="Restoring the Postgres database..." +ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=6 -db_pwd=$(ynh_app_setting_get $app mysqlpwd) ynh_psql_test_if_first_run -ynh_psql_setup_db $db_name $db_name $(ynh_app_setting_get $app psqlpwd) -ynh_psql_execute_file_as_root ./db.sql $db_name +ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name #================================================= # ADVERTISE SERVICE IN ADMIN PANEL @@ -105,10 +110,10 @@ yunohost service add $app --log "/var/log/$app/$app.log" #================================================= # RELOAD NGINX AND PHP-FPM #================================================= -ynh_script_progression --message="Reloading nginx web server and PHP-FPM..." +ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." -systemctl reload php$phpversion-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 diff --git a/scripts/upgrade b/scripts/upgrade index 22ee326..6b8ba1d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -125,7 +125,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=1 # Create a dedicated PHP-FPM config -ynh_add_fpm_config --package="$extra_php_dependencies" +ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencies" #================================================= # SECURE FILES AND DIRECTORIES From 8b4b31281a414247686a01d5a7fe0f2b200ebce7 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 11:43:50 +0100 Subject: [PATCH 11/32] Fix --- scripts/change_url | 114 +++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 1 - 2 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 scripts/change_url diff --git a/scripts/change_url b/scripts/change_url new file mode 100644 index 0000000..4c38f67 --- /dev/null +++ b/scripts/change_url @@ -0,0 +1,114 @@ +#!/bin/bash + +#================================================= +# GENERIC STARTING +#================================================= +# IMPORT GENERIC HELPERS +#================================================= + +source _common.sh +source /usr/share/yunohost/helpers + +#================================================= +# RETRIEVE ARGUMENTS +#================================================= + +old_domain=$YNH_APP_OLD_DOMAIN +old_path=$YNH_APP_OLD_PATH + +new_domain=$YNH_APP_NEW_DOMAIN +new_path=$YNH_APP_NEW_PATH + +app=$YNH_APP_INSTANCE_NAME + +#================================================= +# LOAD SETTINGS +#================================================= +ynh_script_progression --message="Loading installation settings..." --weight=1 + +# Needed for helper "ynh_add_nginx_config" +final_path=$(ynh_app_setting_get --app=$app --key=final_path) + +# Add settings here as needed by your application +db_name=$(ynh_app_setting_get --app=$app --key=db_name) +db_user=$db_name +db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) + +#================================================= +# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +#================================================= +ynh_script_progression --message="Backing up $app before changing its URL (may take a while)..." --weight=7 + +# Backup the current version of the app +ynh_backup_before_upgrade +ynh_clean_setup () { + # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. + ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" + + # restore it if the upgrade fails + ynh_restore_upgradebackup +} +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors + +#================================================= +# CHECK WHICH PARTS SHOULD BE CHANGED +#================================================= + +change_domain=0 +if [ "$old_domain" != "$new_domain" ] +then + change_domain=1 +fi + +change_path=0 +if [ "$old_path" != "$new_path" ] +then + change_path=1 +fi + +#================================================= +# STANDARD MODIFICATIONS +#================================================= +# MODIFY URL IN NGINX CONF +#================================================= +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 + +nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf + +# Change the path in the NGINX config file +if [ $change_path -eq 1 ] +then + # Make a backup of the original NGINX config file if modified + ynh_backup_if_checksum_is_different --file="$nginx_conf_path" + # Set global variables for NGINX helper + domain="$old_domain" + path_url="$new_path" + # Create a dedicated NGINX config + ynh_add_nginx_config +fi + +# Change the domain for NGINX +if [ $change_domain -eq 1 ] +then + # Delete file checksum for the old conf file location + ynh_delete_file_checksum --file="$nginx_conf_path" + mv $nginx_conf_path /etc/nginx/conf.d/$new_domain.d/$app.conf + # Store file checksum for the new config file location + ynh_store_file_checksum --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" +fi + +#================================================= +# GENERIC FINALISATION +#================================================= +# RELOAD NGINX +#================================================= +ynh_script_progression --message="Reloading NGINX web server..." --weight=1 + +ynh_systemd_action --service_name=nginx --action=reload + +#================================================= +# END OF SCRIPT +#================================================= + +ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index eb5e836..0a75989 100755 --- a/scripts/install +++ b/scripts/install @@ -13,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 #================================================= From 8bdebcecd11febd7fd1df1ac94f5e3fc95c0f2ac Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 11:58:14 +0100 Subject: [PATCH 12/32] Fix --- scripts/install | 2 +- scripts/remove | 10 +++++----- scripts/restore | 3 ++- scripts/upgrade | 2 +- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 0a75989..1dcaac3 100755 --- a/scripts/install +++ b/scripts/install @@ -178,7 +178,7 @@ ynh_use_logrotate # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" +#yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" #================================================= # SETUP SSOWAT diff --git a/scripts/remove b/scripts/remove index 8aa1549..f90307a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -28,11 +28,11 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) -if ynh_exec_warn_less yunohost service status $app >/dev/null -then - ynh_script_progression --message="Removing $app service integration..." --weight=1 - yunohost service remove $app -fi +# if ynh_exec_warn_less yunohost service status $app >/dev/null +# then +# ynh_script_progression --message="Removing $app service integration..." --weight=1 +# yunohost service remove $app +# fi #================================================= # REMOVE THE POSTGRESQL DATABASE diff --git a/scripts/restore b/scripts/restore index e21afba..e7f02e6 100755 --- a/scripts/restore +++ b/scripts/restore @@ -69,6 +69,7 @@ ynh_system_user_create $app # Restore permissions on app files chown -R $app: $final_path +chown $app: $final_path/include/constant.php #================================================= # RESTORE THE PHP-FPM CONFIGURATION @@ -103,7 +104,7 @@ ynh_psql_execute_file_as_root --file="./db.sql" --database=$db_name # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +#yunohost service add $app --log "/var/log/$app/$app.log" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 6b8ba1d..5d98357 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -139,7 +139,7 @@ chown $app: $final_path/include/constant.php # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" +#yunohost service add $app --description "Accounting free software" --log "/var/log/$app/$app.log" #================================================= # SETUP APPLICATION WITH CURL From 654ea2c8b17bdf6079ff49136bf7e4ce199dcc1b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:07:24 +0100 Subject: [PATCH 13/32] Fix --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a44a18f..e3c3039 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Configuration -At the end of the installation process, you need to open https://domain/path/install.php to start using it. +At the end of the installation process, you need to open `https://domain/noalyss/install.php` to start using it. ## Documentation diff --git a/README_fr.md b/README_fr.md index 07600f0..71bfdc1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ### Configuration -À la fin de l'installation de l'application il faut se rendre sur https://domaine/chemin/install.php pour terminer la procédure. +À la fin de l'installation de l'application il faut se rendre sur `https://domaine/noalysse/install.php` pour terminer la procédure. ### Documentation From 7c367d0715a6298713500333b2bb8cae9b15b70e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:09:00 +0100 Subject: [PATCH 14/32] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 1dcaac3..07dfc98 100755 --- a/scripts/install +++ b/scripts/install @@ -131,7 +131,7 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # # Remove the `install.php` directory from within the Noalyss installation path. # # The scripts within this directory should not be accessible on a live Noalyss site # # or on any installation that is accessible via the Internet. -# ynh_secure_remove "$final_path/html/install.php" +ynh_secure_remove "$final_path/html/install.php" # # Set the user chosen at installation as administrator # #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;" From 563bb424c64f1db5fe56398db2d32a4039e50a9d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:17:10 +0100 Subject: [PATCH 15/32] Fix --- conf/noalyss.conf | 2 +- scripts/install | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/noalyss.conf b/conf/noalyss.conf index 4f01960..a0c3e2c 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -14,7 +14,7 @@ define ("noalyss_psql_host","localhost"); // But it doesn't change the password define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); // used only for install -define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__"); +define ("NOALYSS_ADMIN_PASSWORD",""); define ("LOCALE",1); define ("domaine","__DOMAIN__"); define ("MULTI",1); diff --git a/scripts/install b/scripts/install index 07dfc98..980b993 100755 --- a/scripts/install +++ b/scripts/install @@ -131,7 +131,7 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # # Remove the `install.php` directory from within the Noalyss installation path. # # The scripts within this directory should not be accessible on a live Noalyss site # # or on any installation that is accessible via the Internet. -ynh_secure_remove "$final_path/html/install.php" +#ynh_secure_remove "$final_path/html/install.php" # # Set the user chosen at installation as administrator # #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;" From fd6b16a164dbc8a2d7ba0c3797c91337bc3e8f1e Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:18:27 +0100 Subject: [PATCH 16/32] Fix --- manifest.json | 13 ------------- scripts/install | 2 -- 2 files changed, 15 deletions(-) diff --git a/manifest.json b/manifest.json index 8336a0b..e9460a7 100644 --- a/manifest.json +++ b/manifest.json @@ -50,19 +50,6 @@ "en": "Choose the Mantis administrator", "fr": "Choisissez l’administrateur de Mantis" } - }, - { - "name": "password", - "type": "password", - "ask": { - "en": "Set the administrator password", - "fr": "Définissez le mot de passe administrateur" - }, - "help": { - "en": "Use the help field to add an information for the admin about this question.", - "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." - }, - "example": "Choose a password" }, { "name": "is_public", diff --git a/scripts/install b/scripts/install index 980b993..cd1c33c 100755 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,6 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC language=$YNH_APP_ARG_LANGUAGE -password=$YNH_APP_ARG_PASSWORD admin=$YNH_APP_ARG_ADMIN app=$YNH_APP_INSTANCE_NAME @@ -146,7 +145,6 @@ cp ../conf/noalyss.conf $final_path/include/config.inc.php ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/include/config.inc.php" #================================================= From 9aef5bd2aaf07f16f7e0bf26fe5e8a5b0638bbb0 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:18:44 +0100 Subject: [PATCH 17/32] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 71bfdc1..c299e06 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ##### Support multi-utilisateurs * Pas d'authentification LDAP, les utilisateur·ice·s sont gérés dans l'application. -* Plusieurs utilisateur·ice·s sont donc possibles et disponibles pour les différents dossiers comptables. Une gestion des accès est prise en charge dans Noalyss. +* Plusieurs utilisateur·ice·s sont donc possibles et disponibles pour les différents dossiers comptables. Une gestion des accès est prise en charge dans Noalyss. ##### Architectures supportées From 588beeff7072bec47f6350987b9c4e6afb3fdcb1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:26:08 +0100 Subject: [PATCH 18/32] Fix --- conf/noalyss.conf | 6 +++--- scripts/install | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/noalyss.conf b/conf/noalyss.conf index a0c3e2c..75f4a19 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -12,13 +12,13 @@ define ("noalyss_psql_host","localhost"); // If you change the NOALYSS_ADMINISTRATOR , you will need to rerun http://..../noalyss/html/install.php // But it doesn't change the password -define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); +define ("NOALYSS_ADMINISTRATOR","admin"); // used only for install define ("NOALYSS_ADMIN_PASSWORD",""); define ("LOCALE",1); -define ("domaine","__DOMAIN__"); +define ("domaine",""); define ("MULTI",1); -define ("dbname","__DB_NAME__"); +define ("dbname",""); // Uncomment to DEBUG // define ("DEBUG",TRUE); // Uncomment to log your input diff --git a/scripts/install b/scripts/install index cd1c33c..8348153 100755 --- a/scripts/install +++ b/scripts/install @@ -144,8 +144,8 @@ cp ../conf/noalyss.conf $final_path/include/config.inc.php ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/include/config.inc.php" +#ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" +#ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/include/config.inc.php" #================================================= # STORE THE CONFIG FILE CHECKSUM From 63d2903a3613dc5db4594509a005c02547e09261 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 12:38:02 +0100 Subject: [PATCH 19/32] Fix --- manifest.json | 10 ---------- scripts/install | 11 ++--------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/manifest.json b/manifest.json index e9460a7..23157c0 100644 --- a/manifest.json +++ b/manifest.json @@ -59,16 +59,6 @@ "fr": "Est-ce une application publique ?" }, "default": true - }, - { - "name": "language", - "type": "string", - "ask": { - "en": "Choose the application language", - "fr": "Choisissez la langue de l'application" - }, - "choices": ["fr", "en"], - "default": "fr" } ] } diff --git a/scripts/install b/scripts/install index 8348153..79f0cc1 100755 --- a/scripts/install +++ b/scripts/install @@ -22,7 +22,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC -language=$YNH_APP_ARG_LANGUAGE admin=$YNH_APP_ARG_ADMIN app=$YNH_APP_INSTANCE_NAME @@ -35,9 +34,6 @@ ynh_script_progression --message="Validating installation parameters..." --weigh final_path=/var/www/$app test ! -e "$final_path" || ynh_die "This path already contains a folder" -# Normalize the url path syntax -path_url=$(ynh_normalize_url_path $path_url) - # Register (book) web path ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url @@ -49,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=is_public --value=$is_public -ynh_app_setting_set --app=$app --key=language --value=$language ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= @@ -81,9 +76,9 @@ ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd #================================================= ynh_script_progression --message="Setting up source files..." -ynh_app_setting_set $app final_path $final_path +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 @@ -144,8 +139,6 @@ cp ../conf/noalyss.conf $final_path/include/config.inc.php ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" -#ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" -#ynh_replace_string --match_string="__DOMAIN__" --replace_string="$domain" --target_file="$final_path/include/config.inc.php" #================================================= # STORE THE CONFIG FILE CHECKSUM From b948f2e84dcda15bb007483f45853d98331931ee Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 13:23:34 +0100 Subject: [PATCH 20/32] Add admin --- conf/noalyss.conf | 2 +- scripts/install | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/noalyss.conf b/conf/noalyss.conf index 75f4a19..be813bf 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -12,7 +12,7 @@ define ("noalyss_psql_host","localhost"); // If you change the NOALYSS_ADMINISTRATOR , you will need to rerun http://..../noalyss/html/install.php // But it doesn't change the password -define ("NOALYSS_ADMINISTRATOR","admin"); +define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); // used only for install define ("NOALYSS_ADMIN_PASSWORD",""); define ("LOCALE",1); diff --git a/scripts/install b/scripts/install index 79f0cc1..0434e5f 100755 --- a/scripts/install +++ b/scripts/install @@ -139,6 +139,7 @@ cp ../conf/noalyss.conf $final_path/include/config.inc.php ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" #================================================= # STORE THE CONFIG FILE CHECKSUM From d1cc633758d6cb37fccd310217a380f93af9e570 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 13:38:43 +0100 Subject: [PATCH 21/32] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 521a2ff..d501264 100644 --- a/check_process +++ b/check_process @@ -21,7 +21,7 @@ upgrade=1 backup_restore=1 multi_instance=0 - change_url=0 + change_url=14 ;;; Options Email= Notification=none From b866d94253a7e49256755999e2e025ee663efe83 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 28 Nov 2020 13:38:50 +0100 Subject: [PATCH 22/32] Update check_process --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index d501264..f0b8ae9 100644 --- a/check_process +++ b/check_process @@ -21,7 +21,7 @@ upgrade=1 backup_restore=1 multi_instance=0 - change_url=14 + change_url=1 ;;; Options Email= Notification=none From e1d715860b6bba943a153f933a276e72cdbf038d Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Jan 2021 16:40:02 +0100 Subject: [PATCH 23/32] Update README_fr.md --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index c299e06..30129ce 100644 --- a/README_fr.md +++ b/README_fr.md @@ -109,7 +109,7 @@ Il faut les sources de Noalyss et différentes versions sont disponibles. Actuel ## Liens - * Signaler un bug : https://github.com/YunoHost-Apps/REPLACEBYYOURAPP_ynh/issues + * Signaler un bug : https://github.com/YunoHost-Apps/noalyss_ynh/issues * Site de l'application : https://www.noalyss.eu/ * Dépôt de l'application principale : Lien vers le dépôt officiel de l'application principale. * Site web YunoHost : https://yunohost.org/ From 458512298012ff7d61b4fca6f410e7f1cb111df9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 11 Jan 2021 16:44:58 +0100 Subject: [PATCH 24/32] Fix --- scripts/_common.sh | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 827ceef..c987018 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ YNH_PHP_VERSION="7.3" -pkg_dependencies="postgresql postgresql apt-transport-https libgd-dev" +pkg_dependencies="postgresql apt-transport-https libgd-dev" extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-xml php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-gd php-gettext" diff --git a/scripts/install b/scripts/install index 0434e5f..0a356d3 100755 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A POSTGRESQL DATABASE diff --git a/scripts/restore b/scripts/restore index e7f02e6..0fd7c46 100755 --- a/scripts/restore +++ b/scripts/restore @@ -89,7 +89,7 @@ ynh_add_fpm_config --usage=low --footprint=low --package="$extra_php_dependencie ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index 5d98357..0cbed8a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,7 +109,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." --weight=2 -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER From d61dd9baeb8ff1b5bdccc693a9b92fd897ae4b49 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 1 Mar 2021 11:36:32 +0100 Subject: [PATCH 25/32] upgrade to 8101 --- README.md | 4 ++-- README_fr.md | 4 ++-- conf/app.src | 4 ++-- conf/noalyss.conf | 10 +++++++--- manifest.json | 15 ++++++++++++--- scripts/change_url | 2 +- scripts/install | 16 ++++++---------- scripts/restore | 2 +- scripts/upgrade | 10 ++++++++-- 9 files changed, 41 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index e3c3039..11e5ba0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Noalyss for YunoHost [![Integration level](https://dash.yunohost.org/integration/noalyss.svg)](https://dash.yunohost.org/appci/app/noalyss) ![](https://ci-apps.yunohost.org/ci/badges/noalyss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/noalyss.maintain.svg) -[![Install Noalyss with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=noalyss) +[![Install Noalyss with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=noalyss) *[Lire ce readme en français.](./README_fr.md)* @@ -11,7 +11,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview [Noalyss](http://noalyss.eu) is a belgian and french accountant software available in english, dutch and french. -**Included version:** 8.0 +**Included version:** 8.1.0.1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 30129ce..392d59e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,7 +1,7 @@ ## Noalyss pour Yunohost [![Integration level](https://dash.yunohost.org/integration/noalyss.svg)](https://dash.yunohost.org/appci/app/noalyss) ![](https://ci-apps.yunohost.org/ci/badges/noalyss.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/noalyss.maintain.svg) -[![Installer noalyss avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=noalyss) +[![Installer noalyss avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=noalyss) *[Read this readme in english.](./README.md)* @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour [Noalyss](http://noalyss.eu) est une application de comptabilité belge et française que vous pourrez modifier suivant vos envies. L'interface est disponible en anglais, français et néerlandais. -**Version incluse:** 8.0 +**Version incluse:** 8.1.0.1 ### Captures d'écran diff --git a/conf/app.src b/conf/app.src index c2f50ca..0cf8d55 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://download.noalyss.eu/dernier-version/noalyss-8002.tar.gz -SOURCE_SUM=c6d0f4a1c213f2975601fb2f4af34419232558095b079e7536994204dda86b74 +SOURCE_URL=https://download.noalyss.eu/dernier-version/noalyss-8101.tar.gz +SOURCE_SUM=bd481e4d4a1f47dc6c1fe46451a0f5afd6b1c008ec0f1e4c7a03c2c703f9b647 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/noalyss.conf b/conf/noalyss.conf index be813bf..dca73b7 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -6,7 +6,7 @@ define("PG_RESTORE","/usr/bin/pg_restore "); define("PG_DUMP","/usr/bin/pg_dump "); define ("PSQL","/usr/bin/psql"); define ("noalyss_user","__DB_NAME__"); -define ("noalyss_password","__DB_PASS__"); +define ("noalyss_password","__DB_PWD__"); define ("noalyss_psql_port","5432"); define ("noalyss_psql_host","localhost"); @@ -14,7 +14,7 @@ define ("noalyss_psql_host","localhost"); // But it doesn't change the password define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); // used only for install -define ("NOALYSS_ADMIN_PASSWORD",""); +define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__"); define ("LOCALE",1); define ("domaine",""); define ("MULTI",1); @@ -69,4 +69,8 @@ define ("dbname",""); // In recent distribution linux, pdftk is a snap, you should set the path // for exporting document in PDF // $pdftk = /usr/bin/pdftk -// $pdftk = /snap/bin/pdftk +// $pdftk = /snap/bin/pdftk +// Define a random session key if you work with different version of NOALYSS +// define ('SESSION_KEY','abcde'); +// Max size is defined by default to 2MB, it could be also needed to modify PHP Ini file +// define ("MAX_FILE_SIZE",2097152); diff --git a/manifest.json b/manifest.json index 23157c0..deaae08 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Accounting free software (Beligum and French accounting)", "fr": "Logiciel libre de comptabilité (comptabilité Belge et Française)" }, - "version": "8.0~ynh1", + "version": "8.1.0.1~ynh1", "url": "http://noalyss.eu", "license": "AGPL-3.0-only", "maintainer": { @@ -15,12 +15,12 @@ "url": "https://computhings.be" }, "requirements": { - "yunohost": ">= 4.0.0" + "yunohost": ">= 4.1.0" }, "multi_instance": false, "services": [ "nginx", - "php7.0-fpm" + "php7.3-fpm" ], "arguments": { "install" : [ @@ -51,6 +51,15 @@ "fr": "Choisissez l’administrateur de Mantis" } }, + { + "name": "password", + "type": "password", + "ask": { + "en": "Set the administrator password", + "fr": "Définissez le mot de passe administrateur" + }, + "example": "Choose a password" + }, { "name": "is_public", "type": "boolean", diff --git a/scripts/change_url b/scripts/change_url index 4c38f67..21ab533 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -32,7 +32,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # Add settings here as needed by your application db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name -db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP diff --git a/scripts/install b/scripts/install index 0a356d3..13a7079 100755 --- a/scripts/install +++ b/scripts/install @@ -23,6 +23,7 @@ domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC admin=$YNH_APP_ARG_ADMIN +password=$YNH_APP_ARG_PASSWORD app=$YNH_APP_INSTANCE_NAME @@ -44,7 +45,6 @@ ynh_script_progression --message="Storing installation settings..." ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url -ynh_app_setting_set --app=$app --key=is_public --value=$is_public ynh_app_setting_set --app=$app --key=admin --value=$admin #================================================= @@ -63,13 +63,9 @@ ynh_script_progression --message="Creating a PostgreSQL database..." --weight=2 db_name=$(ynh_sanitize_dbid --db_name=$app) db_user=$db_name -db_pwd=$(ynh_string_random --length=30) - ynh_app_setting_set --app=$app --key=db_name --value=$db_name -ynh_app_setting_set --app=$app --key=db_pwd --value=$db_pwd - ynh_psql_test_if_first_run -ynh_psql_setup_db --db_user=$db_user --db_name=$db_name --db_pwd=$db_pwd +ynh_psql_setup_db --db_user=$db_name --db_name=$db_name #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -138,8 +134,9 @@ ynh_script_progression --message="Modifying $app config file..." cp ../conf/noalyss.conf $final_path/include/config.inc.php ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__DB_PASS__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" #================================================= # STORE THE CONFIG FILE CHECKSUM @@ -175,12 +172,12 @@ ynh_use_logrotate #================================================= # SETUP SSOWAT #================================================= -ynh_script_progression --message="Configuring SSOwat..." +ynh_script_progression --message="Configuring permissions..." # Make app public if necessary or protect it if [ $is_public -eq 1 ] then - ynh_permission_update --permission "main" --add "visitors" + ynh_permission_update --permission="main" --add="visitors" fi #================================================= @@ -196,6 +193,5 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Installation of $app completed" --last - ynh_print_info "Default Noalyss admin / pass are phpcompta. Enjoy !" ynh_print_info "Go to https://$domain$path_url/install.php to continue !" diff --git a/scripts/restore b/scripts/restore index 0fd7c46..ee0ce3f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -28,7 +28,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name -db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) #================================================= # CHECK IF THE APP CAN BE RESTORED diff --git a/scripts/upgrade b/scripts/upgrade index 0cbed8a..eb213ef 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,10 +18,9 @@ app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) -is_public=$(ynh_app_setting_get --app=$app --key=is_public) final_path=$(ynh_app_setting_get --app=$app --key=final_path) db_name=$(ynh_app_setting_get --app=$app --key=db_name) -db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) +db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) db_user=$db_name phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) @@ -57,6 +56,13 @@ if [ -z "$final_path" ]; then ynh_app_setting_set --app=$app --key=final_path --value=$final_path fi +# Cleaning legacy permissions +if ynh_legacy_permissions_exists; then + ynh_legacy_permissions_delete_all + + ynh_app_setting_delete --app=$app --key=is_public +fi + #================================================= # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP #================================================= From 34b6f1a9cee2d73ccd8dbd247f0f81c7cd446909 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 2 Mar 2021 09:39:02 +0100 Subject: [PATCH 26/32] Fix --- conf/noalyss.conf | 4 ++-- scripts/install | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/noalyss.conf b/conf/noalyss.conf index dca73b7..49e7bb7 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -16,9 +16,9 @@ define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); // used only for install define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__"); define ("LOCALE",1); -define ("domaine",""); +define ("domaine","__DOMAIN__"); define ("MULTI",1); -define ("dbname",""); +define ("dbname","__DB_NAME__"); // Uncomment to DEBUG // define ("DEBUG",TRUE); // Uncomment to log your input diff --git a/scripts/install b/scripts/install index 13a7079..b3a5b65 100755 --- a/scripts/install +++ b/scripts/install @@ -193,5 +193,5 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Installation of $app completed" --last -ynh_print_info "Default Noalyss admin / pass are phpcompta. Enjoy !" -ynh_print_info "Go to https://$domain$path_url/install.php to continue !" +ynh_print_info "Default Noalys: admin / password: phpcompta. Enjoy!" +ynh_print_info "Go to https://$domain$path_url/install.php to continue!" From 7d1614de98a226cba3ca6f75d7769cb482cdacea Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 2 Mar 2021 09:39:55 +0100 Subject: [PATCH 27/32] Update install --- scripts/install | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/install b/scripts/install index b3a5b65..d79b791 100755 --- a/scripts/install +++ b/scripts/install @@ -129,21 +129,21 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) #================================================= # MODIFY A CONFIG FILE #================================================= -ynh_script_progression --message="Modifying $app config file..." +# ynh_script_progression --message="Modifying $app config file..." -cp ../conf/noalyss.conf $final_path/include/config.inc.php +# cp ../conf/noalyss.conf $final_path/include/config.inc.php -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" +# ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" +# ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" +# ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" +# ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= +# #================================================= +# # STORE THE CONFIG FILE CHECKSUM +# #================================================= -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum "$final_path/include/config.inc.php" +# # Calculate and store the config file checksum into the app settings +# ynh_store_file_checksum "$final_path/include/config.inc.php" #================================================= # GENERIC FINALIZATION From cd2516f1aa501e19a8ec6354966cc6f313d3adb3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 2 Mar 2021 09:46:56 +0100 Subject: [PATCH 28/32] Send email --- scripts/_common.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++ scripts/install | 23 +++++++++++++++--- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c987018..e4ba661 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -16,3 +16,61 @@ extra_php_dependencies="php${YNH_PHP_VERSION}-pgsql php${YNH_PHP_VERSION}-zip ph #================================================= # EXPERIMENTAL HELPERS #================================================= + + +# Send an email to inform the administrator +# +# usage: ynh_send_readme_to_admin app_message [recipients] +# | arg: app_message - The message to send to the administrator. +# | arg: recipients - The recipients of this email. Use spaces to separate multiples recipients. - default: root +# example: "root admin@domain" +# If you give the name of a YunoHost user, ynh_send_readme_to_admin will find its email adress for you +# example: "root admin@domain user1 user2" +ynh_send_readme_to_admin() { + local app_message="${1:-...No specific information...}" + local recipients="${2:-root}" + + # Retrieve the email of users + find_mails () { + local list_mails="$1" + local mail + local recipients=" " + # Read each mail in argument + for mail in $list_mails + do + # Keep root or a real email address as it is + if [ "$mail" = "root" ] || echo "$mail" | grep --quiet "@" + then + recipients="$recipients $mail" + else + # But replace an user name without a domain after by its email + if mail=$(ynh_user_get_info "$mail" "mail" 2> /dev/null) + then + recipients="$recipients $mail" + fi + fi + done + echo "$recipients" + } + recipients=$(find_mails "$recipients") + + 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')" + + # Define binary to use for mail command + if [ -e /usr/bin/bsd-mailx ] + then + local mail_bin=/usr/bin/bsd-mailx + else + local mail_bin=/usr/bin/mail.mailutils + fi + + # Send the email to the recipients + echo "$mail_message" | $mail_bin -a "Content-Type: text/plain; charset=UTF-8" -s "$mail_subject" "$recipients" +} diff --git a/scripts/install b/scripts/install index d79b791..9ccb3f4 100755 --- a/scripts/install +++ b/scripts/install @@ -187,11 +187,28 @@ ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --service_name=nginx --action=reload +#================================================= +# SEND A README FOR THE ADMIN +#================================================= +ynh_script_progression --message="Sending a readme for the admin..." + +message="Noalyss was successfully installed :) + +Please open your $app domain: https://$domain$path_url + +Complete the registration process from the setup page displayed. +Details for MySQL database to be enterted while registration process: + +Database login: $app +Database name: $app +Database password: $db_pwd + +If you are facing any problem or want to improve this app, please open a new issue here: https://github.com/YunoHost-Apps/noalysse_ynh/issues" + +ynh_send_readme_to_admin "$message" + #================================================= # END OF SCRIPT #================================================= ynh_script_progression --message="Installation of $app completed" --last - -ynh_print_info "Default Noalys: admin / password: phpcompta. Enjoy!" -ynh_print_info "Go to https://$domain$path_url/install.php to continue!" From 6c630e918d8ab2b6b24431636e807788d97d4ee1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Tue, 2 Mar 2021 10:09:52 +0100 Subject: [PATCH 29/32] Fix --- conf/noalyss.conf | 4 ++-- scripts/install | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/conf/noalyss.conf b/conf/noalyss.conf index 49e7bb7..dca73b7 100644 --- a/conf/noalyss.conf +++ b/conf/noalyss.conf @@ -16,9 +16,9 @@ define ("NOALYSS_ADMINISTRATOR","__ADMIN__"); // used only for install define ("NOALYSS_ADMIN_PASSWORD","__PASSWORD__"); define ("LOCALE",1); -define ("domaine","__DOMAIN__"); +define ("domaine",""); define ("MULTI",1); -define ("dbname","__DB_NAME__"); +define ("dbname",""); // Uncomment to DEBUG // define ("DEBUG",TRUE); // Uncomment to log your input diff --git a/scripts/install b/scripts/install index 9ccb3f4..0b7844e 100755 --- a/scripts/install +++ b/scripts/install @@ -126,24 +126,24 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # # Set the user chosen at installation as administrator # #ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" <<< "UPDATE ${db_name}_user_table SET username = '$admin' WHERE id = 1;" -#================================================= +# ================================================= # MODIFY A CONFIG FILE +# ================================================= +ynh_script_progression --message="Modifying $app config file..." + +cp ../conf/noalyss.conf $final_path/include/config.inc.php + +ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" +ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" + +#================================================= +# STORE THE CONFIG FILE CHECKSUM #================================================= -# ynh_script_progression --message="Modifying $app config file..." -# cp ../conf/noalyss.conf $final_path/include/config.inc.php - -# ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" -# ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" -# ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" -# ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" - -# #================================================= -# # STORE THE CONFIG FILE CHECKSUM -# #================================================= - -# # Calculate and store the config file checksum into the app settings -# ynh_store_file_checksum "$final_path/include/config.inc.php" +# Calculate and store the config file checksum into the app settings +ynh_store_file_checksum "$final_path/include/config.inc.php" #================================================= # GENERIC FINALIZATION @@ -197,7 +197,7 @@ message="Noalyss was successfully installed :) Please open your $app domain: https://$domain$path_url Complete the registration process from the setup page displayed. -Details for MySQL database to be enterted while registration process: +Details for PostgreSQL database to be enterted while registration process: Database login: $app Database name: $app From 4cce64005698047c6494d71e4a65d3edb3a0e59c Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 17:48:35 +0200 Subject: [PATCH 30/32] Fix --- manifest.json | 22 +--------------------- scripts/install | 14 +------------- scripts/upgrade | 9 --------- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/manifest.json b/manifest.json index deaae08..93e8ad8 100644 --- a/manifest.json +++ b/manifest.json @@ -15,7 +15,7 @@ "url": "https://computhings.be" }, "requirements": { - "yunohost": ">= 4.1.0" + "yunohost": ">= 4.1.7" }, "multi_instance": false, "services": [ @@ -27,46 +27,26 @@ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain name for Noalyss", - "fr": "Choisissez un nom de domaine pour Noalyss" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Noalyss", - "fr": "Choisissez un chemin pour Noalyss" - }, "example": "/noalyss", "default": "/noalyss" }, { "name": "admin", "type": "user", - "ask": { - "en": "Choose the Mantis administrator", - "fr": "Choisissez l’administrateur de Mantis" - } }, { "name": "password", "type": "password", - "ask": { - "en": "Set the administrator password", - "fr": "Définissez le mot de passe administrateur" - }, "example": "Choose a password" }, { "name": "is_public", "type": "boolean", - "ask": { - "en": "Is it a public application?", - "fr": "Est-ce une application publique ?" - }, "default": true } ] diff --git a/scripts/install b/scripts/install index 0b7844e..f2b36c8 100755 --- a/scripts/install +++ b/scripts/install @@ -131,19 +131,7 @@ phpversion=$(ynh_app_setting_get --app="$app" --key=phpversion) # ================================================= ynh_script_progression --message="Modifying $app config file..." -cp ../conf/noalyss.conf $final_path/include/config.inc.php - -ynh_replace_string --match_string="__DB_NAME__" --replace_string="$db_name" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__DB_PWD__" --replace_string="$db_pwd" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__ADMIN__" --replace_string="$admin" --target_file="$final_path/include/config.inc.php" -ynh_replace_string --match_string="__PASSWORD__" --replace_string="$password" --target_file="$final_path/include/config.inc.php" - -#================================================= -# STORE THE CONFIG FILE CHECKSUM -#================================================= - -# Calculate and store the config file checksum into the app settings -ynh_store_file_checksum "$final_path/include/config.inc.php" +ynh_add_config --template="../conf/noalyss.conf" --destination="$final_path/include/config.inc.php" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index eb213ef..0b187c0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,15 +35,6 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -# Fix is_public as a boolean value -if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=1 - is_public=1 -elif [ "$is_public" = "No" ]; then - ynh_app_setting_set --app=$app --key=is_public --value=0 - is_public=0 -fi - # If db_name doesn't exist, create it if [ -z "$db_name" ]; then db_name=$(ynh_sanitize_dbid --db_name=$app) From 0865d0c8f4bff1cd1678fd1a1a85e9761086e397 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 18:46:27 +0200 Subject: [PATCH 31/32] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 93e8ad8..7568514 100644 --- a/manifest.json +++ b/manifest.json @@ -37,7 +37,7 @@ }, { "name": "admin", - "type": "user", + "type": "user" }, { "name": "password", From c3efbeef664416a9191391ce178b59c003852212 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 3 Apr 2021 18:47:01 +0200 Subject: [PATCH 32/32] Update manifest.json --- manifest.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 7568514..a7a39cb 100644 --- a/manifest.json +++ b/manifest.json @@ -37,7 +37,8 @@ }, { "name": "admin", - "type": "user" + "type": "user", + "example": "johndoe" }, { "name": "password",