diff --git a/LICENSE b/LICENSE
index 2026412..dba13ed 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,661 @@
-File containing the license of your package.
+ GNU AFFERO GENERAL PUBLIC LICENSE
+ Version 3, 19 November 2007
-More information here:
-https://choosealicense.com/
+ 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 Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+our General Public Licenses are 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.
+
+ 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.
+
+ Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+ A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate. Many developers of free software are heartened and
+encouraged by the resulting cooperation. However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+ The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community. It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server. Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+ An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals. This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+ 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+ Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software. This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+ 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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details.
+
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source. For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code. There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+ 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 AGPL, see
+.
diff --git a/config_panel.toml.j2 b/conf/config_panel.toml.j2
similarity index 100%
rename from config_panel.toml.j2
rename to conf/config_panel.toml.j2
diff --git a/conf/cron b/conf/cron
new file mode 100644
index 0000000..2bd1768
--- /dev/null
+++ b/conf/cron
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+# Todo cron to create metrics
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 86f404e..aeb0009 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,28 +1,10 @@
#sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
location __PATH__/ {
+ default_type "text/plain";
+
# Path to source
- alias __INSTALL_DIR__/;
+ alias __INSTALL_DIR__/public/;
-### Example PHP configuration (remove it if not used)
- index index.php;
-
- # Common parameter to increase upload size limit in conjunction with dedicated php-fpm file
- #client_max_body_size 50M;
-
- try_files $uri $uri/ index.php;
- location ~ [^/]\.php(/|$) {
- fastcgi_split_path_info ^(.+?\.php)(/.*)$;
- fastcgi_pass unix:/var/run/php/php__PHPVERSION__-fpm-__NAME__.sock;
-
- fastcgi_index index.php;
- include fastcgi_params;
- fastcgi_param REMOTE_USER $remote_user;
- fastcgi_param PATH_INFO $fastcgi_path_info;
- fastcgi_param SCRIPT_FILENAME $request_filename;
- }
-### End of PHP configuration part
-
- # Include SSOWAT user panel.
- include conf.d/yunohost_panel.conf.inc;
+ gzip off;
}
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
deleted file mode 100644
index 13a53b0..0000000
--- a/conf/php-fpm.conf
+++ /dev/null
@@ -1,430 +0,0 @@
-; Start a new pool named 'www'.
-; the variable $pool can be used in any directive and will be replaced by the
-; pool name ('www' here)
-[__NAMETOCHANGE__]
-
-; Per pool prefix
-; It only applies on the following directives:
-; - 'access.log'
-; - 'slowlog'
-; - 'listen' (unixsocket)
-; - 'chroot'
-; - 'chdir'
-; - 'php_values'
-; - 'php_admin_values'
-; When not set, the global prefix (or /usr) applies instead.
-; Note: This directive can also be relative to the global prefix.
-; Default Value: none
-;prefix = /path/to/pools/$pool
-
-; Unix user/group of processes
-; Note: The user is mandatory. If the group is not set, the default user's group
-; will be used.
-user = __USER__
-group = __USER__
-
-; The address on which to accept FastCGI requests.
-; Valid syntaxes are:
-; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
-; a specific port;
-; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
-; a specific port;
-; 'port' - to listen on a TCP socket to all addresses
-; (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/php__PHPVERSION__-fpm-__NAMETOCHANGE__.sock
-
-; Set listen(2) backlog.
-; Default Value: 511 (-1 on FreeBSD and OpenBSD)
-;listen.backlog = 511
-
-; Set permissions for unix socket, if one is used. In Linux, read/write
-; permissions must be set in order to allow connections from a web server. Many
-; BSD-derived systems allow connections regardless of permissions.
-; Default Values: user and group are set as the running user
-; mode is set to 0660
-listen.owner = www-data
-listen.group = www-data
-;listen.mode = 0660
-; When POSIX Access Control Lists are supported you can set them using
-; these options, value is a comma separated list of user/group names.
-; When set, listen.owner and listen.group are ignored
-;listen.acl_users =
-;listen.acl_groups =
-
-; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
-; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
-; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
-; must be separated by a comma. If this value is left blank, connections will be
-; accepted from any ip address.
-; Default Value: any
-;listen.allowed_clients = 127.0.0.1
-
-; Specify the nice(2) priority to apply to the pool processes (only if set)
-; The value can vary from -19 (highest priority) to 20 (lower priority)
-; Note: - It will only work if the FPM master process is launched as root
-; - The pool processes will inherit the master process priority
-; unless it specified otherwise
-; Default Value: no set
-; process.priority = -19
-
-; Set the process dumpable flag (PR_SET_DUMPABLE prctl) even if the process user
-; or group is differrent than the master process user. It allows to create process
-; core dump and ptrace the process for the pool user.
-; Default Value: no
-; process.dumpable = yes
-
-; Choose how the process manager will control the number of child processes.
-; Possible Values:
-; static - a fixed number (pm.max_children) of child processes;
-; dynamic - the number of child processes are set dynamically based on the
-; following directives. With this process management, there will be
-; always at least 1 children.
-; pm.max_children - the maximum number of children that can
-; be alive at the same time.
-; pm.start_servers - the number of children created on startup.
-; pm.min_spare_servers - the minimum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is less than this
-; number then some children will be created.
-; pm.max_spare_servers - the maximum number of children in 'idle'
-; state (waiting to process). If the number
-; of 'idle' processes is greater than this
-; number then some children will be killed.
-; ondemand - no children are created at startup. Children will be forked when
-; new requests will connect. The following parameter are used:
-; pm.max_children - the maximum number of children that
-; can be alive at the same time.
-; pm.process_idle_timeout - The number of seconds after which
-; an idle process will be killed.
-; Note: This value is mandatory.
-pm = dynamic
-
-; The number of child processes to be created when pm is set to 'static' and the
-; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
-; This value sets the limit on the number of simultaneous requests that will be
-; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
-; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
-; CGI. The below defaults are based on a server without much resources. Don't
-; forget to tweak pm.* to fit your needs.
-; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
-; Note: This value is mandatory.
-pm.max_children = 5
-
-; The number of child processes created on startup.
-; Note: Used only when pm is set to 'dynamic'
-; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
-pm.start_servers = 2
-
-; The desired minimum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.min_spare_servers = 1
-
-; The desired maximum number of idle server processes.
-; Note: Used only when pm is set to 'dynamic'
-; Note: Mandatory when pm is set to 'dynamic'
-pm.max_spare_servers = 3
-
-; The number of seconds after which an idle process will be killed.
-; Note: Used only when pm is set to 'ondemand'
-; Default Value: 10s
-;pm.process_idle_timeout = 10s;
-
-; The number of requests each child process should execute before respawning.
-; This can be useful to work around memory leaks in 3rd party libraries. For
-; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
-; Default Value: 0
-;pm.max_requests = 500
-
-; The URI to view the FPM status page. If this value is not set, no URI will be
-; recognized as a status page. It shows the following informations:
-; pool - the name of the pool;
-; process manager - static, dynamic or ondemand;
-; start time - the date and time FPM has started;
-; start since - number of seconds since FPM has started;
-; accepted conn - the number of request accepted by the pool;
-; listen queue - the number of request in the queue of pending
-; connections (see backlog in listen(2));
-; max listen queue - the maximum number of requests in the queue
-; of pending connections since FPM has started;
-; listen queue len - the size of the socket queue of pending connections;
-; idle processes - the number of idle processes;
-; active processes - the number of active processes;
-; total processes - the number of idle + active processes;
-; max active processes - the maximum number of active processes since FPM
-; has started;
-; max children reached - number of times, the process limit has been reached,
-; when pm tries to start more children (works only for
-; pm 'dynamic' and 'ondemand');
-; Value are updated in real time.
-; Example output:
-; pool: www
-; process manager: static
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 62636
-; accepted conn: 190460
-; listen queue: 0
-; max listen queue: 1
-; listen queue len: 42
-; idle processes: 4
-; active processes: 11
-; total processes: 15
-; max active processes: 12
-; max children reached: 0
-;
-; By default the status page output is formatted as text/plain. Passing either
-; 'html', 'xml' or 'json' in the query string will return the corresponding
-; output syntax. Example:
-; http://www.foo.bar/status
-; http://www.foo.bar/status?json
-; http://www.foo.bar/status?html
-; http://www.foo.bar/status?xml
-;
-; By default the status page only outputs short status. Passing 'full' in the
-; query string will also return status for each pool process.
-; Example:
-; http://www.foo.bar/status?full
-; http://www.foo.bar/status?json&full
-; http://www.foo.bar/status?html&full
-; http://www.foo.bar/status?xml&full
-; The Full status returns for each process:
-; pid - the PID of the process;
-; state - the state of the process (Idle, Running, ...);
-; start time - the date and time the process has started;
-; start since - the number of seconds since the process has started;
-; requests - the number of requests the process has served;
-; request duration - the duration in µs of the requests;
-; request method - the request method (GET, POST, ...);
-; request URI - the request URI with the query string;
-; content length - the content length of the request (only with POST);
-; user - the user (PHP_AUTH_USER) (or '-' if not set);
-; script - the main script called (or '-' if not set);
-; last request cpu - the %cpu the last request consumed
-; it's always 0 if the process is not in Idle state
-; because CPU calculation is done when the request
-; processing has terminated;
-; last request memory - the max amount of memory the last request consumed
-; it's always 0 if the process is not in Idle state
-; because memory calculation is done when the request
-; processing has terminated;
-; If the process is in Idle state, then informations are related to the
-; last request the process has served. Otherwise informations are related to
-; the current request being served.
-; Example output:
-; ************************
-; pid: 31330
-; state: Running
-; start time: 01/Jul/2011:17:53:49 +0200
-; start since: 63087
-; requests: 12808
-; request duration: 1250261
-; request method: GET
-; request URI: /test_mem.php?N=10000
-; content length: 0
-; user: -
-; script: /home/fat/web/docs/php/test_mem.php
-; last request cpu: 0.00
-; last request memory: 0
-;
-; Note: There is a real-time FPM status monitoring sample web page available
-; It's available in: /usr/share/php/7.0/fpm/status.html
-;
-; Note: The value must start with a leading slash (/). The value can be
-; anything, but it may not be a good idea to use the .php extension or it
-; may conflict with a real PHP file.
-; Default Value: not set
-;pm.status_path = /status
-
-; The ping URI to call the monitoring page of FPM. If this value is not set, no
-; URI will be recognized as a ping page. This could be used to test from outside
-; that FPM is alive and responding, or to
-; - create a graph of FPM availability (rrd or such);
-; - remove a server from a group if it is not responding (load balancing);
-; - trigger alerts for the operating team (24/7).
-; Note: The value must start with a leading slash (/). The value can be
-; anything, but it may not be a good idea to use the .php extension or it
-; may conflict with a real PHP file.
-; Default Value: not set
-;ping.path = /ping
-
-; This directive may be used to customize the response of a ping request. The
-; response is formatted as text/plain with a 200 response code.
-; Default Value: pong
-;ping.response = pong
-
-; The access log file
-; Default: not set
-;access.log = log/$pool.access.log
-
-; The access log format.
-; The following syntax is allowed
-; %%: the '%' character
-; %C: %CPU used by the request
-; it can accept the following format:
-; - %{user}C for user CPU only
-; - %{system}C for system CPU only
-; - %{total}C for user + system CPU (default)
-; %d: time taken to serve the request
-; it can accept the following format:
-; - %{seconds}d (default)
-; - %{miliseconds}d
-; - %{mili}d
-; - %{microseconds}d
-; - %{micro}d
-; %e: an environment variable (same as $_ENV or $_SERVER)
-; it must be associated with embraces to specify the name of the env
-; variable. Some exemples:
-; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
-; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
-; %f: script filename
-; %l: content-length of the request (for POST request only)
-; %m: request method
-; %M: peak of memory allocated by PHP
-; it can accept the following format:
-; - %{bytes}M (default)
-; - %{kilobytes}M
-; - %{kilo}M
-; - %{megabytes}M
-; - %{mega}M
-; %n: pool name
-; %o: output header
-; it must be associated with embraces to specify the name of the header:
-; - %{Content-Type}o
-; - %{X-Powered-By}o
-; - %{Transfert-Encoding}o
-; - ....
-; %p: PID of the child that serviced the request
-; %P: PID of the parent of the child that serviced the request
-; %q: the query string
-; %Q: the '?' character if query string exists
-; %r: the request URI (without the query string, see %q and %Q)
-; %R: remote IP address
-; %s: status (response code)
-; %t: server time the request was received
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; The strftime(3) format must be encapsuled in a %{}t tag
-; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-; %T: time the log has been written (the request has finished)
-; it can accept a strftime(3) format:
-; %d/%b/%Y:%H:%M:%S %z (default)
-; The strftime(3) format must be encapsuled in a %{}t tag
-; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
-; %u: remote user
-;
-; Default: "%R - %u %t \"%m %r\" %s"
-;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
-
-; The log file for slow requests
-; Default Value: not set
-; Note: slowlog is mandatory if request_slowlog_timeout is set
-;slowlog = log/$pool.log.slow
-
-; The timeout for serving a single request after which a PHP backtrace will be
-; dumped to the 'slowlog' file. A value of '0s' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-;request_slowlog_timeout = 0
-
-; The timeout for serving a single request after which the worker process will
-; be killed. This option should be used when the 'max_execution_time' ini option
-; does not stop script execution for some reason. A value of '0' means 'off'.
-; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
-; Default Value: 0
-request_terminate_timeout = 1d
-
-; Set open file descriptor rlimit.
-; Default Value: system defined value
-;rlimit_files = 1024
-
-; Set max core size rlimit.
-; Possible Values: 'unlimited' or an integer greater or equal to 0
-; Default Value: system defined value
-;rlimit_core = 0
-
-; Chroot to this directory at the start. This value must be defined as an
-; absolute path. When this value is not set, chroot is not used.
-; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
-; of its subdirectories. If the pool prefix is not set, the global prefix
-; will be used instead.
-; Note: chrooting is a great security feature and should be used whenever
-; possible. However, all PHP paths will be relative to the chroot
-; (error_log, sessions.save_path, ...).
-; Default Value: not set
-;chroot =
-
-; Chdir to this directory at the start.
-; Note: relative path can be used.
-; Default Value: current directory or / when chroot
-chdir = __INSTALL_DIR__
-
-; Redirect worker stdout and stderr into main error log. If not set, stdout and
-; stderr will be redirected to /dev/null according to FastCGI specs.
-; Note: on highloaded environement, this can cause some delay in the page
-; process time (several ms).
-; Default Value: no
-;catch_workers_output = yes
-
-; Clear environment in FPM workers
-; Prevents arbitrary environment variables from reaching FPM worker processes
-; by clearing the environment in workers before env vars specified in this
-; pool configuration are added.
-; Setting to "no" will make all environment variables available to PHP code
-; via getenv(), $_ENV and $_SERVER.
-; Default Value: yes
-;clear_env = no
-
-; Limits the extensions of the main script FPM will allow to parse. This can
-; prevent configuration mistakes on the web server side. You should only limit
-; FPM to .php extensions to prevent malicious users to use other extensions to
-; execute php code.
-; Note: set an empty value to allow all extensions.
-; Default Value: .php
-;security.limit_extensions = .php .php3 .php4 .php5 .php7
-
-; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
-; the current environment.
-; Default Value: clean env
-;env[HOSTNAME] = $HOSTNAME
-;env[PATH] = /usr/local/bin:/usr/bin:/bin
-;env[TMP] = /tmp
-;env[TMPDIR] = /tmp
-;env[TEMP] = /tmp
-
-; Additional php.ini defines, specific to this pool of workers. These settings
-; overwrite the values previously defined in the php.ini. The directives are the
-; same as the PHP SAPI:
-; php_value/php_flag - you can set classic ini defines which can
-; be overwritten from PHP call 'ini_set'.
-; php_admin_value/php_admin_flag - these directives won't be overwritten by
-; PHP call 'ini_set'
-; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
-
-; Defining 'extension' will load the corresponding shared extension from
-; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
-; overwrite previously defined php.ini values, but will append the new value
-; instead.
-
-; Note: path INI options can be relative and will be expanded with the prefix
-; (pool, global or /usr)
-
-; Default Value: nothing is defined by default except the values in php.ini and
-; specified at startup with the -d argument
-;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
-;php_flag[display_errors] = off
-;php_admin_value[error_log] = /var/log/fpm-php.www.log
-;php_admin_flag[log_errors] = on
-;php_admin_value[memory_limit] = 32M
-
-; Common values to change to increase file upload limit
-; php_admin_value[upload_max_filesize] = 50M
-; php_admin_value[post_max_size] = 50M
-; php_admin_flag[mail.add_x_header] = Off
-
-; Other common parameters
-; php_admin_value[max_execution_time] = 600
-; php_admin_value[max_input_time] = 300
-; php_admin_value[memory_limit] = 256M
-; php_admin_flag[short_open_tag] = On
diff --git a/conf/systemd.service b/conf/systemd.service
deleted file mode 100644
index f100e84..0000000
--- a/conf/systemd.service
+++ /dev/null
@@ -1,49 +0,0 @@
-[Unit]
-Description=Small description of the service
-After=network.target
-
-[Service]
-Type=simple
-User=__APP__
-Group=__APP__
-WorkingDirectory=__INSTALL_DIR__/
-ExecStart=__INSTALL_DIR__/script
-StandardOutput=append:/var/log/__APP__/__APP__.log
-StandardError=inherit
-
-# Sandboxing options to harden security
-# Depending on specificities of your service/app, you may need to tweak these
-# .. but this should be a good baseline
-# Details for these options: https://www.freedesktop.org/software/systemd/man/systemd.exec.html
-NoNewPrivileges=yes
-PrivateTmp=yes
-PrivateDevices=yes
-RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 AF_NETLINK
-RestrictNamespaces=yes
-RestrictRealtime=yes
-DevicePolicy=closed
-ProtectClock=yes
-ProtectHostname=yes
-ProtectProc=invisible
-ProtectSystem=full
-ProtectControlGroups=yes
-ProtectKernelModules=yes
-ProtectKernelTunables=yes
-LockPersonality=yes
-SystemCallArchitectures=native
-SystemCallFilter=~@clock @debug @module @mount @obsolete @reboot @setuid @swap @cpu-emulation @privileged
-
-# Denying access to capabilities that should not be relevant for webapps
-# Doc: https://man7.org/linux/man-pages/man7/capabilities.7.html
-CapabilityBoundingSet=~CAP_RAWIO CAP_MKNOD
-CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
-CapabilityBoundingSet=~CAP_SYS_BOOT CAP_SYS_TIME CAP_SYS_MODULE CAP_SYS_PACCT
-CapabilityBoundingSet=~CAP_LEASE CAP_LINUX_IMMUTABLE CAP_IPC_LOCK
-CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_WAKE_ALARM
-CapabilityBoundingSet=~CAP_SYS_TTY_CONFIG
-CapabilityBoundingSet=~CAP_MAC_ADMIN CAP_MAC_OVERRIDE
-CapabilityBoundingSet=~CAP_NET_ADMIN CAP_NET_BROADCAST CAP_NET_RAW
-CapabilityBoundingSet=~CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_SYSLOG
-
-[Install]
-WantedBy=multi-user.target
diff --git a/config_panel.toml.example b/config_panel.toml.example
deleted file mode 100644
index ff78456..0000000
--- a/config_panel.toml.example
+++ /dev/null
@@ -1,510 +0,0 @@
-
-version = "1.0"
-[main]
-
-services = []
-
-## (optional) This help properties is a short help displayed on the same line
-## than the panel title but not displayed in the tab.
-# help = ""
-
- [main.organization]
- name = ""
- # help = ""
-
-
-
-# [Organisation]
-# Nom de l'organisation (type STRING, obligatoire, ex. LibreServiceEU).
-[main.organization.name]
- ask.en = "Nom de l'oganisation"
- type = "string"
- bind = "organization.name>/var/www/__APP__/public/organization.properties"
-
-# Description de l'organisation (type STRING, recommandé, ex. LibreServiceEU est le chaton de Devinsy).
-[main.organization.description]
- ask.en = "Description de l'organisation"
- type = "string"
- bind = "organization.description"
- optional = true
-
-[main.organization.status-level]
- ask.en = "Statut"
- type = "string"
- choices.ACTIVE = "Actif"
- choices.IDLE = "En pause"
- choices.AWAY = "Inactif"
- bind = "organization.status.level"
- optional = true
-
-[main.organization.status-description]
- ask.en = "Description du statut"
- type = "string"
- bind = "organization.status.description"
- optional = true
- visible = "status-level == 'IDLE'"
-
-[main.organization.startdate]
- ask.en = "Date de création"
- type = "date"
- optional = true
-
-[main.organization.enddate]
- ask.en = "Date de fermeture"
- type = "date"
- optional = true
- visible = "status-level == 'AWAY'"
-
-
-[main.organization.type]
- ask.en = "Type d'organisation"
- type = "string"
- choices.ASSOCIATION = "Association"
- choices.INFORMAL = "Informel"
- choices.COOPERATIVE = "Coopérative"
- choices.MICROCOMPANY = "Micro entreprise"
- choices.COMPANY = "Société"
- choices.INDIVIDUAL = "Individue"
- choices.OTHER = "Autre"
- bind = "organization.type"
-
-
-[main.organization.website]
- ask.en = "Siteweb"
- type = "url"
- bind = "organization.website"
- optional = true
-
-
-[main.organization.logo]
- ask.en = "Name of the project"
- type = "url"
- bind = "organization.logo"
- optional = true
-
-[main.organization.contact-url]
- ask.en = "URL de contact"
- type = "url"
- bind = "organization.contact.url"
- optional = true
-
-[main.organization.contact-mail]
- ask.en = "Mail de contact"
- type = "email"
- bind = "organization.contact.email"
- optional = true
-
-[main.organization.legal-url]
- ask.en = "Mentions légales"
- type = "url"
- bind = "organization.legal.url"
- optional = true
-
-[main.organization.guide-technical]
- ask.en = "Documentation technique"
- type = "url"
- bind = "organization.guide.technical"
- default = "https://yunohost.org/admindoc"
- optional = true
-
-[main.organization.guide-user]
- ask.en = "Documentation utilisateurice"
- type = "url"
- bind = "organization.guide.user"
- default = "https://yunohost.org/user_guide"
- optional = true
-
-[main.organization.status-level-chatons]
- ask.en = "Statut"
- type = "string"
- choices.ACTIVE = "Actif"
- choices.IDLE = "En pause"
- choices.AWAY = "Inactif"
- bind = "organization.memberof.chatons.status.level"
-
-[main.organization.status-description]
- ask.en = "Description du statut"
- type = "string"
- bind = "organization.memberof.chatons.status.description"
- optional = true
- visible = "status-level-chatons == 'IDLE'"
-
-[main.organization.startdate-chatons]
- ask.en = "Date d'entrée dans le collectif"
- type = "date"
- bind = "organization.memberof.chatons.startdate"
-
-[main.organization.enddate-chatons]
- ask.en = "Date de sortie du collectif"
- type = "date"
- optional = true
- visible = "status-level-chatons == 'AWAY'"
- bind = "organization.memberof.chatons.enddate"
-
- [main.owner]
- name = "Propriétaire de l'organisation"
- optional = true
-
- [main.owner.owner-name]
- ask.en = "Nom"
- type = "string"
- bind = "organization.owner.name"
- [main.owner.owner-website]
- ask.en = "siteweb"
- type = "url"
- bind = "organization.owner.website"
- [main.owner.owner-logo]
- ask.en = "Logo"
- type = "url"
- bind = "organization.owner.logo"
-
-
-
- [main.location]
- name = "Localisation de l'organisation"
- # help = ""
- optional = true
-
-[main.location.country-name]
- ask.en = "Pays de l'organisation"
- type = "string"
- bind = "organization.country.name"
- optional = false
-
-[main.location.country-code]
- ask.en = "Code pays de l'organisation"
- help = "Table ISO 3166-1 alpha-2 : https://fr.wikipedia.org/wiki/ISO_3166-1#Table_de_codage"
- type = "string"
- bind = "organization.country.code"
- default = "FR"
-
-# Latitude (type DECIMAL_DEGREE, recommandé, format DD, ex. 15,23456).
-[main.location.latitude]
- ask.en = "Latitude"
- type = "string"
- bind = "organization.geolocation.latitude"
-[main.location.longitude]
- ask.en = "Longitude"
- type = "string"
- bind = "organization.geolocation.longitude"
-
-[main.location.address]
- ask.en = "Adresse"
- type = "string"
- bind = "organization.geolocation.address"
-
-
-
- [main.socialnetworks]
- name = "Réseaux sociaux"
- help = "Liens vers les comptes réseaux sociaux de l'organisation"
- optional = true
-
-[main.socialnetworks.diaspora]
- ask.en = "Diaspora"
- type = "url"
- bind = "organization.socialnetworks.diaspora"
-[main.socialnetworks.facebook]
- ask.en = "Facebook"
- type = "url"
- bind = "organization.socialnetworks.facebook"
-[main.socialnetworks.funkwhale]
- ask.en = "Funkwhale"
- type = "url"
- bind = "organization.socialnetworks.funkwhale"
-[main.socialnetworks.mastodon]
- ask.en = "Mastodon"
- type = "url"
- bind = "organization.socialnetworks.mastodon"
-[main.socialnetworks.pleroma]
- ask.en = "Pleroma"
- type = "url"
- bind = "organization.socialnetworks.pleroma"
-[main.socialnetworks.mobilizon]
- ask.en = "Mobilizon"
- type = "url"
- bind = "organization.socialnetworks.mobilizon"
-[main.socialnetworks.peertube]
- ask.en = "Peertube"
- type = "url"
- bind = "organization.socialnetworks.peertube"
-[main.socialnetworks.pixelfed]
- ask.en = "Pixelfed"
- type = "url"
- bind = "organization.socialnetworks.pixelfed"
-[main.socialnetworks.twitter]
- ask.en = "Twitter"
- type = "url"
- bind = "organization.socialnetworks.twitter"
-
- [main.chatrooms]
- name = "Salons de discussion"
- help = "Adresse vers les salons/équipes de discussion publics de l'organisation"
- optional = true
-
-[main.chatrooms.xmpp]
- ask.en = "XMPP"
- type = "url"
- bind = "organization.chatrooms.xmpp"
-[main.chatrooms.irc]
- ask.en = "IRC"
- type = "url"
- bind = "organization.chatrooms.irc"
-[main.chatrooms.matrix]
- ask.en = "Matrix"
- type = "url"
- bind = "organization.chatrooms.matrix"
-[main.chatrooms.rocketchat]
- ask.en = "RocketChat"
- type = "url"
- bind = "organization.chatrooms.rocketchat"
-[main.chatrooms.mattermost]
- ask.en = "Mattermost"
- type = "url"
- bind = "organization.chatrooms.mattermost"
-
-
- [main.funding]
- name = "Dons"
- help = "Services de paiement permettant de récolter des donations pour votre chaton"
- optional = true
-# Liens vers les services de paiement permettant de récolter des donations pour votre chaton (type URL, optionnel).
-# Dans le cas d'une solution maison (exemple : pont vers votre banque), choisir "organization.funding.custom".
-# Liste non exhaustive à laquelle vous pouvez ajouter d'autres services.
-[main.funding.liberapay]
- ask.en = "Liberapay"
- type = "url"
- bind = "organization.funding.liberapay"
-[main.funding.tipee]
- ask.en = "Tipee"
- type = "url"
- bind = "organization.funding.Tipee"
-[main.funding.helloasso]
- ask.en = "Helloasso"
- type = "url"
- bind = "organization.funding.helloasso"
-[main.funding.paypal]
- ask.en = "Paypal"
- type = "url"
- bind = "organization.funding.paypal"
-[main.funding.custom]
- ask.en = "Custom"
- type = "url"
- bind = "organization.funding.custom"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ########################################################################
- #### ABOUT QUESTIONS
- ########################################################################
-
- ## A section is compound of one or several questions.
-
- ## ---------------------------------------------------------------------
- ## IMPORTANT: as for panel and section you have to choose an ID, but this
- ## one should be unique in all this document, even if the question is in
- ## an other panel.
- ## ---------------------------------------------------------------------
-
- ## You can use same questions types and properties than in manifest.yml
- ## install part. However, in YNH 4.3, a lot of change has been made to
- ## extend availables questions types list.
- ## See: TODO DOC LINK
-
- [main.customization.project_name]
-
- ## (required) The ask property is equivalent to the ask property in
- ## the manifest. However, in config panels, questions are displayed on the
- ## left side and therefore have less space to be rendered. Therefore,
- ## it is better to use a short question, and use the "help" property to
- ## provide additional details if necessary.
- ask.en = "Name of the project"
-
- ## (required) The type property indicates how the question should be
- ## displayed, validated and managed. Some types have specific properties.
- ##
- ## Types available: string, boolean, number, range, text, password, path
- ## email, url, date, time, color, select, domain, user, tags, file.
- ##
- ## For a complete list with specific properties, see: TODO DOC LINK
- type = "string"
-
- ########################################################################
- #### ABOUT THE BIND PROPERTY
- ########################################################################
-
- ## (recommended) 'bind' property is a powerful feature that let you
- ## configure how and where the data will be read, validated and written.
-
- ## By default, 'bind property is in "settings" mode, it means it will
- ## **only** read and write the value in application settings file.
- ## bind = "settings"
-
- ## However, settings usually correspond to key/values in actual app configurations
- ## Hence, a more useful mode is to have bind = ":FILENAME". In that case, YunoHost
- ## will automagically find a line with "KEY=VALUE" in FILENAME
- ## (with the adequate separator between KEY and VALUE)
- ##
- ## YunoHost will then use this value for the read/get operation.
- ## During write/set operations, YunoHost will overwrite the value
- ## in **both** FILENAME and in the app's settings.yml
-
- ## Configuration file format supported: yaml, toml, json, ini, env, php,
- ## python. The feature probably works with others formats, but should be tested carefully.
-
- ## Note that this feature only works with relatively simple cases
- ## such as `KEY: VALUE`, but won't properly work with
- ## complex data structures like multilin array/lists or dictionnaries.
- ## It also doesn't work with XML format, custom config function call, php define(), ...
-
- ## More info on TODO
- # bind = ":/var/www/__APP__/settings.py"
-
-
- ## By default, bind = ":FILENAME" will use the question ID as KEY
- ## ... but the question ID may sometime not be the exact KEY name in the configuration file.
- ##
- ## In particular, in pepettes, the python variable is 'name' and not 'project_name'
- ## (c.f. https://github.com/YunoHost-Apps/pepettes_ynh/blob/5cc2d3ffd6529cc7356ff93af92dbb6785c3ab9a/conf/settings.py##L11 )
- ##
- ## In that case, the key name can be specified before the column ':'
-
- bind = "name:/var/www/__APP__/settings.py"
-
- ## ---------------------------------------------------------------------
- ## IMPORTANT: other 'bind' mode exists:
- ##
- ## bind = "FILENAME" (with no column character before FILENAME)
- ## may be used to bind to the **entire file content** (instead of a single KEY/VALUE)
- ## This could be used to expose an entire configuration file, or binary files such as images
- ## For example:
- ## bind = "/var/www/__APP__/img/logo.png"
- ##
- ## bind = "null" can be used to disable reading / writing in settings.
- ## This creates sort of a "virtual" or "ephemeral" question which is not related to any actual setting
- ## In this mode, you are expected to define custom getter/setters/validators in scripts/config:
- ##
- ## getter: get__QUESTIONID()
- ## setter: set__QUESTIONID()
- ## validator: validate__QUESTIONID()
- ##
- ## You can also specify a common getter / setter / validator, with the
- ## function 'bind' mode, for example here it will try to run
- ## get__array_settings() first.
- # bind = "array_settings()"
- ## ---------------------------------------------------------------------
-
- ## ---------------------------------------------------------------------
- ## IMPORTANT: with the exception of bind=null questions,
- ## question IDs should almost **always** correspond to an app setting
- ## initialized / reused during install/upgrade.
- ## Not doing so may result in inconsistencies between the config panel mechanism
- ## and the use of ynh_add_config
- ## ---------------------------------------------------------------------
-
- ########################################################################
- #### OTHER GENERIC PROPERTY FOR QUESTIONS
- ########################################################################
-
- ## (optional) An help text for the question
- help = "Fill the name of the project which will received donation"
-
- ## (optional) An example display as placeholder in web form
- # example = "YunoHost"
-
- ## (optional) set to true in order to redact the value in operation logs
- # redact = false
-
- ## (optional) for boolean questions you can specify replacement values
- ## bound to true and false, in case property is bound to config file
- # useful if bound property in config file expects something else than integer 1
- yes = "Enable"
- # useful if bound property in config file expects something else than integer 0
- no = "Disable"
-
- ## (optional) A validation pattern
- ## ---------------------------------------------------------------------
- ## IMPORTANT: your pattern should be between simple quote, not double.
- ## ---------------------------------------------------------------------
- pattern.regexp = '^\w{3,30}$'
- pattern.error = "The name should be at least 3 chars and less than 30 chars. Alphanumeric chars are accepted"
-
- ## Note: visible and optional properties are also available for questions
-
-
- [main.customization.contact_url]
- ask = "Contact url"
- type = "url"
- example = "mailto: contact@example.org"
- help = "mailto: accepted"
- pattern.regexp = '^mailto:[^@]+@[^@]+|https://$'
- pattern.error = "Should be https or mailto:"
- bind = ":/var/www/__APP__/settings.py"
-
- [main.customization.logo]
- ask = "Logo"
- type = "file"
- accept = ".png"
- help = "Fill with an already resized logo"
- bind = "__INSTALL_DIR__/img/logo.png"
-
- [main.customization.favicon]
- ask = "Favicon"
- type = "file"
- accept = ".png"
- help = "Fill with an already sized favicon"
- bind = "__INSTALL_DIR__/img/favicon.png"
-
-
- [main.stripe]
- name = "Stripe general info"
- optional = false
-
- # The next alert is overwrited with a getter from the config script
- [main.stripe.amount]
- ask = "Donation in the month : XX €
- type = "alert"
- style = "success"
-
- [main.stripe.publishable_key]
- ask = "Publishable key"
- type = "string"
- redact = true
- help = "Indicate here the stripe publishable key"
- bind = ":/var/www/__APP__/settings.py"
-
- [main.stripe.secret_key]
- ask = "Secret key"
- type = "string"
- redact = true
- help = "Indicate here the stripe secret key"
- bind = ":/var/www/__APP__/settings.py"
-
- [main.stripe.prices]
- ask = "Prices ID"
- type = "tags"
- help = """\
- Indicates here the prices ID of donation products you created in stripe interfaces. \
- Go on [Stripe products](https://dashboard.stripe.com/products) to create those donation products. \
- Fill it tag with 'FREQUENCY/CURRENCY/PRICE_ID' \
- FREQUENCY: 'one_time' or 'recuring' \
- CURRENCY: 'EUR' or 'USD' \
- PRICE_ID: ID from stripe interfaces starting with 'price_' \
- """
- pattern.regexp = '^(one_time|recuring)/(EUR|USD)/price_.*$'
- pattern.error = "Please respect the format describe in help text for each price ID"
diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md
index 3f2e57a..cc1037f 100644
--- a/doc/DESCRIPTION.md
+++ b/doc/DESCRIPTION.md
@@ -1 +1 @@
-This is a dummy description of this app features
+ChatonsInfos is a protocol for sharing data about the CHATONS collective, its members and their services.
diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md
index 13f4b64..149e740 100644
--- a/doc/DESCRIPTION_fr.md
+++ b/doc/DESCRIPTION_fr.md
@@ -1 +1 @@
-Ceci est une fausse description des fonctionalités de l'app
+ChatonsInfos est un protocole de partage de données sur le collectif CHATONS, ses membres et leurs services.
diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md
index f367b62..4ef235f 100644
--- a/doc/POST_INSTALL.md
+++ b/doc/POST_INSTALL.md
@@ -1,7 +1,3 @@
-This is a dummy disclaimer to display after the install
+After filling informations in the configuration panel, in order to be added to stats.chatons.org, you could send by mail this link to contact@chatons.org.
-The app url is `__DOMAIN____PATH__`
-
-The app install dir is `__INSTALL_DIR__`
-
-The app id is `__ID__`
+URL of the organization.properties: `https://__DOMAIN__/.well_known/chatonsinfos/organization.properties`
diff --git a/doc/POST_UPGRADE.md b/doc/POST_UPGRADE.md
deleted file mode 100644
index a58e2ae..0000000
--- a/doc/POST_UPGRADE.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a dummy disclaimer to display after upgrades
diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md
deleted file mode 100644
index eb3ab3a..0000000
--- a/doc/PRE_INSTALL.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a dummy disclaimer to display prior to the install
diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md
deleted file mode 100644
index 4a02cd5..0000000
--- a/doc/PRE_INSTALL_fr.md
+++ /dev/null
@@ -1 +0,0 @@
-Ceci est un faux disclaimer à présenter avant l'installation
diff --git a/doc/PRE_UPGRADE.md b/doc/PRE_UPGRADE.md
deleted file mode 100644
index 780fc15..0000000
--- a/doc/PRE_UPGRADE.md
+++ /dev/null
@@ -1 +0,0 @@
-This is a dummy disclaimer to display prior to any upgrade
diff --git a/hooks/post_app_change_url b/hooks/post_app_change_url
index 48939e9..374d014 100644
--- a/hooks/post_app_change_url
+++ b/hooks/post_app_change_url
@@ -1,4 +1,5 @@
#!/bin/bash
source /usr/share/yunohost/helpers
+
ynh_write_var_in_file --file="/var/www/chatonsinfo/public/${YNH_APP_INSTANCE_NAME}.properties" --key="service.website" --value="https://$YNH_APP_NEW_DOMAIN/$YNH_APP_NEW_PATH"
diff --git a/hooks/post_app_install b/hooks/post_app_install
index ec9c7ad..3141f19 100644
--- a/hooks/post_app_install
+++ b/hooks/post_app_install
@@ -3,4 +3,4 @@
source /etc/yunohost/apps/chatonsinfo/scripts/_common.sh
source /usr/share/yunohost/helpers
-rewrite_config_panel()
+generate_config_panel
diff --git a/hooks/post_app_remove b/hooks/post_app_remove
index ec9c7ad..3141f19 100644
--- a/hooks/post_app_remove
+++ b/hooks/post_app_remove
@@ -3,4 +3,4 @@
source /etc/yunohost/apps/chatonsinfo/scripts/_common.sh
source /usr/share/yunohost/helpers
-rewrite_config_panel()
+generate_config_panel
diff --git a/manifest.toml b/manifest.toml
index 08a99bf..1367203 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -1,9 +1,9 @@
packaging_format = 2
-id = "chatons_infos"
+id = "chatonsinfos"
name = "Chatons Infos"
-description.en = "create stats files Chatons compliant and enable configuration in config pannel"
-description.fr = "génère automatiquement les fichiers de statistiques Chatons et permet leur configuration dans le panneau de configuration"
+description.en = "Create stats files Chatons compliant and enable configuration in config pannel"
+description.fr = "Génère automatiquement les fichiers de statistiques Chatons et permet leur configuration dans le panneau de configuration"
version = "1.0~ynh1"
@@ -11,32 +11,38 @@ maintainers = ["oiseauroch", "ljf"]
[upstream]
# NB: Only the "license" key is mandatory. Remove entries for which there's no relevant data
-license = "agpl-3.0"
+license = "AGPL-3.0"
website = "https://framagit.org/chatons/chatonsinfos/-/blob/master/"
demo = "https://stats.chatons.org/index.xhtml"
admindoc = "https://framagit.org/chatons/chatonsinfos/-/blob/master/README.md"
code = "https://framagit.org/chatons/chatonsinfos"
[integration]
-yunohost = ">= 11.1.21"
+yunohost = ">= 11.1.0"
architectures = "all"
multi_instance = "not_relevant"
ldap = "not_relevant"
sso = "not_relevant"
disk = "50M"
+ram.build = "50M"
+ram.runtime = "50M"
[install]
[install.domain]
# this is a generic question - ask strings are automatically handled by YunoHost's core
type = "domain"
+ [install.path]
+ # this is a generic question - ask strings are automatically handled by YunoHost's core
+ type = "path"
+ default = "/.well_known/chatonsinfos/"
[resources]
# See the packaging documentation for the full set
# of explanation regarding the behavior and properties for each of those
[resources.sources]
- [resourrces.sources.main]
+ [resources.sources.main]
url = "https://framagit.org/chatons/chatonsinfos/-/archive/master/chatonsinfos-master.tar.gz?path=MODELES"
sha256 = "664e1c934ea2fd0b5ee4ff55bbabbc81227a256ee12fd7d18319d13c095690bb"
in_subdir = true
@@ -47,4 +53,3 @@ disk = "50M"
[resources.install_dir]
# This will create/remove the install dir as /var/www/$app
# and store the corresponding setting $install_dir
- dir = "/var/www/__APP__/"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index b2daf8c..47c009a 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -7,9 +7,26 @@
#=================================================
# PERSONAL HELPERS
#=================================================
-rewrite_config_panel() {
- export apps=$(yunohost app list | grep "id\:" | sed "s/ id: //g")
- ynh_render_template /etc/yunohost/apps/chatonsinfo/config_panel.toml.j2 /etc/yunohost/apps/chatonsinfo/config_panel.toml
+generate_config_panel() {
+ export apps=$(yunohost app list | grep "id\:" | sed "s/ *id: //g")
+ ynh_render_template /etc/yunohost/apps/chatonsinfo/conf/config_panel.toml.j2 /etc/yunohost/apps/chatonsinfo/config_panel.toml
+
+ for app_id in $apps ;
+ do
+ app=${app_id%__*}
+ if [ ! -e "$install_dir/public/${app_id}.properties" ]
+ then
+ cp "$install_dir/sources/MODELES/${app}.properties" "$install_dir/public/${app_id}.properties"
+ #mkdir -p "$install_dir/public/${app_id}.di/subs"
+ #mkdir "$install_dir/public/${app_id}.di/metrics"
+ sed -i "/subs\.${app_id} =/d" "$install_dir/public/organization.properties"
+ sed -i "/\[Subs\]/a \
+subs.${app_id} = 'https://$domain$path/${app_id}.properties'" "$install_dir/public/organization.properties"
+ fi
+ done
+ chown -R $app:www-data "$install_dir/public"
+ chmod -R o-rwx "$install_dir"
+ #chmod a-x "$install_dir/{public,sources}/*"
}
#=================================================
diff --git a/scripts/install b/scripts/install
index 4532185..c85fde1 100755
--- a/scripts/install
+++ b/scripts/install
@@ -9,6 +9,18 @@
source _common.sh
source /usr/share/yunohost/helpers
+#=================================================
+# STORE SETTINGS FROM MANIFEST
+#=================================================
+
+
+#=================================================
+# STORE SETTINGS FROM MANIFEST
+#=================================================
+
+#ynh_app_setting_set --app=$app --key=maintenance_mode --value=$maintenance_mode
+
+
#=================================================
# APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC)
#=================================================
@@ -26,7 +38,9 @@ mkdir $install_dir/public
# $install_dir will automatically be initialized with some decent
# permission by default ... however, you may need to recursively reapply
# ownership to all files such as after the ynh_setup_source step
+chown -R root:root "$install_dir/sources"
chown -R $app:www-data "$install_dir/public"
+chmod -R o-rwx "$install_dir"
#=================================================
# APP INITIAL CONFIGURATION
@@ -34,10 +48,29 @@ chown -R $app:www-data "$install_dir/public"
# ADD A CONFIGURATION
#=================================================
ynh_script_progression --message="Adding a configuration file..." --weight=1
+
+ls -l $install_dir/sources/main
+cp "$install_dir/sources/MODELES/organization.properties" "$install_dir/public/"
+mkdir -p "$install_dir/public/organization.d/subs"
+mkdir "$install_dir/public/organization.d/metrics"
-cp "$install_dir/sources/organization.properties" "$install_dir/public/"
+chown -R $app:www-data "$install_dir/public"
-chown -R $app:www-data"$install_dir/public"
+#=================================================
+# GENERATE CONFIG PANEL
+#=================================================
+ynh_script_progression --message="Generating configuration panel..." --weight=1
+
+generate_config_panel
+
+#=================================================
+# ADD A CRON JOB
+#=================================================
+
+cron_path="/etc/cron.daily/$app"
+ynh_add_config --template="../conf/cron" --destination="$cron_path"
+chown root: "$cron_path"
+chmod 644 "$cron_path"
#=================================================
# GENERIC FINALIZATION
diff --git a/scripts/restore b/scripts/restore
index b8441d7..ca93e67 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -20,7 +20,8 @@ ynh_restore_file --origin_path="$install_dir"
# $install_dir will automatically be initialized with some decent
# permission by default ... however, you may need to recursively reapply
# ownership to all files such as after the ynh_setup_source step
-chown -R $app:www-data "$install_dir"
+chown -R root:root "$install_dir/sources"
+chown -R $app:www-data "$install_dir/public"
#=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 079bd8f..20c9bd2 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -55,13 +55,6 @@ upgrade_type=$(ynh_check_app_version_changed)
# ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir
#fi
-#=================================================
-# STOP SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/$app.log"
-
#=================================================
# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...)
#=================================================
@@ -73,7 +66,7 @@ then
ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src
- ynh_setup_source --dest_dir="$install_dir"
+ ynh_setup_source --dest_dir="$install_dir/sources"
fi
# $install_dir will automatically be initialized with some decent
@@ -90,14 +83,16 @@ ynh_script_progression --message="Upgrading system configurations related to $ap
ynh_add_nginx_config
-ynh_add_systemd_config
-
-yunohost service add $app --description="A short description of the app" --log="/var/log/$app/$app.log"
-
-ynh_use_logrotate --non-append
#=================================================
# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...)
+#=================================================
+# GENERATE CONFIG PANEL
+#=================================================
+ynh_script_progression --message="Generating configuration panel..." --weight=1
+
+generate_config_panel
+
#=================================================
# UPDATE A CONFIG FILE
#=================================================
@@ -108,27 +103,20 @@ ynh_script_progression --message="Updating a configuration file..." --weight=1
### The file will automatically be backed-up if it's found to be manually modified (because
### ynh_add_config keeps track of the file's checksum)
-ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file"
+# ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file"
# FIXME: this should be handled by the core in the future
# You may need to use chmod 600 instead of 400,
# for example if the app is expected to be able to modify its own config
-chmod 400 "$install_dir/some_config_file"
-chown $app:$app "$install_dir/some_config_file"
+chmod 400 "$install_dir/public/organization.properties"
+chown $app:www-data "$install_dir/public/organization.properties"
### For more complex cases where you want to replace stuff using regexes,
### you shoud rely on ynh_replace_string (which is basically a wrapper for sed)
### When doing so, you also need to manually call ynh_store_file_checksum
###
### ynh_replace_string --match_string="match_string" --replace_string="replace_string" --target_file="$install_dir/some_config_file"
-### ynh_store_file_checksum --file="$install_dir/some_config_file"
-
-#=================================================
-# START SYSTEMD SERVICE
-#=================================================
-ynh_script_progression --message="Starting a systemd service..." --weight=1
-
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/$app.log"
+ynh_store_file_checksum --file="$install_dir/public/organization.properties"
#=================================================
# END OF SCRIPT