whole code modernization based on example app

LICENSE

@@ -1,22 +1,674 @@
-The MIT License (MIT)
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2015 mbugeia
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+                            Preamble
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+  The GNU General Public License is a free, copyleft license for
-copies or substantial portions of the Software.
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  The licenses for most software and other practical works are designed
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+to take away your freedom to share and change the works.  By contrast,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+the GNU General Public License is intended to guarantee your freedom to
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+share and change all versions of a program--to make sure it remains free
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+software for all its users.  We, the Free Software Foundation, use the
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+GNU General Public License for most of our software; it applies also to
-SOFTWARE.
+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.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 <http://www.gnu.org/licenses/>.
+
+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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -15,7 +15,21 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 ## Overview
 
-Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service written in Go. Alternative to GitHub / Gitlab.
+Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service written in Go. Alternative to GitHub / Gitlab
+
+### Features
+
+- User dashboard, user profile and activity timeline.
+- User, organization and repository management.
+- Repository and organization webhooks, including Slack, Discord and Dingtalk.
+- Repository Git hooks, deploy keys and Git LFS.
+- Repository issues, pull requests, wiki, protected branches and collaboration.
+- Migrate and mirror repositories with wiki from other code hosts.
+- Web editor for quick editing repository files and wiki.
+- Jupyter Notebook and PDF rendering.
+- Authentication via SMTP, LDAP.
+- Customize HTML templates, static files and many others.
+
 
 **Shipped version:** 1.18.0-1~ynh1
 
@@ -46,16 +60,12 @@ Host domain.tld
     port 2222 # change this with the port you use
 ```
 
+## Private Mode
+
+Actually it's possible to access to the Git repositories by the `git` command over HTTP also in private mode installation. It's important to know that in this mode the repository could be ALSO getted if you don't set the repository as private in the repos settings.
+
 ### Upgrade
 
-By default, a backup is performed before upgrading. To avoid this, you have the following options:
-- Pass the `NO_BACKUP_UPGRADE` env variable with `1` at each upgrade. For example `NO_BACKUP_UPGRADE=1 yunohost app upgrade forgejo`.
-- Set `disable_backup_before_upgrade` to `1`. You can set it with this command:
-
-`yunohost app setting forgejo disable_backup_before_upgrade -v 1`
-
-After that, the settings will be applied for **all** the next updates.
-
 From command line:
 
 `yunohost app upgrade forgejo`
@@ -101,6 +111,7 @@ Don't forget to restart Forgejo `sudo systemctl restart forgejo.service`.
 
 If you want to use the Git command (like `git clone`, `git pull`, `git push`), you need to set this app as **public**.
 
+
 ## Documentation and resources
 
 * Official app website: <https://forgejo.org>

README_fr.md

@@ -15,7 +15,21 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 ## Vue d'ensemble
 
-Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service written in Go. Alternative to GitHub / Gitlab.
+Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service written in Go. Alternative to GitHub / Gitlab
+
+### Features
+
+- User dashboard, user profile and activity timeline.
+- User, organization and repository management.
+- Repository and organization webhooks, including Slack, Discord and Dingtalk.
+- Repository Git hooks, deploy keys and Git LFS.
+- Repository issues, pull requests, wiki, protected branches and collaboration.
+- Migrate and mirror repositories with wiki from other code hosts.
+- Web editor for quick editing repository files and wiki.
+- Jupyter Notebook and PDF rendering.
+- Authentication via SMTP, LDAP.
+- Customize HTML templates, static files and many others.
+
 
 **Version incluse :** 1.18.0-1~ynh1
 
@@ -46,16 +60,12 @@ Host domain.tld
     port 2222 # change this with the port you use
 ```
 
+## Private Mode
+
+Actually it's possible to access to the Git repositories by the `git` command over HTTP also in private mode installation. It's important to know that in this mode the repository could be ALSO getted if you don't set the repository as private in the repos settings.
+
 ### Upgrade
 
-By default, a backup is performed before upgrading. To avoid this, you have the following options:
-- Pass the `NO_BACKUP_UPGRADE` env variable with `1` at each upgrade. For example `NO_BACKUP_UPGRADE=1 yunohost app upgrade forgejo`.
-- Set `disable_backup_before_upgrade` to `1`. You can set it with this command:
-
-`yunohost app setting forgejo disable_backup_before_upgrade -v 1`
-
-After that, the settings will be applied for **all** the next updates.
-
 From command line:
 
 `yunohost app upgrade forgejo`
@@ -101,6 +111,7 @@ Don't forget to restart Forgejo `sudo systemctl restart forgejo.service`.
 
 If you want to use the Git command (like `git clone`, `git pull`, `git push`), you need to set this app as **public**.
 
+
 ## Documentations et ressources
 
 * Site officiel de l'app : <https://forgejo.org>

check_process

@@ -3,6 +3,7 @@
         domain="domain.tld"
         path="/path"
         admin="john"
+        password="1Strong-Password"
         is_public=1
     ; Checks
         pkg_linter=1
@@ -15,4 +16,4 @@
         backup_restore=1
         multi_instance=1
         port_already_use=1 (6000)
-        change_url=1
+        change_url=1

conf/app.ini

@@ -4,16 +4,16 @@ RUN_USER = __APP__
 RUN_MODE = prod
 
 [database]
-DB_TYPE = mysql
+DB_TYPE = postgres
-HOST = 127.0.0.1:3306
+HOST = 127.0.0.1:5432
-NAME = __DB_USER__
+NAME = __DB_NAME__
 USER = __DB_USER__
-PASSWD = __DB_PASSWORD__
+PASSWD = __DB_PWD__
 SSL_MODE = disable
 LOG_SQL  = false
 
 [repository]
-ROOT = __REPOS_PATH__
+ROOT = __DATADIR__/repositories
 FORCE_PRIVATE = false
 
 [server]
@@ -24,7 +24,7 @@ ROOT_URL     = https://__DOMAIN____PATH_URL__
 DISABLE_SSH  = false
 SSH_PORT     = __SSH_PORT__
 OFFLINE_MODE = false
-APP_DATA_PATH = __DATA_PATH__
+APP_DATA_PATH = __DATADIR__/data
 LANDING_PAGE = explore
 LFS_START_SERVER = true
 LFS_JWT_SECRET = __LFS_KEY__
@@ -41,14 +41,15 @@ ENABLE_NOTIFY_MAIL     = true
 DISABLE_REGISTRATION   = true
 ENABLE_CAPTCHA         = false
 REQUIRE_SIGNIN_VIEW    = false
-ENABLE_REVERSE_PROXY_AUTHENTICATION     = true
+ENABLE_REVERSE_PROXY_AUTHENTICATION = false
 ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = true
 
 [picture]
-AVATAR_UPLOAD_PATH = __DATA_PATH__/avatars
+AVATAR_UPLOAD_PATH = __DATADIR__/data/avatars
+REPOSITORY_AVATAR_UPLOAD_PATH = __DATADIR__/data/repo-avatars
 
 [attachment]
-PATH = __DATA_PATH__/attachments
+PATH = __DATADIR__/attachments
 
 [session]
 PROVIDER = memory
@@ -58,17 +59,17 @@ MODE      = file
 LEVEL     = Info
 ROOT_PATH = /var/log/__APP__
 
-REDIRECT_MACARON_LOG= true
+REDIRECT_MACARON_LOG = true
-MACARON             = file
+MACARON              = file
 
-ROUTER_LOG_LEVEL    = Warn
+ROUTER_LOG_LEVEL     = Warn
-ROUTER              = file
+ROUTER               = file
 
-ENABLE_ACCESS_LOG   = Warn
+ENABLE_ACCESS_LOG    = Warn
-ACCESS              = file
+ACCESS               = file
 
-ENABLE_XORM_LOG     = Warn
+ENABLE_XORM_LOG      = Warn
-XORM                = file
+XORM                 = file
 
 [log.file.default]
 FILE_NAME = forgejo.log

conf/login_source.sql.template

@@ -1,6 +0,0 @@
-INSERT INTO `__APP__`.`login_source` 
-(`id`, `type`, `name`, `is_active`, `cfg`, `created_unix`, `updated_unix`)
-VALUES
-('1', '2', 'YunoHost LDAP', '1', '{"Name":"Yunohost LDAP","Host":"localhost","Port":389,"UseSSL":false,"BindDN":"","BindPassword":"","UserBase":"ou=users,dc=yunohost,dc=org","AttributeName":"givenName","AttributeSurname":"sn","AttributeMail":"mail","Filter":"(&(uid=%s)(objectClass=posixAccount)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))","AdminFilter":"(permission=cn=__APP__.admin,ou=permission,dc=yunohost,dc=org)","Enabled":true}', '1464014433', '1464015955')
-ON DUPLICATE KEY 
-UPDATE cfg='{"Name":"YunoHost LDAP","Host":"localhost","Port":389,"UseSSL":false,"BindDN":"","BindPassword":"","UserBase":"ou=users,dc=yunohost,dc=org","AttributeName":"givenName","AttributeSurname":"sn","AttributeMail":"mail","Filter":"(&(uid=%s)(objectClass=posixAccount)(permission=cn=__APP__.main,ou=permission,dc=yunohost,dc=org))","AdminFilter":"(permission=cn=__APP__.admin,ou=permission,dc=yunohost,dc=org)","Enabled":true}';

conf/nginx.conf

@@ -1,10 +1,14 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
-    proxy_pass                  http://localhost:__PORT__/;
+	
-    proxy_set_header            Host $host;
+    proxy_pass http://127.0.0.1:__PORT__/;
-    proxy_buffering off;
+    proxy_set_header Host $host;
-    client_max_body_size        200M;
     proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+    proxy_set_header  X-Forwarded-Host $server_name;
+	
+    client_max_body_size 200M;
 
     # Include SSOWAT user panel.
     include conf.d/yunohost_panel.conf.inc;

conf/systemd.service

@@ -1,24 +1,15 @@
 [Unit]
 Description=Forgejo
-After=syslog.target
+After=syslog.target network.target mysql.service slapd.service
-After=network.target
-After=mysql.service
-After=slapd.service
 
 [Service]
-# Modify these two values and uncomment them if you have
-# repos with lots of files and get an HTTP error 500 because
-# of that
-###
-#LimitMEMLOCK=infinity
-#LimitNOFILE=65535
 Type=simple
 User=__APP__
 Group=__APP__
-WorkingDirectory=/home/yunohost.app/__APP__
+WorkingDirectory=__DATADIR__/
-ExecStart=/opt/__APP__/forgejo web
+ExecStart=/opt/__APP__/forgejo web -p __PORT__
 Restart=always
-Environment=USER=__APP__ HOME=/home/yunohost.app/__APP__
+Environment=USER=__APP__ HOME=__DATADIR__/
 
 # Sandboxing options to harden security
 # Depending on specificities of your service/app, you may need to tweak these 

doc/DESCRIPTION.md

@@ -1 +1,14 @@
-Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service written in Go. Alternative to GitHub / Gitlab.
+Forgejo is a Gitea fork (which is a Gogs fork). A self-hosted Git service written in Go. Alternative to GitHub / Gitlab
+
+### Features
+
+- User dashboard, user profile and activity timeline.
+- User, organization and repository management.
+- Repository and organization webhooks, including Slack, Discord and Dingtalk.
+- Repository Git hooks, deploy keys and Git LFS.
+- Repository issues, pull requests, wiki, protected branches and collaboration.
+- Migrate and mirror repositories with wiki from other code hosts.
+- Web editor for quick editing repository files and wiki.
+- Jupyter Notebook and PDF rendering.
+- Authentication via SMTP, LDAP.
+- Customize HTML templates, static files and many others.

doc/DISCLAIMER.md

@@ -19,16 +19,12 @@ Host domain.tld
     port 2222 # change this with the port you use
 ```
 
+## Private Mode
+
+Actually it's possible to access to the Git repositories by the `git` command over HTTP also in private mode installation. It's important to know that in this mode the repository could be ALSO getted if you don't set the repository as private in the repos settings.
+
 ### Upgrade
 
-By default, a backup is performed before upgrading. To avoid this, you have the following options:
-- Pass the `NO_BACKUP_UPGRADE` env variable with `1` at each upgrade. For example `NO_BACKUP_UPGRADE=1 yunohost app upgrade forgejo`.
-- Set `disable_backup_before_upgrade` to `1`. You can set it with this command:
-
-`yunohost app setting forgejo disable_backup_before_upgrade -v 1`
-
-After that, the settings will be applied for **all** the next updates.
-
 From command line:
 
 `yunohost app upgrade forgejo`
@@ -73,3 +69,4 @@ Don't forget to restart Forgejo `sudo systemctl restart forgejo.service`.
 ### Git command access with HTTPS
 
 If you want to use the Git command (like `git clone`, `git pull`, `git push`), you need to set this app as **public**.
+

manifest.json

@@ -25,10 +25,10 @@
         "mysql"
     ],
     "requirements": {
-        "yunohost": ">= 4.2.6.1"
+        "yunohost": ">= 11.0.9"
     },
     "arguments": {
-        "install" : [
+        "install": [
             {
                 "name": "domain",
                 "type": "domain"
@@ -36,6 +36,7 @@
             {
                 "name": "path",
                 "type": "path",
+                "example": "/forgejo",
                 "default": "/forgejo"
             },
             {
@@ -45,10 +46,10 @@
             {
                 "name": "is_public",
                 "type": "boolean",
-				"help": {
+                "help": {
-					"en": "A public server means that everybody is able to access to the main page of the forge, on the public profile of the user and on the public repository. But you still can limit the access to each repository if you set it as private. Note that to be able to use the remote Git command (clone, pull, push) with HTTP and to use the API by (by example with a smartphone), you need to set this application as public.",
+                    "en": "If enabled, Forgejo will be accessible by people who do not have an account. This can be changed later via the webadmin.",
-					"fr": "Un serveur public signifie que tout le monde peut accéder à la page principale de la forge, au profil public des utilisateurs et aux dépôts publics. Vous pouvez également définir les dépôts comme étant privés. Notez que pour pouvoir utiliser les commandes Git distantes (clone, pull, push) avec HTTP et pour pouvoir utiliser l'API (par exemple avec un smartphone), vous devez paramétrer cette application comme étant publique."
+                    "fr": "Si cette case est cochée, Forgejo sera accessible aux personnes n’ayant pas de compte. Vous pourrez changer ceci plus tard via la webadmin."
-				},
+                },
                 "default": true
             }
         ]

scripts/_common.sh

@@ -1,66 +1,8 @@
+#!/bin/bash
+
 #=================================================
 # SET ALL CONSTANTS
 #=================================================
 
-app=$YNH_APP_INSTANCE_NAME
+# dependencies used by the app
-dbname=$app
+pkg_dependencies="postgresql"
-db_user=$app
-final_path="/opt/$app"
-datadir="/home/yunohost.app/$app"
-repos_path="$datadir/repositories"
-data_path="$datadir/data"
-ssh_path="$datadir/.ssh"
-
-# Detect the system architecture to download the right tarball
-# NOTE: `uname -m` is more accurate and universal than `arch`
-# See https://en.wikipedia.org/wiki/Uname
-if [ -n "$(uname -m | grep arm64)" ] || [ -n "$(uname -m | grep aarch64)" ]; then
-    architecture="arm64"
-elif [ -n "$(uname -m | grep 64)" ]; then
-    architecture="x86-64"
-elif [ -n "$(uname -m | grep arm)" ]; then
-    architecture="arm"
-else
-	ynh_die --message "Unable to detect your achitecture, please open a bug describing \
-        your hardware and the result of the command \"uname -m\"." 1
-fi
-
-#=================================================
-# DEFINE ALL COMMON FONCTIONS
-#=================================================
-
-create_dir() {
-    mkdir -p "$final_path/data"
-    mkdir -p "$final_path/custom/conf"
-    mkdir -p "$ssh_path"
-    mkdir -p "$repos_path"
-    mkdir -p "$data_path/avatars"
-    mkdir -p "$data_path/attachments"
-    mkdir -p "/var/log/$app"
-}
-
-config_nginx() {
-    if [ "$path_url" != "/" ]
-    then
-        ynh_replace_string --match_string "^#sub_path_only" --replace_string "" --target_file "../conf/nginx.conf"
-    fi
-    ynh_add_nginx_config
-}
-
-config_forgejo() {
-    ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
-    ynh_add_config --template="app.ini" --destination="$final_path/custom/conf/app.ini"
-}
-
-set_permission() {
-    chown -R $app:$app "$final_path"
-    chown -R $app:$app "$datadir"
-    chown -R $app:$app "/var/log/$app"
-
-    chmod u=rwX,g=rX,o= "$final_path"
-    chmod u=rwx,g=rx,o= "$final_path/forgejo"
-    chmod u=rw,g=r,o= "$final_path/custom/conf/app.ini"
-    chmod u=rwX,g=rX,o= "$datadir"
-    chmod u=rwX,g=rX,o= "/var/log/$app"
-    chmod u=rwx,g=,o= "$ssh_path"
-}

scripts/backup

@@ -3,48 +3,89 @@
 #=================================================
 # GENERIC START
 #=================================================
-
-# Load common variables and helpers
-source ../settings/scripts/_common.sh
-
 # IMPORT GENERIC HELPERS
+#=================================================
+
+source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
-# Exit if an error occurs during the execution of the script
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
 ynh_abort_if_errors
 
-# Retrieve app settings
+#=================================================
+# LOAD SETTINGS
+#=================================================
 ynh_print_info --message="Loading installation settings..."
-domain=$(ynh_app_setting_get --app $app --key domain)
 
-if [[ ! "$(systemctl status $app.service)" =~ "Active: inactive (dead)" ]]; then
+app=$YNH_APP_INSTANCE_NAME
-    ynh_print_warn --message="It's hightly recommended to make your backup when the service is stopped. Please stop $app service and with this command before to run the backup 'systemctl stop $app.service'"
+
-fi
+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)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
-# 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
 #=================================================
 
-# Copy the app source files
+ynh_backup --src_path="$final_path"
-ynh_print_info --message="Backing up code..."
-ynh_backup --src_path "$final_path"
 
-# Copy the data files
+#=================================================
-ynh_print_info --message="Backing up user data..."
+# BACKUP THE DATA DIR
-ynh_backup --src_path "$datadir" --is_big=1
+#=================================================
 
-ynh_print_info --message="Backing up configuration..."
+ynh_backup --src_path="$datadir" --is_big
 
-# Copy the conf files
+#=================================================
-ynh_backup --src_path "/etc/nginx/conf.d/${domain}.d/${app}.conf"
+# BACKUP THE NGINX CONFIGURATION
-ynh_backup --src_path "/etc/systemd/system/${app}.service"
+#=================================================
 
-# Backup logs
+ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-ynh_print_info --message="Backing up logs..."
-ynh_backup --src_path "/var/log/$app"
 
-# Dump the database
+#=================================================
-ynh_print_info --message="Backing up database"
+# BACKUP FAIL2BAN CONFIGURATION
-ynh_mysql_dump_db "$dbname" > ./db.sql
+#=================================================
+
+ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf"
+ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
+
+#=================================================
+# SPECIFIC BACKUP
+#=================================================
+# BACKUP LOGROTATE
+#=================================================
+
+ynh_backup --src_path="/etc/logrotate.d/$app"
+
+#=================================================
+# BACKUP SYSTEMD
+#=================================================
+
+ynh_backup --src_path="/etc/systemd/system/$app.service"
+
+#=================================================
+# BACKUP VARIOUS FILES
+#=================================================
+
+ynh_backup --src_path="/var/log/$app"
+
+#=================================================
+# BACKUP THE DATABASE
+#=================================================
+ynh_print_info --message="Backing up the database..."
+
+ynh_psql_dump_db --database="$db_name" > db.sql
+
+#=================================================
+# END OF SCRIPT
+#=================================================
 
 ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)."

scripts/change_url

@@ -1,65 +1,146 @@
 #!/bin/bash
 
 #=================================================
-# GENERIC START
+# GENERIC STARTING
+#=================================================
+# IMPORT GENERIC HELPERS
 #=================================================
 
-# Import common cmd
+source _common.sh
-source ./_common.sh
-
-# IMPORT GENERIC HELPERS
 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)
+port=$(ynh_app_setting_get --app=$app --key=port)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+key=$(ynh_app_setting_get --app=$app --key=key)
+lfs_key=$(ynh_app_setting_get --app=$app --key=lfs_key)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
+
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." --weight=1
+
+# 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
 
-ynh_script_progression --message="Loading installation settings..."
+#=================================================
+# CHECK WHICH PARTS SHOULD BE CHANGED
+#=================================================
 
-# RETRIEVE ARGUMENTS
+change_domain=0
-old_domain=$YNH_APP_OLD_DOMAIN
+if [ "$old_domain" != "$new_domain" ]
-domain=$YNH_APP_NEW_DOMAIN
+then
-path_url=$(ynh_normalize_url_path --path_url ${YNH_APP_NEW_PATH:-'/'})
+	change_domain=1
-app=$YNH_APP_INSTANCE_NAME
+fi
 
-db_password=$(ynh_app_setting_get --app $app --key mysqlpwd)
+change_path=0
-admin=$(ynh_app_setting_get --app $app --key adminusername)
+if [ "$old_path" != "$new_path" ]
-key=$(ynh_app_setting_get --app $app --key secret_key)
+then
-lfs_key=$(ynh_app_setting_get --app $app --key lfs_key)
+	change_path=1
-port=$(ynh_app_setting_get --app $app --key web_port)
+fi
-upstream_version=$(ynh_app_setting_get $app upstream_version)
 
 #=================================================
 # STANDARD MODIFICATIONS
 #=================================================
+# STOP SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Stopping a systemd service..." --weight=2
 
-ynh_script_progression --message="Updating nginx configuration..."
+ynh_systemd_action --service_name=$app --action="stop" --log_path="/var/log/$app/forgejo.log"
 
+#=================================================
 # MODIFY URL IN NGINX CONF
+#=================================================
+ynh_script_progression --message="Updating NGINX web server configuration..." --weight=3
+
 nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf
 
-# Change the domain for nginx
+# Change the path in the NGINX config file
-# Change the domain for nginx
+if [ $change_path -eq 1 ]
-if [[ "$old_domain" != "$domain" ]]; then
+then
-    # Delete file checksum for the old conf file location
+	# Make a backup of the original NGINX config file if modified
-    ynh_delete_file_checksum --file "$nginx_conf_path"
+	ynh_backup_if_checksum_is_different --file="$nginx_conf_path"
-    mv $nginx_conf_path /etc/nginx/conf.d/$domain.d/$app.conf
+	# Set global variables for NGINX helper
-    # Store file checksum for the new config file location
+	domain="$old_domain"
-    ynh_store_file_checksum --file "/etc/nginx/conf.d/$domain.d/$app.conf"
+	path_url="$new_path"
+	# Create a dedicated NGINX config
+	ynh_add_nginx_config
 fi
 
-config_nginx
+# 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
 
-# Update gitea config
+#=================================================
-ynh_script_progression --message="Updating forgejo configuration..."
+# SPECIFIC MODIFICATIONS
-config_forgejo
+#=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-# RELOAD services
+domain=$new_domain
-ynh_script_progression --message="Starting services..."
+path_url=$new_path
-ynh_systemd_action -l "Starting new Web server: tcp:127.0.0.1:" -p "/var/log/$app/forgejo.log" -t 10 -a restart
+ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
-sleep 1
 
-# Store the checksum with the 'INTERNAL_TOKEN' value.
+ynh_exec_warn_less ynh_add_config --template="../conf/app.ini" --destination="$final_path/custom/conf/app.ini"
-# Should be removed when the issue https://github.com/go-gitea/gitea/issues/3246 is fixed
+
-ynh_store_file_checksum --file "$final_path/custom/conf/app.ini"
+chmod 640 "$final_path/app.ini"
+chown $app:$app "$final_path/app.ini"
+
+#=================================================
+# GENERIC FINALISATION
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=2
+
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.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="Change of URL completed for $app" --last

scripts/install

@@ -10,27 +10,118 @@ source ./_common.sh
 # IMPORT GENERIC HELPERS
 source /usr/share/yunohost/helpers
 
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-ynh_script_progression --message="Validating installation parameters..."
+#=================================================
+# RETRIEVE ARGUMENTS FROM THE MANIFEST
+#=================================================
 
 # Retrieve arguments
 domain=$YNH_APP_ARG_DOMAIN
 path_url=$YNH_APP_ARG_PATH
 admin=$YNH_APP_ARG_ADMIN
 is_public=$YNH_APP_ARG_IS_PUBLIC
-upstream_version=$(ynh_app_upstream_version)
+
+# Generate keys
+key=$(ynh_string_random --length=24)
+lfs_key=$(ynh_string_random --length=24)
+
+app=$YNH_APP_INSTANCE_NAME
+
+#=================================================
+# CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
+#=================================================
+ynh_script_progression --message="Validating installation parameters..." --weight=1
+
+final_path="/opt/$app"
+test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
+
+ynh_user_exists "$admin" || ynh_die --message "The chosen admin user does not exist."
 
 # Register (book) web path
-ynh_webpath_register --app $app --domain $domain --path_url $path_url
+ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
 
-# Check user parameter
+#=================================================
-ynh_user_exists "$admin" \
+# STORE SETTINGS FROM MANIFEST
-  || ynh_die --message "The chosen admin user does not exist."
+#=================================================
+ynh_script_progression --message="Storing installation settings..." --weight=1
 
-# Check Final Path availability
+ynh_app_setting_set --app=$app --key=domain --value=$domain
-test ! -e "$final_path" || ynh_die --message "This path already contains a folder"
+ynh_app_setting_set --app=$app --key=admin --value=$admin
+ynh_app_setting_set --app=$app --key=path --value=$path_url
+ynh_app_setting_set --app=$app --key=key --value=$key
+ynh_app_setting_set --app=$app --key=lfs_key --value=$lfs_key
+
+#=================================================
+# STANDARD MODIFICATIONS
+#=================================================
+# FIND AND OPEN A PORT
+#=================================================
+ynh_script_progression --message="Finding an available port..." --weight=1
+
+# Find an available port
+port=$(ynh_find_port --port=6000)
+ynh_app_setting_set --app=$app --key=port --value=$port
+
+#=================================================
+# INSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Installing dependencies..." --weight=20
+
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
+
+#=================================================
+# CREATE A DATABASE
+#=================================================
+ynh_script_progression --message="Creating a database..." --weight=3
+
+db_name=$(ynh_sanitize_dbid --db_name=$app)
+db_user=$db_name
+ynh_app_setting_set --app=$app --key=db_name --value=$db_name
+ynh_psql_test_if_first_run
+ynh_psql_setup_db --db_user=$db_user --db_name=$db_name
+
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..." --weight=1
+
+# Create a system user
+ynh_system_user_create --username=$app --home_dir=$final_path --groups ssh.app
+
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Installing sources files..." --weight=10
+
+ynh_app_setting_set --app=$app --key=final_path --value=$final_path
+ynh_setup_source --dest-dir=$final_path --source-id=$YNH_ARCH
+
+mkdir -p "$final_path/custom/conf"
+
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:$app "$final_path"
+chmod +x "$final_path/forgejo"
+
+#=================================================
+# NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+ynh_add_nginx_config
+
+#=================================================
+# CREATE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Creating a data directory..." --weight=1
+
+datadir=/home/yunohost.app/$app
+ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
 if [ -e "$datadir" ]; then
     old_data_dir_path="$datadir$(date '+%Y%m%d.%H%M%S')"
@@ -38,113 +129,96 @@ if [ -e "$datadir" ]; then
     mv "$datadir" "$old_data_dir_path"
 fi
 
-# Generate random password and key
+mkdir -p $datadir
-ynh_script_progression --message="Defining db password and key..."
+# mkdir -p "$datadir/data/{repositories,avatars,attachments}" # TODO valider la création de ces répetoires
-db_password=$(ynh_string_random)
+mkdir -p "$datadir/.ssh"
-key=$(ynh_string_random)
-lfs_key=$(ynh_string_random)
 
-# Find available ports
+chmod 750 "$datadir"
-port=$(ynh_find_port --port 6000)
+chmod -R o-rwx "$datadir"
-
+chown -R $app:$app "$datadir"
-# Store Settings
+chmod u=rwx,g=,o= "$datadir/.ssh"
-ynh_script_progression --message="Storing installation settings..."
-ynh_app_setting_set --app $app --key mysqlpwd --value $db_password
-ynh_app_setting_set --app $app --key adminusername --value $admin
-ynh_app_setting_set --app $app --key secret_key --value $key
-ynh_app_setting_set --app $app --key lfs_key --value $lfs_key
-ynh_app_setting_set --app $app --key web_port --value $port
 
 #=================================================
-# STANDARD MODIFICATIONS
+# ADD A CONFIGURATION
 #=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-# Initialize database and store mysql password for upgrade
+ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
-ynh_script_progression --message="Configuring MySQL database..."
+ynh_add_config --template="app.ini" --destination="$final_path/custom/conf/app.ini"
-ynh_mysql_create_db "$dbname" "$db_user" "$db_password"
 
-# Add users
+chmod 640 "$final_path/custom/conf/app.ini"
-ynh_script_progression --message="Configuring system user..."
+chown $app:$app "$final_path/custom/conf/app.ini"
-ynh_system_user_create --username=$app --home_dir=$datadir --use_shell
-# Add ssh permission for forgejo user
-adduser $app ssh.app
 
-# create needed directories
+#=================================================
-create_dir
+# SETUP SYSTEMD
+#=================================================
+ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-# Configure init script
-ynh_script_progression --message="Configuring a systemd service..." --weight=2
 ynh_add_systemd_config
 
-# Modify Nginx configuration file and copy it to Nginx conf directory
-ynh_script_progression --message="Configuring nginx..." --weight=1
-config_nginx
-
-# Configure forgejo with app.ini file
-ynh_script_progression --message="Configuring application, step 1/2..."
-config_forgejo
-
-ynh_script_progression --message="Installing sources files..." --weight=10
-
-# Install forgejo
-ynh_setup_source $final_path source/$architecture
-
-# Set permissions
-ynh_script_progression --message="Protecting directory"
-set_permission
-
-ynh_script_progression --message="Configuring application, step 2/2..."
-
-# Start forgejo for building mysql tables
-systemctl start "$app".service
-
-# Wait untill login_source mysql table is created
-while ! $(ynh_mysql_connect_as "$db_user" "$db_password" "$dbname"  <<< "SELECT * FROM login_source;" &>/dev/null)
-do
-    sleep 2
-done
-
-# Add ldap config
-ynh_add_config --template="login_source.sql.template" --destination="../conf/login_source.sql"
-ynh_mysql_connect_as "$db_user" "$db_password" "$dbname" < ../conf/login_source.sql
-
-# SETUP FAIL2BAN
-ynh_script_progression --message="Configuring fail2ban..."
-ynh_add_fail2ban_config --logpath "/var/log/$app/forgejo.log" --failregex ".*Failed authentication attempt for .* from <HOST>" --max_retry 5
-
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
-
+# SETUP LOGROTATE
-# Unprotect root from SSO if public
+#=================================================
-ynh_script_progression --message="Configuring permissions..."
+ynh_script_progression --message="Configuring log rotation..." --weight=1
-if [ "$is_public" == '1' ];
-then
-    ynh_permission_update --permission "main" --add "visitors"
-fi
-
-# Create permission
-ynh_script_progression --message="Configuring permissions"
-ynh_permission_create --permission="admin" --allowed=$admin
-
-# Add forgejo to YunoHost's monitored services
-ynh_script_progression --message="Register Forgejo service..."
-yunohost service add "$app" --log="/var/log/$app/forgejo.log"
 
 # Configure logrotate
-ynh_script_progression --message="Configuring log rotation..."
 ynh_use_logrotate --logfile "/var/log/$app"
 
-# Save Version
+#=================================================
-ynh_app_setting_set --app $app --key upstream_version --value $(ynh_app_upstream_version)
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-# Reload services
+yunohost service add "$app" --description="Forgejo" --log="/var/log/$app/forgejo.log"
-ynh_script_progression --message="Starting forgejo services..." --weight=3
+
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=3
 
 ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
 
-# Store the checksum with the 'INTERNAL_TOKEN' value.
+#=================================================
-# Should be removed when the issue https://github.com/go-gitea/gitea/issues/3246 is fixed
+# SETUP FAIL2BAN
-ynh_store_file_checksum --file "$final_path/custom/conf/app.ini"
+#=================================================
+ynh_script_progression --message="Configuring Fail2Ban..." --weight=1
+
+ynh_add_fail2ban_config --logpath "/var/log/$app/forgejo.log" --failregex ".*Failed authentication attempt for .* from <HOST>" --max_retry 5
+
+#=================================================
+# SETUP SSOWAT
+#=================================================
+ynh_script_progression --message="Configuring permissions..." --weight=1
+
+# Make app public if necessary or protect it
+if [ $is_public -eq 1 ]
+then
+    ynh_permission_update --permission="main" --add="visitors"
+fi
+
+# Only the admin can access the admin panel of the app (if the app has an admin panel)
+ynh_permission_create --permission="admin" --allowed=$admin
+
+#=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
+
+ynh_systemd_action --service_name=nginx --action=reload
+
+#=================================================
+# LDAP CONFIGURATION
+#=================================================
+ynh_script_progression --message="Adding LDAP configuration..." --weight=1
+
+pushd "$final_path"
+	ynh_exec_as $app ./forgejo admin auth add-ldap --security-protocol "Unencrypted" --name "YunoHost LDAP" --host "localhost" --port "389" --skip-tls-verify --user-search-base "ou=users,dc=yunohost,dc=org" --user-filter "(&(uid=%s)(objectClass=posixAccount)(permission=cn=$app.main,ou=permission,dc=yunohost,dc=org))" --firstname-attribute "givenName" --surname-attribute "sn" --email-attribute "mail" --admin-filter "(permission=cn=$app.admin,ou=permission,dc=yunohost,dc=org)"
+popd
+
+#=================================================
+# END OF SCRIPT
+#=================================================
 
 ynh_script_progression --message="Installation of $app completed" --last

scripts/remove

@@ -3,61 +3,123 @@
 #=================================================
 # GENERIC START
 #=================================================
-
-# Load common variables and helpers
-source ./_common.sh
-
 # IMPORT GENERIC HELPERS
+#=================================================
+
+source _common.sh
 source /usr/share/yunohost/helpers
 
-ynh_script_progression --message="Loading installation settings..."
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
-# Retrieve domain from app settings
+app=$YNH_APP_INSTANCE_NAME
-domain=$(ynh_app_setting_get --app $app --key domain)
+
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+port=$(ynh_app_setting_get --app=$app --key=port)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
 #=================================================
 # STANDARD REMOVE
 #=================================================
+# REMOVE SERVICE INTEGRATION IN YUNOHOST
+#=================================================
 
-# Stop gitea
+# Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
-ynh_script_progression --message="Stoping services..."
+if ynh_exec_warn_less yunohost service status $app >/dev/null
-systemctl stop "$app".service
+then
+	ynh_script_progression --message="Removing $app service integration..." --weight=1
+	yunohost service remove $app
+fi
 
-# Drop MySQL database and user
+#=================================================
-ynh_script_progression --message="Removing databases..."
+# STOP AND REMOVE SERVICE
-ynh_mysql_drop_db "$dbname" 2>/dev/null
+#=================================================
-ynh_mysql_drop_user "$db_user" 2>/dev/null
+ynh_script_progression --message="Stopping and removing the systemd service..." --weight=1
 
-# Delete app directory and configurations
+# Remove the dedicated systemd config
-ynh_script_progression --message="Removing code..."
+ynh_remove_systemd_config
-ynh_secure_remove --file="$final_path"
+
-ynh_script_progression --message="Removing logs..."
+#=================================================
-ynh_secure_remove --file="/var/log/$app"
+# REMOVE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing logrotate configuration..." --weight=1
 
 # Remove the app-specific logrotate config
 ynh_remove_logrotate
 
-# Remove nginx config
+#=================================================
-ynh_script_progression --message="Removing nginx configuration..."
+# REMOVE THE DATABASE
+#=================================================
+ynh_script_progression --message="Removing the database..." --weight=2
+
+# Remove a database if it exists, along with the associated user
+ynh_psql_remove_db --db_user=$db_user --db_name=$db_name
+
+#=================================================
+# REMOVE DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Removing dependencies..." --weight=1
+
+# Remove metapackage and its dependencies
+ynh_remove_app_dependencies
+
+#=================================================
+# REMOVE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Removing app main directory..." --weight=3
+
+# Remove the app directory securely
+ynh_secure_remove --file="$final_path"
+
+#=================================================
+# REMOVE DATA DIR
+#=================================================
+
+# Remove the app data directory with the command `yunohost app remove gogs --purge`
+if [ "${YNH_APP_PURGE:-0}" -eq 1 ]
+then
+  ynh_script_progression --message="Removing app data directory..." --weight=2
+  ynh_secure_remove --file="$datadir"
+fi
+
+#=================================================
+# REMOVE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
+
+# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove gitea user and data
+#=================================================
-ynh_script_progression --message="Removing the dedicated system user..."
+# REMOVE FAIL2BAN CONFIGURATION
-ynh_system_user_delete $app
+#=================================================
+ynh_script_progression --message="Removing Fail2Ban configuration..." --weight=1
 
-# Remove init script
+# Remove the dedicated Fail2Ban config
-ynh_script_progression --message="Removing systemd units..."
-ynh_remove_systemd_config
-
-# Remove monitor
-ynh_script_progression --message="Removing gitea service..."
-yunohost service remove "$app"
-
-# Remove fail2ban config
-ynh_script_progression --message="Removing fail2ban configuration..."
 ynh_remove_fail2ban_config
 
-ynh_print_info --message="Due of the backup core only feature the data directory in '$datadir' was not removed. It need to be removed manually to purge app user data."
+#=================================================
+# REMOVE VARIOUS FILES
+#=================================================
+ynh_script_progression --message="Removing various files..." --weight=1
+
+ynh_secure_remove --file="/var/log/$app"
+
+#=================================================
+# REMOVE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Removing the dedicated system user..." --weight=1
+
+# Delete a system user
+ynh_system_user_delete --username=$app
+
+#=================================================
+# END OF SCRIPT
+#=================================================
 
 ynh_script_progression --message="Removal of $app completed" --last
-sleep 1

scripts/restore

@@ -3,80 +3,155 @@
 #=================================================
 # GENERIC START
 #=================================================
-
-# Load common variables and helpers
-source ../settings/scripts/_common.sh
-
 # IMPORT GENERIC HELPERS
+#=================================================
+
+source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
+#=================================================
+# MANAGE SCRIPT FAILURE
+#=================================================
+
 # Exit if an error occurs during the execution of the script
 ynh_abort_if_errors
 
-ynh_script_progression --message="Loading settings..."
+#=================================================
+# LOAD SETTINGS
+#=================================================
+ynh_script_progression --message="Loading installation settings..." --weight=1
 
-# Retrieve old app settings
+app=$YNH_APP_INSTANCE_NAME
-domain=$(ynh_app_setting_get --app $app --key domain)
-path_url=$(ynh_app_setting_get --app $app --key path)
-db_password=$(ynh_app_setting_get --app $app --key mysqlpwd)
-admin=$(ynh_app_setting_get --app $app --key adminusername)
-port=$(ynh_app_setting_get --app $app --key web_port)
-upstream_version=$(ynh_app_setting_get $app upstream_version)
 
-# Check user parameter
+domain=$(ynh_app_setting_get --app=$app --key=domain)
-ynh_user_exists "$admin" \
+path_url=$(ynh_app_setting_get --app=$app --key=path)
-  || ynh_die --message "The chosen admin user does not exist."
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+admin=$(ynh_app_setting_get --app=$app --key=admin)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
 
-# Check Final Path availability
+#=================================================
-test ! -e "$final_path" || ynh_die --message "This path already contains a folder"
+# CHECK IF THE APP CAN BE RESTORED
+#=================================================
+ynh_script_progression --message="Validating restoration parameters..." --weight=2
+
+test ! -d $final_path \
+	|| ynh_die --message="There is already a directory: $final_path "
+
+
+#=================================================
+# REINSTALL DEPENDENCIES
+#=================================================
+ynh_script_progression --message="Reinstalling dependencies..." --weight=6
+
+# Define and install dependencies
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # STANDARD RESTORATION STEPS
 #=================================================
+# RESTORE THE NGINX CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the NGINX configuration..." --weight=1
 
-# Add users
+ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf"
-ynh_script_progression --message="Configuring system user..."
-ynh_system_user_create --username=$app --home_dir=$datadir --use_shell
-# Add ssh permission for forgejo user
-adduser $app ssh.app
 
-# Restore all files
+#=================================================
-ynh_script_progression --message="Restoring files..." --weight=10
+# RECREATE THE DEDICATED USER
-ynh_restore
+#=================================================
+ynh_script_progression --message="Recreating the dedicated system user..." --weight=1
 
-# Create and restore the database
+# Create the dedicated user (if not existing)
-ynh_script_progression --message="Restoring database..." --weight=3
+ynh_system_user_create --username=$app --home_dir="$final_path" --groups ssh.app
-ynh_mysql_create_db "$dbname" "$db_user" "$db_password"
-ynh_mysql_connect_as "$db_user" "$db_password" "$dbname" < ./db.sql
 
-# Restore systemd files
+#=================================================
-systemctl daemon-reload
+# RESTORE THE APP MAIN DIR
-systemctl enable "$app".service --quiet
+#=================================================
+ynh_script_progression --message="Restoring $app main directory..." --weight=10
 
-# SETUP FAIL2BAN
+ynh_restore_file --origin_path="$final_path"
-ynh_script_progression --message="Configuring fail2ban..."
+
-ynh_add_fail2ban_config --logpath "/var/log/$app/forgejo.log" --failregex ".*Failed authentication attempt for .* from <HOST>" --max_retry 5
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:$app "$final_path"
+
+#=================================================
+# RESTORE THE DATA DIRECTORY
+#=================================================
+ynh_script_progression --message="Restoring the data directory..." --weight=1
+
+ynh_restore_file --origin_path="$datadir" --not_mandatory
+
+mkdir -p $datadir
+
+chmod 750 "$datadir"
+chmod -R o-rwx "$datadir"
+chown -R $app:$app "$datadir"
+
+#=================================================
+# RESTORE FAIL2BAN CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the Fail2Ban configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/fail2ban/jail.d/$app.conf"
+ynh_restore_file --origin_path="/etc/fail2ban/filter.d/$app.conf"
+ynh_systemd_action --action=restart --service_name=fail2ban
+
+#=================================================
+# RESTORE THE DATABASE
+#=================================================
+ynh_script_progression --message="Restoring the database..." --weight=6
+
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+ynh_psql_test_if_first_run
+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
+
+#=================================================
+# RESTORE SYSTEMD
+#=================================================
+ynh_script_progression --message="Restoring the systemd configuration..." --weight=5
+
+ynh_restore_file --origin_path="/etc/systemd/system/$app.service"
+systemctl enable $app.service --quiet
+
+#=================================================
+# RESTORE THE LOGROTATE CONFIGURATION
+#=================================================
+ynh_script_progression --message="Restoring the logrotate configuration..." --weight=1
+
+ynh_restore_file --origin_path="/etc/logrotate.d/$app"
+
+ynh_restore_file --origin_path="/var/log/$app"
+chown -R $app:$app "/var/log/$app"
+chmod u=rwX,g=rX,o= "/var/log/$app"
+
+#=================================================
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
+
+yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.log"
+
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=3
+
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
+# RELOAD NGINX
+#=================================================
+ynh_script_progression --message="Reloading NGINX web server..." --weight=1
 
-# Set permissions
+ynh_systemd_action --service_name=nginx --action=reload
-ynh_script_progression --message="Protecting directory..."
-set_permission
 
-# Configure logrotate
+#=================================================
-ynh_script_progression --message="Configuring log rotation..."
+# END OF SCRIPT
-ynh_use_logrotate --logfile "/var/log/$app"
+#=================================================
-
-# Add gitea to YunoHost's monitored services
-ynh_script_progression --message="Register Forgejo service..."
-yunohost service add "$app" --log=/var/log/$app/forgejo.log
-
-# Reload services
-ynh_script_progression --message="Reloading services..."
-systemctl reload nginx.service
-ynh_systemd_action -l "Starting new Web server: tcp:127.0.0.1:" -p "/var/log/$app/forgejo.log" -t 10
-sleep 1
 
 ynh_script_progression --message="Restoration completed for $app" --last

scripts/upgrade

@@ -3,155 +3,198 @@
 #=================================================
 # GENERIC START
 #=================================================
-
-# Load common variables and helpers
-source ./_common.sh
-
 # IMPORT GENERIC HELPERS
+#=================================================
+
+source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
 # LOAD SETTINGS
 #=================================================
-ynh_script_progression --message="Loading installation 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)
+path_url=$(ynh_app_setting_get --app=$app --key=path)
-db_password=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+final_path=$(ynh_app_setting_get --app=$app --key=final_path)
-admin=$(ynh_app_setting_get --app=$app --key=adminusername)
+admin=$(ynh_app_setting_get --app=$app --key=admin)
-key=$(ynh_app_setting_get --app=$app --key=secret_key)
+port=$(ynh_app_setting_get --app=$app --key=port)
+datadir=$(ynh_app_setting_get --app=$app --key=datadir)
+db_name=$(ynh_app_setting_get --app=$app --key=db_name)
+db_user=$db_name
+db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
+key=$(ynh_app_setting_get --app=$app --key=key)
 lfs_key=$(ynh_app_setting_get --app=$app --key=lfs_key)
-port=$(ynh_app_setting_get --app=$app --key=web_port)
-upstream_version=$(ynh_app_setting_get --app=$app --key=upstream_version)
 
+#=================================================
+# CHECK VERSION
+#=================================================
+
+upgrade_type=$(ynh_check_app_version_changed)
+
+#=================================================
+# STANDARD UPGRADE STEPS
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
-ynh_script_progression --message="Stopping a systemd service..." --weight=1
+ynh_script_progression --message="Stopping a systemd service..." --weight=2
 
-# We stop the service before to set ynh_clean_setup
+ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd"
-ynh_systemd_action --service_name=$app --action="stop"
 
 #=================================================
 # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
 #=================================================
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." --weight=1
-
-if [ "0$(ynh_app_setting_get --app=$app --key=disable_backup_before_upgrade)" -ne 1 ]
-then
-    ynh_backup_before_upgrade
-    ynh_clean_setup () {
-        # Clean installation remainings that are not handled by the remove script.
-        ynh_clean_check_starting
-        ynh_restore_upgradebackup
-    }
-fi
 
+# 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
 
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
 ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
 
+# 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 port doesn't exist, create it
+if [ -z "$port" ]; then
+    port=$(ynh_find_port --port=6000)
+    ynh_app_setting_set --app=$app --key=port --value=$port
+fi
+
 # If lfs_key doesn't exist, create it
 if [ -z "$lfs_key" ]; then
    lfs_key=$(ynh_string_random)
    ynh_app_setting_set --app=$app --key=lfs_key --value=$lfs_key
 fi
 
-# Move data directory
+# If final_path doesn't exist, create it
-if [ -e "/home/""$app" ] && [ ! -e $datadir ]; then
+if [ -z "$final_path" ]; then
-    mv "/home/""$app" "$datadir"
+    final_path=/opt/$app
+    ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
-# Ensuring the user has the right home dir
+# If datadir doesn't exist, create it
-if [ ~$app != "$datadir" ]; then
+if [ -z "$datadir" ]; then
-    usermod -d "$datadir" $app
+    datadir=/home/yunohost.app/$app
+    ynh_app_setting_set --app=$app --key=datadir --value=$datadir
+    mkdir -p $datadir
+    mkdir -p "$datadir/data/{repositories,avatars,attachments}"
+    mkdir -p "$datadir/.ssh"
+
+    chmod 750 "$datadir"
+    chmod -R o-rwx "$datadir"
+    chown -R $app:$app "$datadir"
+    chmod u=rwx,g=,o= "$datadir/.ssh"
 fi
 
 #=================================================
-# STANDARD UPGRADE STEPS
+# CREATE DEDICATED USER
 #=================================================
-ynh_script_progression --message="Configuring application..."
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
 
-# Clean template to fix issue : https://github.com/gogits/gogs/issues/4585
+# Create a dedicated user (if not existing)
-ynh_secure_remove --file="/opt/$app/templates"
+ynh_system_user_create --username=$app --home_dir="$final_path" --groups ssh.app
 
-# Configure forgejo with app.ini file
+#=================================================
-config_forgejo
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+ynh_script_progression --message="Setting up source files..." --weight=3
 
-# Configure init script
+ynh_setup_source --dest_dir=$final_path --source_id=$YNH_ARCH
-ynh_script_progression --message="Updating systemd units..."
+chmod 750 "$final_path"
+chmod -R o-rwx "$final_path"
+chown -R $app:$app "$final_path"
+chmod +x "$final_path/forgejo"
+
+#=================================================
+# ADD A CONFIGURATION
+#=================================================
+ynh_script_progression --message="Adding a configuration file..." --weight=1
+
+ssh_port=$(grep -P "Port\s+\d+" /etc/ssh/sshd_config | grep -P -o "\d+")
+ynh_add_config --template="app.ini" --destination="$final_path/custom/conf/app.ini"
+
+chmod 640 "$final_path/custom/conf/app.ini"
+chown $app:$app "$final_path/custom/conf/app.ini"
+
+#=================================================
+# SETUP SYSTEMD
+#=================================================
+ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 ynh_add_systemd_config
 
-# Modify Nginx configuration file and copy it to NGINX conf directory
+#=================================================
-ynh_script_progression --message="Configuring NGINX..." --weight=1
+# NGINX CONFIGURATION
-config_nginx
+#=================================================
+ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2
+ynh_add_nginx_config
 
 #=================================================
-# DB migration
+# UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading database and sources..." --weight=6
+ynh_script_progression --message="Upgrading dependencies..." --weight=10
 
-restart_forgejo() {
+ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
-    # Set permissions
-    set_permission
-    ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
-    # Leave the time to update the database schema
-    sleep 5
-    systemctl stop $app
-}
-
-# Install forgejo source
-ynh_setup_source $final_path source/$architecture
-restart_forgejo
-
-# SETUP FAIL2BAN
-ynh_script_progression --message="Configuring Fail2Ban..."
-ynh_add_fail2ban_config --logpath="/var/log/$app/forgejo.log" --failregex=".*Failed authentication attempt for .* from <HOST>" --max_retry 5
 
 #=================================================
 # GENERIC FINALIZATION
 #=================================================
+# SETUP LOGROTATE
+#=================================================
+ynh_script_progression --message="Configuring log rotation..." --weight=1
 
-# Set all permissions
+# Use logrotate to manage application logfile(s)
-ynh_script_progression --message="Update permission..."
+ynh_use_logrotate --logfile "/var/log/$app"
-if ! ynh_permission_exists --permission admin; then
-    ynh_app_setting_delete --app $app --key unprotected_uris
-    ynh_permission_create --permission="admin" --allowed="$admin"
-    # Update ldap config
-    ynh_add_config --template="login_source.sql.template" --destination="../conf/login_source.sql"
-    ynh_mysql_connect_as "$db_user" "$db_password" "$dbname" < ../conf/login_source.sql
-fi
 
-# Add forgejo to YunoHost's monitored services
+chown -R $app:$app "/var/log/$app"
-ynh_script_progression --message="Register Forgejo service..."
+chmod u=rwX,g=rX,o= "/var/log/$app"
-yunohost service add "$app" --log="/var/log/$app/forgejo.log"
-
-# Add ssh permission for forgejo user
-adduser $app ssh.app
-
-# Set permissions
-ynh_script_progression --message="Protecting directory"
-set_permission
-
-# Save Version
-ynh_app_setting_set --app=$app --key=upstream_version --value=$(ynh_app_upstream_version)
-
-# Reload services
-ynh_script_progression --message="Starting Forgejo services..." --weight=3
-#ynh_systemd_action -l "Starting new Web server: tcp:127.0.0.1:" -p "/var/log/$app/gitea.log" -t 10
-#sleep 1
-ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
-
-# Store the checksum with the 'INTERNAL_TOKEN' value.
-# Should be removed when the issue https://github.com/go-gitea/gitea/issues/3246 is fixed
-ynh_store_file_checksum --file="$final_path/custom/conf/app.ini"
 
 #=================================================
-# FINISH MIGRATION PROCESS
+# INTEGRATE SERVICE IN YUNOHOST
+#=================================================
+ynh_script_progression --message="Integrating service in YunoHost..." --weight=2
+
+yunohost service add $app --description="Forgejo" --log="/var/log/$app/forgejo.log"
+
+#=================================================
+# START SYSTEMD SERVICE
+#=================================================
+ynh_script_progression --message="Starting a systemd service..." --weight=1
+
+# Start a systemd service
+ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$app/forgejo.log" --line_match="Starting new Web server: tcp:127.0.0.1:"
+
+#=================================================
+# SETUP FAIL2BAN
+#=================================================
+ynh_script_progression --message="Configuring Fail2Ban..." --weight=1
+
+ynh_add_fail2ban_config --logpath "/var/log/$app/forgejo.log" --failregex ".*Failed authentication attempt for .* from <HOST>" --max_retry 5
+
+
+#=================================================
+# 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