Revert "Enable dataDir setting"

This reverts commit 9515a060ab.

.gitignore

@@ -1,10 +1,6 @@
+dist/
 node_modules/
-coverage/
-webadmin/dist/
-setup/splash/website/
-installer/src/certs/server.key
 
 # vim swap files
 *.swp
 
-

.jshintrc

@@ -1,8 +0,0 @@
-{
-    "node": true,
-    "browser": true,
-    "unused": true,
-    "globalstrict": true,
-    "predef": [ "angular", "$" ],
-    "esnext": true
-}

LICENSE

@@ -1,661 +1,35 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+The Cloudron Subscription license
+Copyright (c) 2019 Cloudron UG
+
+With regard to the Cloudron Software:
+
+This software and associated documentation files (the "Software") may only be
+used in production, if you (and any entity that you represent) have agreed to,
+and are in compliance with, the Cloudron Subscription Terms of Service, available
+at https://cloudron.io/legal/terms.html (the “Subscription Terms”), or other
+agreement governing the use of the Software, as agreed by you and Cloudron,
+and otherwise have a valid Cloudron Subscription. Subject to the foregoing sentence,
+you are free to modify this Software and publish patches to the Software. You agree
+that Subscription and/or its licensors (as applicable) retain all right, title and
+interest in and to all such modifications and/or patches, and all such modifications
+and/or patches may only be used, copied, modified, displayed, distributed, or otherwise
+exploited with a valid Cloudron subscription. Notwithstanding the foregoing, you may copy
+and modify the Software for development and testing purposes, without requiring a
+subscription.  You agree that Cloudron and/or its licensors (as applicable) retain
+all right, title and interest in and to all such modifications.  You are not
+granted any other rights beyond what is expressly stated herein.  Subject to the
+foregoing, it is forbidden to copy, merge, publish, distribute, sublicense,
+and/or sell the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+For all third party components incorporated into the Cloudron Software, those
+components are licensed under the original license provided by the owner of the
+applicable component.
 
- 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.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    box
-    Copyright (C) 2016,2017 Cloudron UG
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

README.md

@@ -1,4 +1,4 @@
-# Cloudron
+# Cloudron Dashboard
 
 [Cloudron](https://cloudron.io) is the best way to run apps on your server.
 
@@ -29,7 +29,7 @@ anyone to effortlessly host web applications on their server on their own terms.
 * Trivially migrate to another server keeping your apps and data (for example, switch your
   infrastructure provider or move to a bigger server).
 
-* Comprehensive [REST API](https://cloudron.io/documentation/developer/api/).
+* Comprehensive [REST API](https://cloudron.io/developer/api/).
 
 * [CLI](https://cloudron.io/documentation/cli/) to configure apps.
 
@@ -37,7 +37,7 @@ anyone to effortlessly host web applications on their server on their own terms.
 
 ## Demo
 
-Try our demo at https://my-demo.cloudron.me (username: cloudron password: cloudron).
+Try our demo at https://my.demo.cloudron.io (username: cloudron password: cloudron).
 
 ## Installing
 
@@ -59,6 +59,6 @@ the containers in the Cloudron.
 
 ## Community
 
-* [Chat](https://chat.cloudron.io/)
+* [Forum](https://forum.cloudron.io/)
 * [Support](mailto:support@cloudron.io)
 

baseimage/createAMI

@@ -1,193 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-assertNotEmpty() {
-    : "${!1:? "$1 is not set."}"
-}
-
-readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
-export JSON="${SOURCE_DIR}/node_modules/.bin/json"
-
-INSTANCE_TYPE="t2.micro"
-BLOCK_DEVICE="DeviceName=/dev/sda1,Ebs={VolumeSize=20,DeleteOnTermination=true,VolumeType=gp2}"
-SSH_KEY_NAME="id_rsa_yellowtent"
-
-revision=$(git rev-parse HEAD)
-ami_name=""
-server_id=""
-server_ip=""
-destroy_server="yes"
-deploy_env="prod"
-image_id=""
-
-args=$(getopt -o "" -l "revision:,name:,no-destroy,env:,region:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-while true; do
-    case "$1" in
-    --env) deploy_env="$2"; shift 2;;
-    --revision) revision="$2"; shift 2;;
-    --name) ami_name="$2"; shift 2;;
-    --no-destroy) destroy_server="no"; shift 2;;
-    --region)
-        case "$2" in
-        "us-east-1")
-            image_id="ami-6edd3078"
-            security_group="sg-a5e17fd9"
-            subnet_id="subnet-b8fbc0f1"
-            ;;
-        "eu-central-1")
-            image_id="ami-5aee2235"
-            security_group="sg-19f5a770" # everything open on eu-central-1
-            subnet_id=""
-            ;;
-        *)
-            echo "Unknown aws region $2"
-            exit 1
-            ;;
-        esac
-        export AWS_DEFAULT_REGION="$2"    # used by the aws cli tool
-        shift 2
-        ;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-# TODO fix this
-export AWS_ACCESS_KEY_ID="${AWS_ACCESS_KEY}"
-export AWS_SECRET_ACCESS_KEY="${AWS_ACCESS_SECRET}"
-
-readonly ssh_keys="${HOME}/.ssh/id_rsa_yellowtent"
-readonly SSH="ssh -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${ssh_keys}"
-
-if [[ ! -f "${ssh_keys}" ]]; then
-    echo "caas ssh key is missing at ${ssh_keys} (pick it up from secrets repo)"
-    exit 1
-fi
-
-if [[ -z "${image_id}" ]]; then
-    echo "--region is required (us-east-1 or eu-central-1)"
-    exit 1
-fi
-
-function get_pretty_revision() {
-    local git_rev="$1"
-    local sha1=$(git rev-parse --short "${git_rev}" 2>/dev/null)
-
-    echo "${sha1}"
-}
-
-function wait_for_ssh() {
-    echo "=> Waiting for ssh connection"
-    while true; do
-        echo -n "."
-
-        if $SSH ubuntu@${server_ip} echo "hello"; then
-            echo ""
-            break
-        fi
-
-        sleep 5
-    done
-}
-
-now=$(date "+%Y-%m-%d-%H%M%S")
-pretty_revision=$(get_pretty_revision "${revision}")
-
-if [[ -z "${ami_name}" ]]; then
-    ami_name="box-${deploy_env}-${pretty_revision}-${now}"
-fi
-
-echo "=> Create EC2 instance"
-id=$(aws ec2 run-instances --image-id "${image_id}" --instance-type "${INSTANCE_TYPE}" --security-group-ids "${security_group}" --block-device-mappings "${BLOCK_DEVICE}" --key-name "${SSH_KEY_NAME}" --subnet-id "${subnet_id}" --associate-public-ip-address \
-    | $JSON Instances \
-    | $JSON 0.InstanceId)
-
-[[ -z "$id" ]] && exit 1
-echo "Instance created  ID $id"
-
-echo "=> Waiting for instance to get a public IP"
-while true; do
-    server_ip=$(aws ec2 describe-instances --instance-ids ${id} \
-        | $JSON Reservations.0.Instances \
-        | $JSON 0.PublicIpAddress)
-
-    if [[ ! -z "${server_ip}" ]]; then
-        echo ""
-        break
-    fi
-
-    echo -n "."
-    sleep 1
-done
-
-echo "Got public IP ${server_ip}"
-
-wait_for_ssh
-
-echo "=> Fetching cloudron-setup"
-while true; do
-
-    if $SSH ubuntu@${server_ip} wget "https://cloudron.io/cloudron-setup" -O "cloudron-setup"; then
-        echo ""
-        break
-    fi
-
-    echo -n "."
-    sleep 5
-done
-
-echo "=> Running cloudron-setup"
-$SSH ubuntu@${server_ip} sudo /bin/bash "cloudron-setup" --env "${deploy_env}" --provider "ami" --skip-reboot
-
-wait_for_ssh
-
-echo "=> Removing ssh key"
-$SSH ubuntu@${server_ip} sudo rm /home/ubuntu/.ssh/authorized_keys /root/.ssh/authorized_keys
-
-echo "=> Creating AMI"
-image_id=$(aws ec2 create-image --instance-id "${id}" --name "${ami_name}" | $JSON ImageId)
-[[ -z "$id" ]] && exit 1
-echo "Creating AMI with Id ${image_id}"
-
-echo "=> Waiting for AMI to be created"
-while true; do
-    state=$(aws ec2 describe-images --image-ids ${image_id} \
-        | $JSON Images \
-        | $JSON 0.State)
-
-    if [[ "${state}" == "available" ]]; then
-        echo ""
-        break
-    fi
-
-    echo -n "."
-    sleep 5
-done
-
-if [[ "${destroy_server}" == "yes" ]]; then
-    echo "=> Deleting EC2 instance"
-
-    while true; do
-        state=$(aws ec2 terminate-instances --instance-id "${id}" \
-            | $JSON TerminatingInstances \
-            | $JSON 0.CurrentState.Name)
-
-        if [[ "${state}" == "shutting-down" ]]; then
-            echo ""
-            break
-        fi
-
-        echo -n "."
-        sleep 5
-    done
-fi
-
-echo ""
-echo "Done."
-echo ""
-echo "New AMI is: ${image_id}"
-echo ""

baseimage/createDOImage

@@ -1,179 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-assertNotEmpty() {
-    : "${!1:? "$1 is not set."}"
-}
-
-readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"
-export JSON="${SOURCE_DIR}/node_modules/.bin/json"
-
-revision=$(git rev-parse HEAD)
-box_name=""
-server_id=""
-server_ip=""
-destroy_server="yes"
-deploy_env="dev"
-
-# Only GNU getopt supports long options. OS X comes bundled with the BSD getopt
-# brew install gnu-getopt to get the GNU getopt on OS X
-[[ $(uname -s) == "Darwin" ]] && GNU_GETOPT="/usr/local/opt/gnu-getopt/bin/getopt" || GNU_GETOPT="getopt"
-readonly GNU_GETOPT
-
-args=$(${GNU_GETOPT} -o "" -l "revision:,regions:,size:,name:,no-destroy,env:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-while true; do
-    case "$1" in
-    --env) deploy_env="$2"; shift 2;;
-    --revision) revision="$2"; shift 2;;
-    --name) box_name="$2"; destroy_server="no"; shift 2;;
-    --no-destroy) destroy_server="no"; shift 2;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-echo "Creating digitalocean image"
-if [[ "${deploy_env}" == "staging" ]]; then
-    assertNotEmpty DIGITAL_OCEAN_TOKEN_STAGING
-    export DIGITAL_OCEAN_TOKEN="${DIGITAL_OCEAN_TOKEN_STAGING}"
-elif [[ "${deploy_env}" == "dev" ]]; then
-    assertNotEmpty DIGITAL_OCEAN_TOKEN_DEV
-    export DIGITAL_OCEAN_TOKEN="${DIGITAL_OCEAN_TOKEN_DEV}"
-elif [[ "${deploy_env}" == "prod" ]]; then
-    assertNotEmpty DIGITAL_OCEAN_TOKEN_PROD
-    export DIGITAL_OCEAN_TOKEN="${DIGITAL_OCEAN_TOKEN_PROD}"
-else
-    echo "No such env ${deploy_env}."
-    exit 1
-fi
-
-vps="/bin/bash ${SCRIPT_DIR}/digitalocean.sh"
-
-readonly ssh_keys="${HOME}/.ssh/id_rsa_caas_${deploy_env}"
-readonly scp202="scp -P 202 -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${ssh_keys}"
-readonly scp22="scp -o ConnectTimeout=10 -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${ssh_keys}"
-
-readonly ssh202="ssh -p 202 -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${ssh_keys}"
-readonly ssh22="ssh -o IdentitiesOnly=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${ssh_keys}"
-
-if [[ ! -f "${ssh_keys}" ]]; then
-    echo "caas ssh key is missing at ${ssh_keys} (pick it up from secrets repo)"
-    exit 1
-fi
-
-function get_pretty_revision() {
-    local git_rev="$1"
-    local sha1=$(git rev-parse --short "${git_rev}" 2>/dev/null)
-
-    echo "${sha1}"
-}
-
-now=$(date "+%Y-%m-%d-%H%M%S")
-pretty_revision=$(get_pretty_revision "${revision}")
-
-if [[ -z "${box_name}" ]]; then
-    # if you change this, change the regexp is appstore/janitor.js
-    box_name="box-${deploy_env}-${pretty_revision}-${now}" # remove slashes
-
-    # create a new server if no name given
-    if ! caas_ssh_key_id=$($vps get_ssh_key_id "caas"); then
-        echo "Could not query caas ssh key"
-        exit 1
-    fi
-    echo "Detected caas ssh key id: ${caas_ssh_key_id}"
-
-    echo "Creating Server with name [${box_name}]"
-    if ! server_id=$($vps create ${caas_ssh_key_id} ${box_name}); then
-        echo "Failed to create server"
-        exit 1
-    fi
-    echo "Created server with id: ${server_id}"
-
-    # If we run scripts overenthusiastically without the wait, setup script randomly fails
-    echo -n "Waiting 120 seconds for server creation"
-    for i in $(seq 1 24); do
-        echo -n "."
-        sleep 5
-    done
-    echo ""
-else
-    if ! server_id=$($vps get_id "${box_name}"); then
-        echo "Could not determine id from name"
-        exit 1
-    fi
-    echo "Reusing server with id: ${server_id}"
-
-    $vps power_on "${server_id}"
-fi
-
-# Query until we get an IP
-while true; do
-    echo "Trying to get the server IP"
-    if server_ip=$($vps get_ip "${server_id}"); then
-        echo "Server IP : [${server_ip}]"
-        break
-    fi
-    echo "Timedout, trying again in 10 seconds"
-    sleep 10
-done
-
-while true; do
-    echo "Trying to copy init script to server"
-    if $scp22 "${SCRIPT_DIR}/initializeBaseUbuntuImage.sh" root@${server_ip}:.; then
-        break
-    fi
-    echo "Timedout, trying again in 30 seconds"
-    sleep 30
-done
-
-echo "Copying infra_version.js"
-$scp22 "${SCRIPT_DIR}/../src/infra_version.js" root@${server_ip}:.
-
-echo "Copying box source"
-cd "${SOURCE_DIR}"
-git archive --format=tar HEAD | $ssh22 "root@${server_ip}" "cat - > /tmp/box.tar.gz"
-
-echo "Executing init script"
-if ! $ssh22 "root@${server_ip}" "/bin/bash /root/initializeBaseUbuntuImage.sh caas"; then
-    echo "Init script failed"
-    exit 1
-fi
-
-echo "Shutting down server with id : ${server_id}"
-$ssh22 "root@${server_ip}" "shutdown -f now" || true # shutdown sometimes terminates ssh connection immediately making this command fail
-
-# wait 10 secs for actual shutdown
-echo "Waiting for 10 seconds for server to shutdown"
-sleep 30
-
-echo "Powering off server"
-if ! $vps power_off "${server_id}"; then
-    echo "Could not power off server"
-    exit 1
-fi
-
-snapshot_name="box-${deploy_env}-${pretty_revision}-${now}"
-echo "Snapshotting as ${snapshot_name}"
-if ! image_id=$($vps snapshot "${server_id}" "${snapshot_name}"); then
-    echo "Could not snapshot and get image id"
-    exit 1
-fi
-
-if [[ "${destroy_server}" == "yes" ]]; then
-    echo "Destroying server"
-    if ! $vps destroy "${server_id}"; then
-        echo "Could not destroy server"
-        exit 1
-    fi
-else
-    echo "Skipping server destroy"
-fi
-
-echo "Transferring image ${image_id} to other regions"
-$vps transfer_image_to_all_regions "${image_id}"
-
-echo "Done."

baseimage/digitalocean.sh

@@ -1,261 +0,0 @@
-#!/bin/bash
-
-if [[ -z "${DIGITAL_OCEAN_TOKEN}" ]]; then
-    echo "Script requires DIGITAL_OCEAN_TOKEN env to be set"
-    exit 1
-fi
-
-if [[ -z "${JSON}" ]]; then
-    echo "Script requires JSON env to be set to path of JSON binary"
-    exit 1
-fi
-
-readonly CURL="curl --retry 5 -s -u ${DIGITAL_OCEAN_TOKEN}:"
-
-function debug() {
-    echo "$@" >&2
-}
-
-function get_ssh_key_id() {
-    id=$($CURL "https://api.digitalocean.com/v2/account/keys" \
-        | $JSON ssh_keys \
-        | $JSON -c "this.name === \"$1\"" \
-        | $JSON 0.id)
-    [[ -z "$id" ]] && exit 1
-    echo "$id"
-}
-
-function create_droplet() {
-    local ssh_key_id="$1"
-    local box_name="$2"
-
-    local image_region="sfo1"
-    local ubuntu_image_slug="ubuntu-16-04-x64"
-    local box_size="1gb"
-
-    local data="{\"name\":\"${box_name}\",\"size\":\"${box_size}\",\"region\":\"${image_region}\",\"image\":\"${ubuntu_image_slug}\",\"ssh_keys\":[ \"${ssh_key_id}\" ],\"backups\":false}"
-
-    id=$($CURL -X POST -H 'Content-Type: application/json' -d "${data}" "https://api.digitalocean.com/v2/droplets" | $JSON droplet.id)
-    [[ -z "$id" ]] && exit 1
-    echo "$id"
-}
-
-function get_droplet_ip() {
-    local droplet_id="$1"
-    ip=$($CURL "https://api.digitalocean.com/v2/droplets/${droplet_id}" | $JSON "droplet.networks.v4[0].ip_address")
-    [[ -z "$ip" ]] && exit 1
-    echo "$ip"
-}
-
-function get_droplet_id() {
-    local droplet_name="$1"
-    id=$($CURL "https://api.digitalocean.com/v2/droplets?per_page=200" | $JSON "droplets" | $JSON -c "this.name === '${droplet_name}'" | $JSON "[0].id")
-    [[ -z "$id" ]] && exit 1
-    echo "$id"
-}
-
-function power_off_droplet() {
-    local droplet_id="$1"
-    local data='{"type":"power_off"}'
-    local response=$($CURL -X POST -H 'Content-Type: application/json' -d "${data}" "https://api.digitalocean.com/v2/droplets/${droplet_id}/actions")
-    local event_id=`echo "${response}" | $JSON action.id`
-
-    if [[ -z "${event_id}" ]]; then
-        debug "Got no event id, assuming already powered off."
-        debug "Response: ${response}"
-        return
-    fi
-
-    debug "Powered off droplet. Event id: ${event_id}"
-    debug -n "Waiting for droplet to power off"
-
-    while true; do
-        local event_status=`$CURL "https://api.digitalocean.com/v2/droplets/${droplet_id}/actions/${event_id}" | $JSON action.status`
-        if [[ "${event_status}" == "completed" ]]; then
-            break
-        fi
-        debug -n "."
-        sleep 10
-    done
-    debug ""
-}
-
-function power_on_droplet() {
-    local droplet_id="$1"
-    local data='{"type":"power_on"}'
-    local event_id=`$CURL -X POST -H 'Content-Type: application/json' -d "${data}" "https://api.digitalocean.com/v2/droplets/${droplet_id}/actions" | $JSON action.id`
-
-    debug "Powered on droplet. Event id: ${event_id}"
-
-    if [[ -z "${event_id}" ]]; then
-        debug "Got no event id, assuming already powered on"
-        return
-    fi
-
-    debug -n "Waiting for droplet to power on"
-
-    while true; do
-        local event_status=`$CURL "https://api.digitalocean.com/v2/droplets/${droplet_id}/actions/${event_id}" | $JSON action.status`
-        if [[ "${event_status}" == "completed" ]]; then
-            break
-        fi
-        debug -n "."
-        sleep 10
-    done
-    debug ""
-}
-
-function get_image_id() {
-    local snapshot_name="$1"
-    local image_id=""
-
-    if ! response=$($CURL "https://api.digitalocean.com/v2/images?per_page=200"); then
-        echo "Failed to get image listing. ${response}"
-        return 1
-    fi
-
-    if ! image_id=$(echo "$response" \
-       | $JSON images \
-       | $JSON -c "this.name === \"${snapshot_name}\"" 0.id); then
-        echo "Failed to parse curl response: ${response}"
-        return 1
-    fi
-
-    if [[ -z "${image_id}" ]]; then
-        echo "Failed to get image id of ${snapshot_name}. reponse: ${response}"
-        return 1
-    fi
-
-    echo "${image_id}"
-}
-
-function snapshot_droplet() {
-    local droplet_id="$1"
-    local snapshot_name="$2"
-    local data="{\"type\":\"snapshot\",\"name\":\"${snapshot_name}\"}"
-    local event_id=`$CURL -X POST -H 'Content-Type: application/json' -d "${data}" "https://api.digitalocean.com/v2/droplets/${droplet_id}/actions" | $JSON action.id`
-
-    debug "Droplet snapshotted as ${snapshot_name}. Event id: ${event_id}"
-    debug -n "Waiting for snapshot to complete"
-
-    while true; do
-        if ! response=$($CURL "https://api.digitalocean.com/v2/droplets/${droplet_id}/actions/${event_id}"); then
-            echo "Could not get action status. ${response}"
-            continue
-        fi
-        if ! event_status=$(echo "${response}" | $JSON action.status); then
-            echo "Could not parse action.status from response. ${response}"
-            continue
-        fi
-        if [[ "${event_status}" == "completed" ]]; then
-            break
-        fi
-        debug -n "."
-        sleep 10
-    done
-    debug "! done"
-
-    if ! image_id=$(get_image_id "${snapshot_name}"); then
-        return 1
-    fi
-    echo "${image_id}"
-}
-
-function destroy_droplet() {
-    local droplet_id="$1"
-    # TODO: check for 204 status
-    $CURL -X DELETE "https://api.digitalocean.com/v2/droplets/${droplet_id}"
-    debug "Droplet destroyed"
-    debug ""
-}
-
-function transfer_image() {
-    local image_id="$1"
-    local region_slug="$2"
-    local data="{\"type\":\"transfer\",\"region\":\"${region_slug}\"}"
-    local event_id=`$CURL -X POST -H 'Content-Type: application/json' -d "${data}" "https://api.digitalocean.com/v2/images/${image_id}/actions" | $JSON action.id`
-    echo "${event_id}"
-}
-
-function wait_for_image_event() {
-    local image_id="$1"
-    local event_id="$2"
-
-    debug -n "Waiting for ${event_id}"
-
-    while true; do
-        local event_status=`$CURL "https://api.digitalocean.com/v2/images/${image_id}/actions/${event_id}" | $JSON action.status`
-        if [[ "${event_status}" == "completed" ]]; then
-            break
-        fi
-        debug -n "."
-        sleep 10
-    done
-    debug ""
-}
-
-function transfer_image_to_all_regions() {
-    local image_id="$1"
-
-    xfer_events=()
-    image_regions=(ams2) ## sfo1 is where the image is created
-    for image_region in ${image_regions[@]}; do
-        xfer_event=$(transfer_image ${image_id} ${image_region})
-        echo "Image transfer to ${image_region} initiated. Event id: ${xfer_event}"
-        xfer_events+=("${xfer_event}")
-        sleep 1
-    done
-
-    echo "Image transfer initiated, but they will take some time to get transferred."
-
-    for xfer_event in ${xfer_events[@]}; do
-        $vps wait_for_image_event "${image_id}" "${xfer_event}"
-    done
-}
-
-if [[ $# -lt 1 ]]; then
-    debug "<command> <params...>"
-    exit 1
-fi
-
-case $1 in
-get_ssh_key_id)
-    get_ssh_key_id "${@:2}"
-    ;;
-
-create)
-    create_droplet "${@:2}"
-    ;;
-
-get_id)
-    get_droplet_id "${@:2}"
-    ;;
-
-get_ip)
-    get_droplet_ip "${@:2}"
-    ;;
-
-power_on)
-    power_on_droplet "${@:2}"
-    ;;
-
-power_off)
-    power_off_droplet "${@:2}"
-    ;;
-
-snapshot)
-    snapshot_droplet "${@:2}"
-    ;;
-
-destroy)
-    destroy_droplet "${@:2}"
-    ;;
-
-transfer_image_to_all_regions)
-    transfer_image_to_all_regions "${@:2}"
-    ;;
-
-*)
-    echo "Unknown command $1"
-    exit 1
-esac

baseimage/initializeBaseUbuntuImage.sh

@@ -1,107 +0,0 @@
-#!/bin/bash
-
-set -euv -o pipefail
-
-readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-readonly arg_provider="${1:-generic}"
-readonly arg_infraversionpath="${SOURCE_DIR}/${2:-}"
-
-function die {
-    echo $1
-    exit 1
-}
-
-export DEBIAN_FRONTEND=noninteractive
-
-apt-get -o Dpkg::Options::="--force-confdef" update -y
-apt-get -o Dpkg::Options::="--force-confdef" dist-upgrade -y
-
-echo "==> Installing required packages"
-
-debconf-set-selections <<< 'mysql-server mysql-server/root_password password password'
-debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password password'
-
-# this enables automatic security upgrades (https://help.ubuntu.com/community/AutomaticSecurityUpdates)
-apt-get -y install \
-    acl \
-    awscli \
-    build-essential \
-    cron \
-    curl \
-    dmsetup \
-    iptables \
-    logrotate \
-    mysql-server-5.7 \
-    nginx-full \
-    openssh-server \
-    pwgen \
-    rcconf \
-    swaks \
-    unattended-upgrades \
-    unbound \
-    xfsprogs
-
-# this ensures that unattended upgades are enabled, if it was disabled during ubuntu install time (see #346)
-# debconf-set-selection of unattended-upgrades/enable_auto_updates + dpkg-reconfigure does not work
-cp /usr/share/unattended-upgrades/20auto-upgrades /etc/apt/apt.conf.d/20auto-upgrades
-
-echo "==> Installing node.js"
-mkdir -p /usr/local/node-8.9.3
-curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
-ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
-ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
-apt-get install -y python   # Install python which is required for npm rebuild
-[[ "$(python --version 2>&1)" == "Python 2.7."* ]] || die "Expecting python version to be 2.7.x"
-
-# https://docs.docker.com/engine/installation/linux/ubuntulinux/
-echo "==> Installing Docker"
-
-# create systemd drop-in file
-mkdir -p /etc/systemd/system/docker.service.d
-echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=overlay2" > /etc/systemd/system/docker.service.d/cloudron.conf
-
-curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.0~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
-# apt install with install deps (as opposed to dpkg -i)
-apt install -y /tmp/docker.deb
-rm /tmp/docker.deb
-
-storage_driver=$(docker info | grep "Storage Driver" | sed 's/.*: //')
-if [[ "${storage_driver}" != "overlay2" ]]; then
-    echo "Docker is using "${storage_driver}" instead of overlay2"
-    exit 1
-fi
-
-echo "==> Enable memory accounting"
-apt-get -y install grub2
-sed -e 's/^GRUB_CMDLINE_LINUX="\(.*\)"$/GRUB_CMDLINE_LINUX="\1 cgroup_enable=memory swapaccount=1 panic_on_oops=1 panic=5"/' -i /etc/default/grub
-update-grub
-
-echo "==> Downloading docker images"
-if [ ! -f "${arg_infraversionpath}/infra_version.js" ]; then
-    echo "No infra_versions.js found"
-    exit 1
-fi
-
-images=$(node -e "var i = require('${arg_infraversionpath}/infra_version.js'); console.log(i.baseImages.join(' '), Object.keys(i.images).map(function (x) { return i.images[x].tag; }).join(' '));")
-
-echo -e "\tPulling docker images: ${images}"
-for image in ${images}; do
-    docker pull "${image}"
-done
-
-echo "==> Install collectd"
-if ! apt-get install -y collectd collectd-utils; then
-    # FQDNLookup is true in default debian config. The box code has a custom collectd.conf that fixes this
-    echo "Failed to install collectd. Presumably because of http://mailman.verplant.org/pipermail/collectd/2015-March/006491.html"
-    sed -e 's/^FQDNLookup true/FQDNLookup false/' -i /etc/collectd/collectd.conf
-fi
-
-# Disable bind for good measure (on online.net, kimsufi servers these are pre-installed and conflicts with unbound)
-systemctl stop bind9 || true
-systemctl disable bind9 || true
-
-# on ovh images dnsmasq seems to run by default
-systemctl stop dnsmasq || true
-systemctl disable dnsmasq || true
-

box.js

@@ -1,56 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-require('supererror')({ splatchError: true });
-
-// remove timestamp from debug() based output
-require('debug').formatArgs = function formatArgs(args) {
-    args[0] = this.namespace + ' ' + args[0];
-};
-
-var appHealthMonitor = require('./src/apphealthmonitor.js'),
-    async = require('async'),
-    config = require('./src/config.js'),
-    ldap = require('./src/ldap.js'),
-    server = require('./src/server.js');
-
-console.log();
-console.log('==========================================');
-console.log(' Cloudron will use the following settings ');
-console.log('==========================================');
-console.log();
-console.log(' Environment:                    ', config.CLOUDRON ? 'CLOUDRON' : 'TEST');
-console.log(' Version:                        ', config.version());
-console.log(' Admin Origin:                   ', config.adminOrigin());
-console.log(' Appstore API server origin:     ', config.apiServerOrigin());
-console.log(' Appstore Web server origin:     ', config.webServerOrigin());
-console.log();
-console.log('==========================================');
-console.log();
-
-async.series([
-    server.start,
-    ldap.start,
-    appHealthMonitor.start,
-], function (error) {
-    if (error) {
-        console.error('Error starting server', error);
-        process.exit(1);
-    }
-    console.log('Cloudron is up and running');
-});
-
-var NOOP_CALLBACK = function () { };
-
-process.on('SIGINT', function () {
-    server.stop(NOOP_CALLBACK);
-    ldap.stop(NOOP_CALLBACK);
-    setTimeout(process.exit.bind(process), 3000);
-});
-
-process.on('SIGTERM', function () {
-    server.stop(NOOP_CALLBACK);
-    ldap.stop(NOOP_CALLBACK);
-    setTimeout(process.exit.bind(process), 3000);
-});

crashnotifierservice.js

@@ -1,16 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-var sendFailureLogs = require('./src/logcollector').sendFailureLogs;
-
-function main() {
-    if (process.argv.length !== 3) return console.error('Usage: crashnotifier.js <processName>');
-
-    var processName = process.argv[2];
-    console.log('Started crash notifier for', processName);
-
-    sendFailureLogs(processName, { unit: processName });
-}
-
-main();

gulpfile.js

@@ -11,247 +11,198 @@ var argv = require('yargs').argv,
     rimraf = require('rimraf'),
     sass = require('gulp-sass'),
     serve = require('gulp-serve'),
-    sourcemaps = require('gulp-sourcemaps'),
-    uglify = require('gulp-uglify'),
-    url = require('url');
-
-gulp.task('3rdparty', function () {
-    gulp.src([
-        'webadmin/src/3rdparty/**/*.js',
-        'webadmin/src/3rdparty/**/*.map',
-        'webadmin/src/3rdparty/**/*.css',
-        'webadmin/src/3rdparty/**/*.otf',
-        'webadmin/src/3rdparty/**/*.eot',
-        'webadmin/src/3rdparty/**/*.svg',
-        'webadmin/src/3rdparty/**/*.gif',
-        'webadmin/src/3rdparty/**/*.ttf',
-        'webadmin/src/3rdparty/**/*.woff',
-        'webadmin/src/3rdparty/**/*.woff2'
-        ])
-        .pipe(gulp.dest('webadmin/dist/3rdparty/'))
-        .pipe(gulp.dest('setup/splash/website/3rdparty'));
-
-    gulp.src('node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js')
-        .pipe(gulp.dest('webadmin/dist/3rdparty/js'))
-        .pipe(gulp.dest('setup/splash/website/3rdparty/js'));
-});
-
-
-// --------------
-// JavaScript
-// --------------
+    sourcemaps = require('gulp-sourcemaps');
 
 if (argv.help || argv.h) {
     console.log('Supported arguments for "gulp develop":');
     console.log(' --client-id <clientId>');
     console.log(' --client-secret <clientSecret>');
     console.log(' --api-origin <cloudron api uri>');
+    console.log(' --revision <revision>');
 
     process.exit(1);
 }
 
-gulp.task('js', ['js-index', 'js-logs', 'js-terminal', 'js-setup', 'js-setupdns', 'js-restore', 'js-update'], function () {});
-
 var oauth = {
     clientId: argv.clientId || 'cid-webadmin',
     clientSecret: argv.clientSecret || 'unused',
     apiOrigin: argv.apiOrigin || '',
-    apiOriginHostname: argv.apiOrigin ? url.parse(argv.apiOrigin).hostname : ''
 };
 
+var revision = argv.revision || '';
+
 console.log();
 console.log('Using OAuth credentials:');
 console.log(' ClientId:      %s', oauth.clientId);
 console.log(' ClientSecret:  %s', oauth.clientSecret);
 console.log(' Cloudron API:  %s', oauth.apiOrigin || 'default');
-console.log(' Cloudron Host: %s', oauth.apiOriginHostname);
+console.log();
+console.log('Building for revision: %s', revision);
 console.log();
 
+gulp.task('fontawesome', function () {
+    return gulp.src([
+        'node_modules/@fortawesome/fontawesome-free/*css*/all.min.css',
+        'node_modules/@fortawesome/fontawesome-free/*webfonts*/*.eot',
+        'node_modules/@fortawesome/fontawesome-free/*webfonts*/*.svg',
+        'node_modules/@fortawesome/fontawesome-free/*webfonts*/*.ttf',
+        'node_modules/@fortawesome/fontawesome-free/*webfonts*/*.woff',
+        'node_modules/@fortawesome/fontawesome-free/*webfonts*/*.woff2'
+    ]).pipe(gulp.dest('dist/3rdparty/fontawesome/'));
+});
+
+gulp.task('bootstrap', function () {
+    return gulp.src('node_modules/bootstrap-sass/assets/javascripts/bootstrap.min.js')
+        .pipe(gulp.dest('dist/3rdparty/js'));
+});
+
+gulp.task('3rdparty-copy', function () {
+    return gulp.src([
+        'src/3rdparty/**/*.js',
+        'src/3rdparty/**/*.map',
+        'src/3rdparty/**/*.css',
+        'src/3rdparty/**/*.otf',
+        'src/3rdparty/**/*.eot',
+        'src/3rdparty/**/*.svg',
+        'src/3rdparty/**/*.gif',
+        'src/3rdparty/**/*.ttf'
+        ])
+        .pipe(gulp.dest('dist/3rdparty/'));
+});
+
+gulp.task('3rdparty', gulp.series(['3rdparty-copy', 'bootstrap', 'fontawesome']));
+
+// --------------
+// JavaScript
+// --------------
 
 gulp.task('js-index', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src([
-        'webadmin/src/js/index.js',
-        'webadmin/src/js/client.js',
-        'webadmin/src/js/appstore.js',
-        'webadmin/src/js/main.js',
-        'webadmin/src/views/*.js'
+    return gulp.src([
+        'src/js/index.js',
+        'src/js/client.js',
+        'src/js/main.js',
+        'src/views/*.js'
         ])
-        .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
+        .pipe(ejs({ oauth: oauth, revision: revision }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('index.js', { newLine: ';' }))
-        .pipe(uglifyer)
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
+        .pipe(gulp.dest('dist/js'));
 });
 
 gulp.task('js-logs', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/logs.js', 'webadmin/src/js/client.js'])
+    return gulp.src(['src/js/logs.js', 'src/js/client.js'])
         .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('logs.js', { newLine: ';' }))
-        .pipe(uglifyer)
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
+        .pipe(gulp.dest('dist/js'));
 });
 
 gulp.task('js-terminal', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/terminal.js', 'webadmin/src/js/client.js'])
+    return gulp.src(['src/js/terminal.js', 'src/js/client.js'])
         .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('terminal.js', { newLine: ';' }))
-        .pipe(uglifyer)
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
+        .pipe(gulp.dest('dist/js'));
 });
 
 gulp.task('js-setup', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/setup.js', 'webadmin/src/js/client.js'])
+    return gulp.src(['src/js/setup.js', 'src/js/client.js'])
         .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('setup.js', { newLine: ';' }))
-        .pipe(uglifyer)
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
+        .pipe(gulp.dest('dist/js'));
 });
 
 gulp.task('js-setupdns', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/setupdns.js', 'webadmin/src/js/client.js'])
+    return gulp.src(['src/js/setupdns.js', 'src/js/client.js'])
         .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('setupdns.js', { newLine: ';' }))
-        .pipe(uglifyer)
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
+        .pipe(gulp.dest('dist/js'));
 });
 
 gulp.task('js-restore', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/restore.js', 'webadmin/src/js/client.js'])
+    return gulp.src(['src/js/restore.js', 'src/js/client.js'])
         .pipe(ejs({ oauth: oauth }, {}, { ext: '.js' }))
         .pipe(sourcemaps.init())
         .pipe(concat('restore.js', { newLine: ';' }))
-        .pipe(uglifyer)
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'));
-});
-
-
-gulp.task('js-update', function () {
-    // needs special treatment for error handling
-    var uglifyer = uglify();
-    uglifyer.on('error', function (error) {
-        console.error(error);
-    });
-
-    gulp.src(['webadmin/src/js/update.js'])
-        .pipe(sourcemaps.init())
-        .pipe(uglifyer)
-        .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist/js'))
-        .pipe(gulp.dest('setup/splash/website/js'));
+        .pipe(gulp.dest('dist/js'));
 });
 
+gulp.task('js', gulp.series([ 'js-index', 'js-logs', 'js-terminal', 'js-setup', 'js-setupdns', 'js-restore' ]));
 
 // --------------
 // HTML
 // --------------
 
-gulp.task('html', ['html-views', 'html-update', 'html-templates'], function () {
-    return gulp.src('webadmin/src/*.html').pipe(ejs({ apiOriginHostname: oauth.apiOriginHostname }, {}, { ext: '.html' })).pipe(gulp.dest('webadmin/dist'));
-});
-
-gulp.task('html-update', function () {
-    return gulp.src(['webadmin/src/update.html']).pipe(gulp.dest('setup/splash/website'));
-});
-
 gulp.task('html-views', function () {
-    return gulp.src('webadmin/src/views/**/*.html').pipe(gulp.dest('webadmin/dist/views'));
+    return gulp.src('src/views/**/*.html').pipe(gulp.dest('dist/views'));
 });
 
 gulp.task('html-templates', function () {
-    return gulp.src('webadmin/src/templates/**/*.html').pipe(gulp.dest('webadmin/dist/templates'));
+    return gulp.src('src/templates/**/*.html').pipe(gulp.dest('dist/templates'));
 });
 
+gulp.task('html-raw', function () {
+    return gulp.src('src/*.html').pipe(ejs({ revision: revision }, {}, { ext: '.html' })).pipe(gulp.dest('dist'));
+});
+
+gulp.task('html', gulp.series(['html-views', 'html-templates', 'html-raw']));
+
 // --------------
 // CSS
 // --------------
 
 gulp.task('css', function () {
-    return gulp.src('webadmin/src/*.scss')
+    return gulp.src('src/*.scss')
         .pipe(sourcemaps.init())
         .pipe(sass({ includePaths: ['node_modules/bootstrap-sass/assets/stylesheets/'] }).on('error', sass.logError))
         .pipe(autoprefixer())
         .pipe(cssnano())
         .pipe(sourcemaps.write())
-        .pipe(gulp.dest('webadmin/dist'))
-        .pipe(gulp.dest('setup/splash/website'));
+        .pipe(gulp.dest('dist'));
 });
 
 gulp.task('images', function () {
-    return gulp.src('webadmin/src/img/**')
-        .pipe(gulp.dest('webadmin/dist/img'));
+    return gulp.src('src/img/**')
+        .pipe(gulp.dest('dist/img'));
 });
 
+
 // --------------
 // Utilities
 // --------------
 
-gulp.task('watch', ['default'], function () {
-    gulp.watch(['webadmin/src/*.scss'], ['css']);
-    gulp.watch(['webadmin/src/img/*'], ['images']);
-    gulp.watch(['webadmin/src/**/*.html'], ['html']);
-    gulp.watch(['webadmin/src/views/*.html'], ['html-views']);
-    gulp.watch(['webadmin/src/templates/*.html'], ['html-templates']);
-    gulp.watch(['webadmin/src/js/update.js'], ['js-update']);
-    gulp.watch(['webadmin/src/js/setup.js', 'webadmin/src/js/client.js'], ['js-setup']);
-    gulp.watch(['webadmin/src/js/setupdns.js', 'webadmin/src/js/client.js'], ['js-setupdns']);
-    gulp.watch(['webadmin/src/js/restore.js', 'webadmin/src/js/client.js'], ['js-restore']);
-    gulp.watch(['webadmin/src/js/logs.js', 'webadmin/src/js/client.js'], ['js-logs']);
-    gulp.watch(['webadmin/src/js/terminal.js', 'webadmin/src/js/client.js'], ['js-terminal']);
-    gulp.watch(['webadmin/src/js/index.js', 'webadmin/src/js/client.js', 'webadmin/src/js/appstore.js', 'webadmin/src/js/main.js', 'webadmin/src/views/*.js'], ['js-index']);
-    gulp.watch(['webadmin/src/3rdparty/**/*'], ['3rdparty']);
+gulp.task('clean', function (done) {
+    rimraf.sync('dist');
+    done();
 });
 
-gulp.task('clean', function () {
-    rimraf.sync('webadmin/dist');
-    rimraf.sync('setup/splash/website');
+gulp.task('default', gulp.series(['clean', 'html', 'js', '3rdparty', 'images', 'css']));
+
+gulp.task('watch', function (done) {
+    gulp.watch(['src/*.scss'], gulp.series(['css']));
+    gulp.watch(['src/img/*'], gulp.series(['images']));
+    gulp.watch(['src/**/*.html'], gulp.series(['html']));
+    gulp.watch(['src/views/*.html'], gulp.series(['html-views']));
+    gulp.watch(['src/templates/*.html'], gulp.series(['html-templates']));
+    gulp.watch(['src/js/setup.js', 'src/js/client.js'], gulp.series(['js-setup']));
+    gulp.watch(['src/js/setupdns.js', 'src/js/client.js'], gulp.series(['js-setupdns']));
+    gulp.watch(['src/js/restore.js', 'src/js/client.js'], gulp.series(['js-restore']));
+    gulp.watch(['src/js/logs.js', 'src/js/client.js'], gulp.series(['js-logs']));
+    gulp.watch(['src/js/terminal.js', 'src/js/client.js'], gulp.series(['js-terminal']));
+    gulp.watch(['src/js/index.js', 'src/js/client.js', 'src/js/main.js', 'src/views/*.js'], gulp.series(['js-index']));
+    gulp.watch(['src/3rdparty/**/*'], gulp.series(['3rdparty']));
+    done();
 });
 
-gulp.task('default', ['clean', 'html', 'js', '3rdparty', 'images', 'css'], function () {});
+gulp.task('serve', serve({ root: 'dist', port: 4000 }));
+
+gulp.task('develop', gulp.series(['default', 'watch', 'serve']));
 
-gulp.task('develop', ['watch'], serve({ root: 'webadmin/dist', port: 4000 }));

migrations/20141021192552-db-create.js

@@ -1,14 +0,0 @@
-'use strict';
-
-var url = require('url');
-
-exports.up = function(db, callback) {
-    var dbName = url.parse(process.env.DATABASE_URL).path.substr(1); // remove slash
-
-    // by default, mysql collates case insensitively. 'utf8_general_cs' is not available
-    db.runSql('ALTER DATABASE ' + dbName + '  DEFAULT CHARACTER SET=utf8 DEFAULT COLLATE utf8_bin', callback);
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20141021192554-db-init.js

@@ -1,18 +0,0 @@
-'use strict';
-
-var fs = require('fs'),
-    async = require('async'),
-    path = require('path');
-
-exports.up = function(db, callback) {
-    var schema = fs.readFileSync(path.join(__dirname, 'initial-schema.sql')).toString('utf8');
-    var statements = schema.split(';');
-    async.eachSeries(statements, function (statement, callback) {
-        if (statement.trim().length === 0) return callback(null);
-        db.runSql(statement, callback);
-    }, callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE users, tokens, clients, apps, appPortBindings, authcodes, settings', callback);
-};

migrations/20150303114527-users-add-resetToken.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE users ADD COLUMN resetToken VARCHAR(128) DEFAULT ""', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE users DROP COLUMN resetToken', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150303160528-tokens-expires-bigint.js

@@ -1,19 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('DELETE FROM tokens', [], function (error) {
-        if (error) console.error(error);
-
-        db.runSql('ALTER TABLE tokens MODIFY expires BIGINT', [], function (error) {
-            if (error) console.error(error);
-            callback(error);
-        });
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE tokens MODIFY expires VARCHAR(512)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150303171203-authcodes-add-expiresAt.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE authcodes ADD COLUMN expiresAt BIGINT NOT NULL', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE authcodes DROP COLUMN expiresAt', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150308054950-appportbindings-add-environmentVariable.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE appPortBindings ADD COLUMN environmentVariable VARCHAR(128) NOT NULL', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE appPortBindings DROP COLUMN environmentVariable', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150309023251-appportbindings-drop-containerport.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE appPortBindings DROP COLUMN containerPort', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE appPortBindings ADD COLUMN containerPort VARCHAR(5) NOT NULL', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150311120713-tokens-rename-userid-to-identifier.js

@@ -1,19 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('DELETE FROM tokens', [], function (error) {
-        if (error) console.error(error);
-
-        db.runSql('ALTER TABLE tokens CHANGE userId identifier VARCHAR(128) NOT NULL', [], function (error) {
-            if (error) console.error(error);
-            callback(error);
-        });
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE tokens CHANGE identifier userId VARCHAR(128) NOT NULL', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150323044254-apps-drop-version.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN version', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN version VARCHAR(32)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150323174906-apps-alter-health.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN healthy, ADD COLUMN health VARCHAR(128)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN health, ADD COLUMN healthy INTEGER', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150326072904-apps-add-lastBackupId.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN lastBackupId VARCHAR(128)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN lastBackupId', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150404093025-apps-add-createdAt.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN createdAt TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN createdAt', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150430165335-settings-default-autoupdatepattern.js

@@ -1,10 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    // everyday at 1am
-    db.runSql('INSERT settings (name, value) VALUES("autoupdate_pattern", ?)', [ '00 00 1 * * *' ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DELETE * FROM settings WHERE name="autoupdate_pattern"', [ ], callback);
-};

migrations/20150430210225-settings-default-timezone.js

@@ -1,14 +0,0 @@
-'use strict';
-
-var safe = require('safetydance');
-
-exports.up = function(db, callback) {
-    var tz = safe.fs.readFileSync('/etc/timezone', 'utf8');
-    tz = tz ? tz.trim() : 'America/Los_Angeles';
-
-    db.runSql('INSERT settings (name, value) VALUES("time_zone", ?)', [ tz ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DELETE * FROM settings WHERE name="time_zone"', [ ], callback);
-};

migrations/20150615075901-users-add-unique-constraints.js

@@ -1,24 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-
-    // http://stackoverflow.com/questions/386294/what-is-the-maximum-length-of-a-valid-email-address
-
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY username VARCHAR(254)'),
-        db.runSql.bind(db, 'ALTER TABLE users ADD CONSTRAINT users_username UNIQUE (username)'),
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY email VARCHAR(254)'),
-        db.runSql.bind(db, 'ALTER TABLE users ADD CONSTRAINT users_email UNIQUE (email)'),
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE users DROP INDEX users_username'),
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY username VARCHAR(512)'),
-        db.runSql.bind(db, 'ALTER TABLE users DROP INDEX users_email'),
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY email VARCHAR(512)'),
-    ], callback);
-};

migrations/20150615134751-users-adjust-username-and-email-constraints.js

@@ -1,17 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY username VARCHAR(254) NOT NULL'),
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY email VARCHAR(254) NOT NULL'),
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY username VARCHAR(254)'),
-        db.runSql.bind(db, 'ALTER TABLE users MODIFY email VARCHAR(254)'),
-    ], callback);
-};

migrations/20150618192028-apps-add-lastManifestJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN lastManifestJson VARCHAR(2048)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN lastManifestJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150710044740-apps-rename-lastBackupConfigJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE lastManifestJson lastBackupConfigJson VARCHAR(2048)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE lastBackupConfigJson lastManifestJson VARCHAR(2048)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150710170847-apps-add-oldConfigJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN oldConfigJson VARCHAR(2048)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN oldConfigJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20150719014338-settings-remove-all.js

@@ -1,9 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('DELETE FROM settings', [ ], callback);
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20151013073519-apps-add-oauthProxy.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN oauthProxy BOOLEAN DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN oauthProxy', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20151015232915-clients-add-type.js

@@ -1,17 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'DELETE FROM clients'),
-        db.runSql.bind(db, 'ALTER TABLE clients ADD COLUMN type VARCHAR(16) NOT NULL'),
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE clients DROP COLUMN type', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20151016131005-apps-rename-accessRestriction.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE accessRestriction accessRestrictionJson VARCHAR(2048)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE accessRestrictionJson accessRestriction VARCHAR(2048)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20151113091257-apps-alter-manifestJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps MODIFY manifestJson TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps MODIFY manifestJson VARCHAR(2048)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20151126111337-apps-alter-jsons.js

@@ -1,19 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY accessRestrictionJson TEXT'),
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY lastBackupConfigJson TEXT'),
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY oldConfigJson TEXT')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY accessRestrictionJson VARCHAR(2048)'),
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY lastBackupConfigJson VARCHAR(2048)'),
-        db.runSql.bind(db, 'ALTER TABLE apps MODIFY oldConfigJson VARCHAR(2048)')
-    ], callback);
-};

migrations/20160119113143-users-add-displayName.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE users ADD COLUMN displayName VARCHAR(512) DEFAULT ""', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE users DROP COLUMN displayName', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160205135326-apps-add-memoryLimit.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN memoryLimit BIGINT DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN memoryLimit', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160208031241-groups-add-table.js

@@ -1,20 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    var cmd = "CREATE TABLE groups(" +
-                "id VARCHAR(128) NOT NULL UNIQUE," +
-                "name VARCHAR(128) NOT NULL UNIQUE," +
-                "PRIMARY KEY(id))";
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE groups', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160208100000-groupMembers-add-table.js

@@ -1,21 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-	var cmd = "CREATE TABLE IF NOT EXISTS groupMembers(" +
-    			"groupId VARCHAR(128) NOT NULL," +
-    			"userId VARCHAR(128) NOT NULL," +
-    			"FOREIGN KEY(groupId) REFERENCES groups(id)," +
-    			"FOREIGN KEY(userId) REFERENCES users(id));";
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE groupMembers', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160208164735-groups-add-admin.js

@@ -1,29 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-var ADMIN_GROUP_ID = 'admin'; // see constants.js
-
-exports.up = function(db, callback) {
-	async.series([
-		db.runSql.bind(db, 'START TRANSACTION;'),
-		db.runSql.bind(db, 'INSERT INTO groups (id, name) VALUES (?, ?)', [ ADMIN_GROUP_ID, 'admin' ]),
-		function migrateAdminFlag(done) {
-			db.all('SELECT * FROM users WHERE admin=1', function (error, results) {
-				if (error) return done(error);
-
-				console.dir(results);
-
-				async.eachSeries(results, function (r, next) {
-					db.runSql('INSERT INTO groupMembers (groupId, userId) VALUES (?, ?)', [ ADMIN_GROUP_ID, r.id ], next);
-				}, done);
-			});
-		},
-		db.runSql.bind(db, 'ALTER TABLE users DROP COLUMN admin'),
-		db.runSql.bind(db, 'COMMIT')
-	], callback);
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20160307172229-backups-add-table.js

@@ -1,24 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    var cmd = "CREATE TABLE backups(" +
-            "filename VARCHAR(128) NOT NULL," +
-            "creationTime TIMESTAMP," +
-            "version VARCHAR(128) NOT NULL," +
-            "type VARCHAR(16) NOT NULL," +
-            "dependsOn VARCHAR(4096)," +
-            "state VARCHAR(16) NOT NULL," +
-            "PRIMARY KEY (filename))";
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE backups', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160330215005-backups-add-configJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE backups ADD COLUMN configJson TEXT', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups DROP COLUMN configJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160404052453-backups-drop-configJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE backups DROP COLUMN configJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups ADD COLUMN configJson TEXT', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160404191651-backups-rename-filename-to-id.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE backups CHANGE filename id VARCHAR(128)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups CHANGE id filename VARCHAR(128)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160405083451-users-drop-username-null.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE users MODIFY username VARCHAR(254) UNIQUE', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE users MODIFY username VARCHAR(254) NOT NULL UNIQUE', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160419070047-apps-add-altDomain.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN altDomain VARCHAR(256)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN altDomain', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160430062446-eventlog-add-table.js

@@ -1,23 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    var cmd = "CREATE TABLE eventlog(" +
-            "id VARCHAR(128) NOT NULL," +
-            "source TEXT," +
-            "creationTime TIMESTAMP," +
-            "action VARCHAR(128) NOT NULL," +
-            "data TEXT," +
-            "PRIMARY KEY (id))";
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE eventlog', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160506111925-users-add-showTutorial.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE users ADD COLUMN showTutorial BOOLEAN DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE users DROP COLUMN showTutorial', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160527010012-mailboxes-add-table.js

@@ -1,21 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-	var cmd = 'CREATE TABLE mailboxes(' +
-				'name VARCHAR(128) NOT NULL,' +
-				'aliasTarget VARCHAR(128),' +
-				'creationTime TIMESTAMP,' +
-				'PRIMARY KEY (name))';
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE mailboxes', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160528090040-mailboxes-import-existing-users.js

@@ -1,26 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-// imports mailbox entries for existing users
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        function addUserMailboxes(done) {
-            db.all('SELECT username FROM users', function (error, results) {
-                if (error) return done(error);
-
-                async.eachSeries(results, function (r, next) {
-                    if (!r.username) return next();
-
-                    db.runSql('INSERT INTO mailboxes (name) VALUES (?)', [ r.username ], next);
-                }, done);
-            });
-        },
-       db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-  callback();
-};

migrations/20160614021819-apps-drop-lastBackupConfigJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN lastBackupConfigJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN lastBackupConfigJson TEXT', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160621032914-apps-alter-installationProgress.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps MODIFY installationProgress TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps MODIFY installationProgress VARCHAR(512)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160714130142-apps-add-xFrameOptions.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN xFrameOptions VARCHAR(512)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN xFrameOptions', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20160831051352-settings-default-mailconfig.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.all('SELECT id FROM users', function (error, results) {
-        if (error) return callback(error);
-
-        // existing cloudrons have email enabled by default. future cloudrons will have it disabled by default
-        var enable = results.length !== 0;
-        db.runSql('INSERT settings (name, value) VALUES("mail_config", ?)', [ JSON.stringify({ enabled: enable }) ], callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DELETE * FROM settings WHERE name="mail_config"', [ ], callback);
-};

migrations/20160921205726-mailboxes-add-ownerId.js

@@ -1,73 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD COLUMN ownerId VARCHAR(128)'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes ADD COLUMN ownerType VARCHAR(16)'),
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        function addGroupMailboxes(done) {
-            console.log('Importing group mailboxes');
-
-            db.all('SELECT id, name FROM groups', function (error, results) {
-                if (error) return done(error);
-
-                async.eachSeries(results, function (g, next) {
-                    db.runSql('INSERT INTO mailboxes (ownerId, ownerType, name) VALUES (?, ?, ?)', [ g.id, 'group', g.name ], function (error) {
-                        if (error) console.error('Error importing group ' + JSON.stringify(g) + error);
-                        next();
-                    });
-                }, done);
-            });
-        },
-        function addAppMailboxes(done) {
-            console.log('Importing app mail boxes');
-
-            db.all('SELECT id, location, manifestJson FROM apps', function (error, results) {
-                if (error) return done(error);
-
-                async.eachSeries(results, function (a, next) {
-                    var manifest = JSON.parse(a.manifestJson);
-                    if (!manifest.addons['sendmail'] && !manifest.addons['recvmail']) return next();
-
-                    var mailboxName = (a.location ? a.location : manifest.title.replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-                    db.runSql('INSERT INTO mailboxes (ownerId, ownerType, name) VALUES (?, ?, ?)', [ a.id, 'app', mailboxName ], function (error) {
-                        if (error) console.error('Error importing app ' + JSON.stringify(a) + error);
-                        next();
-                    });
-                }, done);
-            });
-        },
-        function setUserMailboxOwnerIds(done) {
-            console.log('Setting owner id of user mailboxes and aliases');
-
-            db.all('SELECT id, username FROM users', function (error, results) {
-                if (error) return done(error);
-
-                async.eachSeries(results, function (u,  next) {
-                    if (!u.username) return next();
-
-                    db.runSql('UPDATE mailboxes SET ownerId = ?, ownerType = ? WHERE name = ? OR aliasTarget = ?', [ u.id, 'user', u.username, u.username ], function (error) {
-                        if (error) console.error('Error setting ownerid ' + JSON.stringify(u) + error);
-                        next();
-                    });
-                }, done);
-            });
-        },
-        db.runSql.bind(db, 'COMMIT'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes MODIFY ownerId VARCHAR(128) NOT NULL'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes MODIFY ownerType VARCHAR(128) NOT NULL'),
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes DROP COLUMN ownerId', function (error) {
-        if (error) console.error(error);
-
-        db.runSql('ALTER TABLE mailboxes DROP COLUMN ownerType', function (error) {
-            if (error) console.error(error);
-            callback(error);
-        });
-    });
-};

migrations/20161111051640-appdb-add-sso.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN sso BOOLEAN DEFAULT 1', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN sso', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20161113014146-appdb-drop-oauthProxy.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN oauthProxy', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN oauthProxy BOOLEAN DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20170117170621-users-drop-showTutorial.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE users DROP COLUMN showTutorial', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE users ADD COLUMN showTutorial BOOLEAN DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20170119234504-appdb-add-debugModeJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN debugModeJson TEXT', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN debugModeJson ', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20170223165502-backups-alter-dependsOn.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE backups MODIFY dependsOn TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups MODIFY dependsOn VARCHAR(4096)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20170325203037-appaddonconfigs-add-name.js

@@ -1,16 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE appAddonConfigs ADD COLUMN name VARCHAR(128)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE appAddonConfigs DROP COLUMN name', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-

migrations/20170414193114-database-utf8mb4.js

@@ -1,14 +0,0 @@
-'use strict';
-
-var url = require('url');
-
-exports.up = function(db, callback) {
-    var dbName = url.parse(process.env.DATABASE_URL).path.substr(1); // remove slash
-
-    // by default, mysql collates case insensitively. 'utf8_general_cs' is not available
-    db.runSql('ALTER DATABASE ' + dbName + '  DEFAULT CHARACTER SET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci', callback);
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20170418073650-backups-add-restoreConfigJson.js

@@ -1,95 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-// from apps.js DO NOT UPDATE WHEN apps.js changes, as this is part of db migration!!
-function postProcess(result) {
-    try {
-        result.manifest = JSON.parse(result.manifestJson);
-        delete result.manifestJson;
-
-        result.oldConfig = JSON.parse(result.oldConfigJson);
-        delete result.oldConfigJson;
-
-        result.portBindings = { };
-        var hostPorts = result.hostPorts === null ? [ ] : result.hostPorts.split(',');
-        var environmentVariables = result.environmentVariables === null ? [ ] : result.environmentVariables.split(',');
-
-        delete result.hostPorts;
-        delete result.environmentVariables;
-
-        for (var i = 0; i < environmentVariables.length; i++) {
-            result.portBindings[environmentVariables[i]] = parseInt(hostPorts[i], 10);
-        }
-
-        result.accessRestriction = JSON.parse(result.accessRestrictionJson);
-        if (result.accessRestriction && !result.accessRestriction.users) result.accessRestriction.users = [];
-        delete result.accessRestrictionJson;
-
-        // TODO remove later once all apps have this attribute
-        result.xFrameOptions = result.xFrameOptions || 'SAMEORIGIN';
-
-        result.sso = !!result.sso; // make it bool
-
-        result.debugMode = JSON.parse(result.debugModeJson);
-        delete result.debugModeJson;
-    } catch (e) {
-        console.error('Failed to get restoreConfig for app.', e);
-        console.error('Falling back to empty values to make the update succeed.');
-        result.manifest = null;
-    }
-}
-
-// from apps.js DO NOT UPDATE WHEN apps.js changes, as this is part of db migration!!
-var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.installationProgress', 'apps.runState',
-    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'apps.location', 'apps.dnsRecordId',
-    'apps.accessRestrictionJson', 'apps.lastBackupId', 'apps.oldConfigJson', 'apps.memoryLimit', 'apps.altDomain',
-    'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson' ].join(',');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE backups ADD COLUMN restoreConfigJson TEXT'),
-        // fill all the backups with restoreConfigs from current apps
-        function addRestoreConfigs(callback) {
-            console.log('Importing restoreConfigs');
-
-            var appQuery = 'SELECT ' + APPS_FIELDS_PREFIXED + ',' +
-                'GROUP_CONCAT(CAST(appPortBindings.hostPort AS CHAR(6))) AS hostPorts, GROUP_CONCAT(appPortBindings.environmentVariable) AS environmentVariables' +
-                ' FROM apps LEFT OUTER JOIN appPortBindings ON apps.id = appPortBindings.appId' +
-                ' GROUP BY apps.id ORDER BY apps.id';
-
-            db.all(appQuery, function (error, apps) {
-                if (error) return callback(error);
-
-                apps.forEach(postProcess);
-
-                async.eachSeries(apps, function (app, next) {
-                    if (app.manifest === null) return next();
-
-                    db.all('SELECT * FROM backups WHERE type="app" AND id LIKE "%app%\\_' + app.id + '\\_%"', function (error, backups) {
-                        if (error) return next(error);
-
-                        // from apps.js:getAppConfig()
-                        var restoreConfig = {
-                            manifest: app.manifest,
-                            location: app.location,
-                            accessRestriction: app.accessRestriction,
-                            portBindings: app.portBindings,
-                            memoryLimit: app.memoryLimit,
-                            xFrameOptions: app.xFrameOptions || 'SAMEORIGIN',
-                            altDomain: app.altDomain
-                        };
-
-                        async.eachSeries(backups, function (backup, next) {
-                            db.runSql('UPDATE backups SET restoreConfigJson=?,creationTime=creationTime WHERE id=?', [ JSON.stringify(restoreConfig), backup.id ], next);
-                        }, next);
-                    });
-                }, callback);
-            });
-        }
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups DROP COLUMN restoreConfigJson', callback);
-};

migrations/20170423032116-settings-set-default-retentionSecs.js

@@ -1,22 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.all('SELECT value FROM settings WHERE name="backup_config"', function (error, results) {
-        if (error || results.length === 0) return callback(error);
-
-        var backupConfig = JSON.parse(results[0].value);
-        if (backupConfig.provider === 'filesystem') {
-            backupConfig.retentionSecs = 2 * 24 * 60 * 60; // 2 days
-        } else if (backupConfig.provider === 's3') { // S3
-            backupConfig.retentionSecs = -1;
-        } else if (backupConfig.provider === 'caas') {
-            backupConfig.retentionSecs = 10 * 24 * 60 * 60; // 10 days
-        }
-        db.runSql('UPDATE settings SET value=? WHERE name="backup_config"', [ JSON.stringify(backupConfig) ], callback);
-
-    });
-};
-
-exports.down = function(db, callback) {
-  callback();
-};

migrations/20170628173051-settings-default-mailrelay.js

@@ -1,9 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('INSERT settings (name, value) VALUES("mail_relay", ?)', [ JSON.stringify({ provider: 'cloudron-smtp' }) ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DELETE * FROM settings WHERE name="mail_relay"', [ ], callback);
-};

migrations/20170714170908-appdb-add-robotsTxt.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN robotsTxt TEXT', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN robotsTxt', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20170731073447-eventlog-alter-data-and-source.js

@@ -1,29 +0,0 @@
-'use strict';
-
-// we used to have JSON as the db type for those two, however mariadb does not support it
-// and we never used any JSON related features, but have the TEXT pattern everywhere
-// This ensures all old cloudrons will have the columns altered
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE eventlog MODIFY data TEXT', [], function (error) {
-        if (error) console.error(error);
-
-        db.runSql('ALTER TABLE eventlog MODIFY source TEXT', [], function (error) {
-            if (error) console.error(error);
-
-            callback(error);
-        });
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE eventlog MODIFY data TEXT', [], function (error) {
-        if (error) console.error(error);
-
-        db.runSql('ALTER TABLE eventlog MODIFY source TEXT', [], function (error) {
-            if (error) console.error(error);
-
-            callback(error);
-        });
-    });
-};

migrations/20170816211111-appdb-add-enableBackup.js.js

@@ -1,16 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN enableBackup BOOLEAN DEFAULT 1', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN enableBackup', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-

migrations/20170911133441-settings-alter-value.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE settings MODIFY value TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE settings MODIFY value VARCHAR(512)', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20170919185109-settings-set-backupConfig-defaults.js

@@ -1,25 +0,0 @@
-'use strict';
-
-// ensure backupFolder and format are not empty
-exports.up = function(db, callback) {
-    db.all('SELECT * FROM settings WHERE name=?', [ 'backup_config' ], function (error, result) {
-        if (error || result.length === 0) return callback(error);
-
-        var value = JSON.parse(result[0].value);
-        value.format = 'tgz'; // set the format
-
-        if (value.provider === 'filesystem' && !value.backupFolder) {
-            value.backupFolder = '/var/backups'; // set the backupFolder
-        }
-
-        db.runSql('UPDATE settings SET value = ? WHERE name = ?', [ JSON.stringify(value), 'backup_config' ], function (error) {
-            if (error) console.error('Error setting ownerid ' + JSON.stringify(u) + error);
-            callback();
-        });
-
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20170928003352-backups-add-format.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE backups ADD COLUMN format VARCHAR(16) DEFAULT "tgz"', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups DROP COLUMN format', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171013003424-apps-add-newConfigJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN newConfigJson TEXT', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN newConfigJson', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171116191443-backups-add-manifestJson.js

@@ -1,40 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE backups ADD COLUMN manifestJson TEXT'),
-
-        db.runSql.bind(db, 'START TRANSACTION;'),
-
-        // fill all the backups with restoreConfigs from current apps
-        function addManifests(callback) {
-            console.log('Importing manifests');
-
-            db.all('SELECT * FROM backups WHERE type="app"', function (error, backups) {
-                if (error) return callback(error);
-
-                async.eachSeries(backups, function (backup, next) {
-                    var m = backup.restoreConfigJson ? JSON.parse(backup.restoreConfigJson) : null;
-                    if (m) m = JSON.stringify(m.manifest);
-
-                    db.runSql('UPDATE backups SET manifestJson=? WHERE id=?', [ m, backup.id ], next);
-                }, callback);
-            });
-        },
-
-        db.runSql.bind(db, 'COMMIT'),
-
-        // remove the restoreConfig
-        db.runSql.bind(db, 'ALTER TABLE backups DROP COLUMN restoreConfigJson')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE backups DROP COLUMN manifestJson'),
-        db.runSql.bind(db, 'ALTER TABLE backups ADD COLUMN restoreConfigJson TEXT'),
-    ], callback);
-};
-

migrations/20171116203507-apps-rename-newConfigJson-to-updateConfigJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE newConfigJson updateConfigJson TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE updateConfigJson newConfigJson TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171116224051-apps-rename-lastBackupId-to-restoreConfigJson.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE lastBackupId restoreConfigJson TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE restoreConfigJson lastBackupId TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171118000000-ensure-collation-utf8_bin.js

@@ -1,31 +0,0 @@
-'use strict';
-
-// WARNING!!
-// At this point the default db collation is utf8mb4_unicode_ci however we already have foreign key constraits
-// already with tables on utf8_bin charset, so we cannot convert all tables here to utf8mb4 collation without
-// a reimport from a sql dump, as foreign keys across different collations are not supported
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE appPortBindings CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE apps CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE authcodes CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE backups CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE clients CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE eventlog CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE groupMembers CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE groups CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE mailboxes CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE migrations CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE settings CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE tokens CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin'),
-        db.runSql.bind(db, 'ALTER TABLE users CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    // nothing to be done here
-    callback();
-};

migrations/20171118000001-apps-add-domain.js

@@ -1,70 +0,0 @@
-'use strict';
-
-var async = require('async'),
-    safe = require('safetydance');
-
-exports.up = function(db, callback) {
-    // first check precondtion of domain entry in settings
-    db.all('SELECT * FROM settings WHERE name = ?', [ 'domain' ], function (error, result) {
-        if (error) return callback(error);
-
-        var domain = {};
-        if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
-
-        async.series([
-            db.runSql.bind(db, 'START TRANSACTION;'),
-            function addAppsDomainColumn(done) {
-                db.runSql('ALTER TABLE apps ADD COLUMN domain VARCHAR(128)', [], done);
-            },
-            function setAppDomain(done) {
-                if (!domain.fqdn) return done(); // skip for new cloudrons without a domain
-                db.runSql('UPDATE apps SET domain = ?', [ domain.fqdn ], done);
-            },
-            function addAppsLocationDomainUniqueConstraint(done) {
-                db.runSql('ALTER TABLE apps ADD UNIQUE location_domain_unique_index (location, domain)', [], done);
-            },
-            function removePresetupAdminGroupIfNew(done) {
-                // do not delete on update, will update the record in setMailboxesDomain()
-                if (domain.fqdn) return done();
-
-                // this will be finally created once we have a domain when we create the owner in user.js
-                const ADMIN_GROUP_ID = 'admin'; // see constants.js
-                db.runSql('DELETE FROM groups WHERE id = ?', [ ADMIN_GROUP_ID ], function (error) {
-                    if (error) return done(error);
-
-                    db.runSql('DELETE FROM mailboxes WHERE ownerId = ?', [ ADMIN_GROUP_ID ], done);
-                });
-            },
-            function addMailboxesDomainColumn(done) {
-                db.runSql('ALTER TABLE mailboxes ADD COLUMN domain VARCHAR(128)', [], done);
-            },
-            function setMailboxesDomain(done) {
-                if (!domain.fqdn) return done(); // skip for new cloudrons without a domain
-                db.runSql('UPDATE mailboxes SET domain = ?', [ domain.fqdn ], done);
-            },
-            function dropAppsLocationUniqueConstraint(done) {
-                db.runSql('ALTER TABLE apps DROP INDEX location', [], done);
-            },
-            db.runSql.bind(db, 'COMMIT')
-        ], callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        function dropMailboxesDomainColumn(done) {
-            db.runSql('ALTER TABLE mailboxes DROP COLUMN domain', [], done);
-        },
-        function dropLocationDomainUniqueConstraint(done) {
-            db.runSql('ALTER TABLE apps DROP INDEX location_domain_unique_index', [], done);
-        },
-        function dropAppsDomainColumn(done) {
-            db.runSql('ALTER TABLE apps DROP COLUMN domain', [], done);
-        },
-        function addAppsLocationUniqueConstraint(done) {
-            db.runSql('ALTER TABLE apps ADD UNIQUE location (location)', [], done);
-        },
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};

migrations/20171118000002-domains-add-table.js

@@ -1,61 +0,0 @@
-'use strict';
-
-var async = require('async'),
-    safe = require('safetydance'),
-    tld = require('tldjs');
-
-exports.up = function(db, callback) {
-    var fqdn, zoneName, configJson;
-
-    async.series([
-        function gatherDomain(done) {
-            db.all('SELECT * FROM settings WHERE name = ?', [ 'domain' ], function (error, result) {
-                if (error) return done(error);
-
-                var domain = {};
-                if (result[0]) domain = safe.JSON.parse(result[0].value) || {};
-
-                fqdn = domain.fqdn || ''; // will be null pre-setup
-                zoneName = domain.zoneName || tld.getDomain(fqdn) || fqdn;
-
-                done();
-            });
-        },
-        function gatherDNSConfig(done) {
-            db.all('SELECT * FROM settings WHERE name = ?', [ 'dns_config' ], function (error, result) {
-                if (error) return done(error);
-
-                configJson = (result[0] && result[0].value) ? result[0].value : JSON.stringify({ provider: 'manual'});
-
-                // caas dns config needs an fqdn
-                var config = JSON.parse(configJson);
-                if (config.provider === 'caas') config.fqdn = fqdn;
-                configJson = JSON.stringify(config);
-
-                done();
-            });
-        },
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        function createDomainsTable(done) {
-            var cmd = `
-                CREATE TABLE domains(
-                domain VARCHAR(128) NOT NULL UNIQUE,
-                zoneName VARCHAR(128) NOT NULL,
-                configJson TEXT,
-                PRIMARY KEY (domain)) CHARACTER SET utf8 COLLATE utf8_bin
-            `;
-
-            db.runSql(cmd, [], done);
-        },
-        function addInitialDomain(done) {
-            if (!fqdn) return done();
-
-            db.runSql('INSERT INTO domains (domain, zoneName, configJson) VALUES (?, ?, ?)', [ fqdn, zoneName, configJson ], done);
-        },
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE domains', callback);
-};

migrations/20171118000003-apps-add-domain-constraint.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD CONSTRAINT apps_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP FOREIGN KEY apps_domain_constraint', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171118000004-mailboxes-add-domain-constraint.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes ADD CONSTRAINT mailboxes_domain_constraint FOREIGN KEY(domain) REFERENCES domains(domain)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes DROP FOREIGN KEY mailboxes_domain_constraint', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171118000005-mailboxes-drop-name-constraint.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes DROP PRIMARY KEY', function (error) {
-      if (error) console.error(error);
-      callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes ADD PRIMARY KEY(name)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171118000006-mailboxes-add-name-domain-constraint.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes ADD UNIQUE mailboxes_name_domain_unique_index (name, domain)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mailboxes DROP INDEX mailboxes_name_domain_unique_index', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171119203452-apps-add-updateTime.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN updateTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN updateTime', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171119204952-apps-rename-createdAt-to-creationTime.js

@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE createdAt creationTime TIMESTAMP(2) NOT NULL', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps CHANGE creationTime createdAt TIMESTAMP(2) NOT NULL', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20171129005712-settings-add-fqdn-to-caas-backup-config.js

@@ -1,28 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-// NOTE: This migration is incorrect because 'caas' domain is not guaranteed to be present in all Caas cloudrons
-exports.up = function(db, callback) {
-    db.all('SELECT * FROM domains', function (error, domains) {
-        if (error) return callback(error);
-
-        var caasDomains = domains.filter(function (d) { return JSON.parse(d.configJson).provider === 'caas'; });
-        if (caasDomains.length === 0) return callback();
-        var caasDomain = caasDomains[0].domain;
-
-        db.all('SELECT * FROM settings WHERE name=?', [ 'backup_config' ], function (error, settings) {
-            if (error) return callback(error);
-
-            var setting = settings[0];
-            var config = JSON.parse(setting.value);
-            config.fqdn = caasDomain;
-
-            db.runSql('UPDATE settings SET value=? WHERE name=?', [ JSON.stringify(config), setting.name ], callback);
-        });
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};

migrations/20171205124434-settings-default-backupConfig.js

@@ -1,23 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    var backupConfig = {
-        "provider": "filesystem",
-        "backupFolder": "/var/backups",
-        "format": "tgz",
-        "retentionSecs": 172800
-    };
-
-    db.runSql('INSERT settings (name, value) VALUES(?, ?)', [ 'backup_config', JSON.stringify(backupConfig) ], function (error) {
-        if (!error || error.code === 'ER_DUP_ENTRY') return callback(); // dup entry is OK for existing cloudrons
-
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DELETE FROM settings WHERE name=?', ['backup_config'], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/20180109225024-domains-add-provider.js

@@ -1,33 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    // first check precondtion of domain entry in settings
-    db.all('SELECT * FROM domains', [ ], function (error, domains) {
-        if (error) return callback(error);
-
-        async.series([
-            db.runSql.bind(db, 'START TRANSACTION;'),
-            db.runSql.bind(db, 'ALTER TABLE domains ADD COLUMN provider VARCHAR(16) DEFAULT ""'),
-            function setProvider(done) {
-                async.eachSeries(domains, function (domain, iteratorCallback) {
-                    var config = JSON.parse(domain.configJson);
-                    var provider = config.provider;
-                    delete config.provider;
-
-                    db.runSql('UPDATE domains SET provider = ?, configJson = ? WHERE domain = ?', [ provider, JSON.stringify(config), domain.domain ], iteratorCallback);
-                }, done);
-            },
-            db.runSql.bind(db, 'ALTER TABLE domains MODIFY provider VARCHAR(16) NOT NULL'),
-            db.runSql.bind(db, 'COMMIT')
-        ], callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE domains DROP COLUMN provider', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};

migrations/initial-schema.sql

@@ -1,67 +0,0 @@
-CREATE TABLE IF NOT EXISTS users(
-    id VARCHAR(128) NOT NULL UNIQUE,
-    username VARCHAR(512) NOT NULL,
-    email VARCHAR(512) NOT NULL,
-    password VARCHAR(1024) NOT NULL,
-    salt VARCHAR(512) NOT NULL,
-    createdAt VARCHAR(512) NOT NULL,
-    modifiedAt VARCHAR(512) NOT NULL,
-    admin INTEGER NOT NULL,
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS tokens(
-    accessToken VARCHAR(128) NOT NULL UNIQUE,
-    userId VARCHAR(128) NOT NULL,
-    clientId VARCHAR(128),
-    scope VARCHAR(512) NOT NULL,
-    expires VARCHAR(512) NOT NULL,
-    PRIMARY KEY(accessToken));
-
-CREATE TABLE IF NOT EXISTS clients(
-    id VARCHAR(128) NOT NULL UNIQUE,
-    appId VARCHAR(128) NOT NULL,
-    clientSecret VARCHAR(512) NOT NULL,
-    redirectURI VARCHAR(512) NOT NULL,
-    scope VARCHAR(512) NOT NULL,
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS apps(
-    id VARCHAR(128) NOT NULL UNIQUE,
-    appStoreId VARCHAR(128) NOT NULL,
-    version VARCHAR(32),
-    installationState VARCHAR(512) NOT NULL,
-    installationProgress VARCHAR(512),
-    runState VARCHAR(512),
-    healthy INTEGER,
-    containerId VARCHAR(128),
-    manifestJson VARCHAR(2048),
-    httpPort INTEGER,
-    location VARCHAR(128) NOT NULL UNIQUE,
-    dnsRecordId VARCHAR(512),
-    accessRestriction VARCHAR(512),
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS appPortBindings(
-    hostPort INTEGER NOT NULL UNIQUE,
-    containerPort VARCHAR(5) NOT NULL,
-    appId VARCHAR(128) NOT NULL,
-    FOREIGN KEY(appId) REFERENCES apps(id),
-    PRIMARY KEY(hostPort));
-
-CREATE TABLE IF NOT EXISTS authcodes(
-    authCode VARCHAR(128) NOT NULL UNIQUE,
-    userId VARCHAR(128) NOT NULL,
-    clientId VARCHAR(128) NOT NULL,
-    PRIMARY KEY(authCode));
-
-CREATE TABLE IF NOT EXISTS settings(
-    name VARCHAR(128) NOT NULL UNIQUE,
-    value VARCHAR(512),
-    PRIMARY KEY(name));
-
-CREATE TABLE IF NOT EXISTS appAddonConfigs(
-    appId VARCHAR(128) NOT NULL,
-    addonId VARCHAR(32) NOT NULL,
-    value VARCHAR(512) NOT NULL,
-    FOREIGN KEY(appId) REFERENCES apps(id));
-

migrations/schema.sql

@@ -1,159 +0,0 @@
-#### WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
-#### This file is not used by any code and is here to document the latest schema
-
-#### General ideas
-#### Default char set is utf8 and DEFAULT COLLATE is utf8_bin. Collate affects comparisons in WHERE and ORDER
-#### Strict mode is enabled
-#### VARCHAR - stored as part of table row (use for strings)
-#### TEXT - stored offline from table row (use for strings)
-#### BLOB - stored offline from table row (use for binary data)
-#### https://dev.mysql.com/doc/refman/5.0/en/storage-requirements.html
-
-# The code uses zero dates. Make sure sql_mode does NOT have NO_ZERO_DATE
-# http://johnemb.blogspot.com/2014/09/adding-or-removing-individual-sql-modes.html
-# SET GLOBAL sql_mode=(SELECT REPLACE(@@sql_mode,'NO_ZERO_DATE',''));
-
-CREATE TABLE IF NOT EXISTS users(
-    id VARCHAR(128) NOT NULL UNIQUE,
-    username VARCHAR(254) UNIQUE,
-    email VARCHAR(254) NOT NULL UNIQUE,
-    password VARCHAR(1024) NOT NULL,
-    salt VARCHAR(512) NOT NULL,
-    createdAt VARCHAR(512) NOT NULL,
-    modifiedAt VARCHAR(512) NOT NULL,
-    admin INTEGER NOT NULL,
-    displayName VARCHAR(512) DEFAULT '',
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS groups(
-    id VARCHAR(128) NOT NULL UNIQUE,
-    name VARCHAR(254) NOT NULL UNIQUE,
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS groupMembers(
-    groupId VARCHAR(128) NOT NULL,
-    userId VARCHAR(128) NOT NULL,
-    FOREIGN KEY(groupId) REFERENCES groups(id),
-    FOREIGN KEY(userId) REFERENCES users(id));
-
-CREATE TABLE IF NOT EXISTS tokens(
-    accessToken VARCHAR(128) NOT NULL UNIQUE,
-    identifier VARCHAR(128) NOT NULL,
-    clientId VARCHAR(128),
-    scope VARCHAR(512) NOT NULL,
-    expires BIGINT NOT NULL, // FIXME: make this a timestamp
-    PRIMARY KEY(accessToken));
-
-CREATE TABLE IF NOT EXISTS clients(
-    id VARCHAR(128) NOT NULL UNIQUE, // prefixed with cid- to identify token easily in auth routes
-    appId VARCHAR(128) NOT NULL,
-    type VARCHAR(16) NOT NULL,
-    clientSecret VARCHAR(512) NOT NULL,
-    redirectURI VARCHAR(512) NOT NULL,
-    scope VARCHAR(512) NOT NULL,
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS apps(
-    id VARCHAR(128) NOT NULL UNIQUE,
-    appStoreId VARCHAR(128) NOT NULL,
-    installationState VARCHAR(512) NOT NULL,
-    installationProgress TEXT,
-    runState VARCHAR(512),
-    health VARCHAR(128),
-    containerId VARCHAR(128),
-    manifestJson TEXT,
-    httpPort INTEGER,                        // this is the nginx proxy port and not manifest.httpPort
-    location VARCHAR(128) NOT NULL,
-    domain VARCHAR(128) NOT NULL,
-    dnsRecordId VARCHAR(512), // tracks any id that we got back to track dns updates
-    accessRestrictionJson TEXT, // { users: [ ], groups: [ ] }
-    createdAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updatedAt TIMESTAMP(2) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    memoryLimit BIGINT DEFAULT 0,
-    altDomain VARCHAR(256),
-    xFrameOptions VARCHAR(512),
-    sso BOOLEAN DEFAULT 1, // whether user chose to enable SSO
-    debugModeJson TEXT, // options for development mode
-    robotsTxt TEXT,
-    enableBackup BOOLEAN DEFAULT 1, // misnomer: controls automatic daily backups
-
-    // the following fields do not belong here, they can be removed when we use a queue for apptask
-    restoreConfigJson VARCHAR(256), // used to pass backupId to restore from to apptask
-    oldConfigJson TEXT, // used to pass old config for apptask (configure, restore)
-    updateConfigJson TEXT, // used to pass new config for apptask (update)
-
-    FOREIGN KEY(domain) REFERENCES domains(domain),
-    PRIMARY KEY(id));
-
-CREATE TABLE IF NOT EXISTS appPortBindings(
-    hostPort INTEGER NOT NULL UNIQUE,
-    environmentVariable VARCHAR(128) NOT NULL,
-    appId VARCHAR(128) NOT NULL,
-    FOREIGN KEY(appId) REFERENCES apps(id),
-    PRIMARY KEY(hostPort));
-
-CREATE TABLE IF NOT EXISTS authcodes(
-    authCode VARCHAR(128) NOT NULL UNIQUE,
-    userId VARCHAR(128) NOT NULL,
-    clientId VARCHAR(128) NOT NULL,
-    expiresAt BIGINT NOT NULL, // ## FIXME: make this a timestamp
-    PRIMARY KEY(authCode));
-
-CREATE TABLE IF NOT EXISTS settings(
-    name VARCHAR(128) NOT NULL UNIQUE,
-    value TEXT,
-    PRIMARY KEY(name));
-
-CREATE TABLE IF NOT EXISTS appAddonConfigs(
-    appId VARCHAR(128) NOT NULL,
-    addonId VARCHAR(32) NOT NULL,
-    name VARCHAR(128) NOT NULL,
-    value VARCHAR(512) NOT NULL,
-    FOREIGN KEY(appId) REFERENCES apps(id));
-
-CREATE TABLE IF NOT EXISTS backups(
-    id VARCHAR(128) NOT NULL,
-    creationTime TIMESTAMP,
-    version VARCHAR(128) NOT NULL, /* app version or box version */
-    type VARCHAR(16) NOT NULL, /* 'box' or 'app' */
-    dependsOn TEXT, /* comma separate list of objects this backup depends on */
-    state VARCHAR(16) NOT NULL,
-    manifestJson TEXT, /* to validate if the app can be installed in this version of box */
-    format VARCHAR(16) DEFAULT "tgz",
-
-    PRIMARY KEY (id));
-
-CREATE TABLE IF NOT EXISTS eventlog(
-    id VARCHAR(128) NOT NULL,
-    action VARCHAR(128) NOT NULL,
-    source TEXT, /* { userId, username, ip }. userId can be null for cron,sysadmin */
-    data TEXT, /* free flowing json based on action */
-    creationTime TIMESTAMP, /* FIXME: precision must be TIMESTAMP(2) */
-
-    PRIMARY KEY (id));
-
-/* Future fields:
-   * accessRestriction - to determine who can access it. So this has foreign keys
-   * quota - per mailbox quota
-*/
-CREATE TABLE IF NOT EXISTS mailboxes(
-    name VARCHAR(128) NOT NULL,
-    ownerId VARCHAR(128) NOT NULL, /* app id or user id or group id */
-    ownerType VARCHAR(16) NOT NULL, /* 'app' or 'user' or 'group' */
-    aliasTarget VARCHAR(128), /* the target name type is an alias */
-    creationTime TIMESTAMP,
-    domain VARCHAR(128),
-
-    FOREIGN KEY(domain) REFERENCES domains(domain),
-    PRIMARY KEY (name));
-
-CREATE TABLE IF NOT EXISTS domains(
-    domain VARCHAR(128) NOT NULL UNIQUE, /* if this needs to be larger, InnoDB has a limit of 767 bytes for PRIMARY KEY values! */
-    zoneName VARCHAR(128) NOT NULL, /* this mostly contains the domain itself again */
-    provider VARCHAR(16) NOT NULL,
-    configJson TEXT, /* JSON containing the dns backend provider config */
-
-    PRIMARY KEY (domain))
-
-    /* the default db collation is utf8mb4_unicode_ci but for the app table domain constraint we have to use the old one */
-    CHARACTER SET utf8 COLLATE utf8_bin;

package.json

@@ -1,111 +1,33 @@
 {
-  "name": "cloudron",
-  "description": "Main code for a cloudron",
+  "name": "dashboard",
   "version": "1.0.0",
-  "private": true,
-  "author": {
-    "name": "Cloudron authors"
+  "description": "[Cloudron](https://cloudron.io) is the best way to run apps on your server.",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
-    "url": "https://git.cloudron.io/cloudron/box.git"
-  },
-  "engines": {
-    "node": ">=4.0.0 <=4.1.1"
+    "url": "ssh://git@git.cloudron.io:6000/cloudron/dashboard.git"
   },
+  "author": "",
+  "license": "SEE LICENSE IN LICENSE",
   "dependencies": {
-    "@google-cloud/dns": "^0.7.0",
-    "@google-cloud/storage": "^1.2.1",
-    "@sindresorhus/df": "^2.1.0",
-    "async": "^2.6.0",
-    "aws-sdk": "^2.151.0",
-    "body-parser": "^1.18.2",
-    "cloudron-manifestformat": "^2.10.0",
-    "connect-ensure-login": "^0.1.1",
-    "connect-lastmile": "^1.0.2",
-    "connect-timeout": "^1.9.0",
-    "cookie-parser": "^1.3.5",
-    "cookie-session": "^1.3.2",
-    "cron": "^1.3.0",
-    "csurf": "^1.6.6",
-    "db-migrate": "^0.10.0-beta.24",
-    "db-migrate-mysql": "^1.1.10",
-    "debug": "^3.1.0",
-    "dockerode": "^2.5.3",
-    "ejs": "^2.5.7",
-    "ejs-cli": "^2.0.0",
-    "express": "^4.16.2",
-    "express-session": "^1.15.6",
-    "hat": "0.0.3",
-    "json": "^9.0.3",
-    "ldapjs": "^1.0.0",
-    "lodash.chunk": "^4.2.0",
-    "mime": "^2.0.3",
-    "moment-timezone": "^0.5.14",
-    "morgan": "^1.9.0",
-    "multiparty": "^4.1.2",
-    "mysql": "^2.15.0",
-    "nodemailer": "^4.4.0",
-    "nodemailer-smtp-transport": "^2.7.4",
-    "oauth2orize": "^1.11.0",
-    "once": "^1.3.2",
-    "parse-links": "^0.1.0",
-    "passport": "^0.4.0",
-    "passport-http": "^0.3.0",
-    "passport-http-bearer": "^1.0.1",
-    "passport-local": "^1.0.0",
-    "passport-oauth2-client-password": "^0.1.2",
-    "password-generator": "^2.2.0",
-    "progress-stream": "^2.0.0",
-    "proxy-middleware": "^0.15.0",
-    "recursive-readdir": "^2.2.1",
-    "request": "^2.83.0",
-    "s3-block-read-stream": "^0.2.0",
-    "safetydance": "^0.7.1",
-    "semver": "^5.4.1",
-    "showdown": "^1.8.2",
-    "split": "^1.0.0",
-    "superagent": "^3.8.1",
-    "supererror": "^0.7.1",
-    "tar-fs": "^1.16.0",
-    "tar-stream": "^1.5.5",
-    "tldjs": "^2.2.0",
-    "underscore": "^1.7.0",
-    "uuid": "^3.1.0",
-    "valid-url": "^1.0.9",
-    "validator": "^9.1.1",
-    "ws": "^3.3.1"
+    "@fortawesome/fontawesome-free": "^5.5.0",
+    "bootstrap-sass": "^3.4.1",
+    "gulp": "^4.0.0",
+    "gulp-autoprefixer": "^5.0.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-cssnano": "^2.1.3",
+    "gulp-ejs": "^3.3.0",
+    "gulp-sass": "^4.0.2",
+    "gulp-serve": "^1.4.0",
+    "gulp-sourcemaps": "^2.6.5",
+    "rimraf": "^2.6.2",
+    "yargs": "^11.0.0"
   },
-  "devDependencies": {
-    "bootstrap-sass": "^3.3.3",
-    "expect.js": "*",
-    "gulp": "^3.9.1",
-    "gulp-autoprefixer": "^4.0.0",
-    "gulp-concat": "^2.4.3",
-    "gulp-cssnano": "^2.1.0",
-    "gulp-ejs": "^3.1.0",
-    "gulp-sass": "^3.1.0",
-    "gulp-serve": "^1.0.0",
-    "gulp-sourcemaps": "^2.6.1",
-    "gulp-uglify": "^3.0.0",
-    "hock": "^1.3.2",
-    "istanbul": "*",
-    "js2xmlparser": "^3.0.0",
-    "mocha": "*",
-    "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
-    "nock": "^9.0.14",
-    "node-sass": "^4.6.1",
-    "readdirp": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
-    "yargs": "^10.0.3"
-  },
-  "scripts": {
-    "migrate_local": "DATABASE_URL=mysql://root:@localhost/box node_modules/.bin/db-migrate up",
-    "migrate_test": "BOX_ENV=test DATABASE_URL=mysql://root:@localhost/boxtest node_modules/.bin/db-migrate up",
-    "test": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- --exit -R spec ./src/test ./src/routes/test/[^a]*",
-    "test_all": "npm run migrate_test && src/test/setupTest && BOX_ENV=test ./node_modules/istanbul/lib/cli.js test $1 ./node_modules/mocha/bin/_mocha -- --exit -R spec ./src/test ./src/routes/test",
-    "postmerge": "/bin/true",
-    "precommit": "/bin/true",
-    "prepush": "npm test",
-    "webadmin": "node_modules/.bin/gulp"
+  "eslintConfig": {
+    "env": {
+      "browser": true
+    }
   }
 }

scripts/cloudron-setup

@@ -1,288 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
-    exit 1
-fi
-
-if [[ $(lsb_release -rs) != "16.04" ]]; then
-    echo "Cloudron requires Ubuntu 16.04" > /dev/stderr
-    exit 1
-fi
-
-# change this to a hash when we make a upgrade release
-readonly LOG_FILE="/var/log/cloudron-setup.log"
-readonly DATA_FILE="/root/cloudron-install-data.json"
-readonly MINIMUM_DISK_SIZE_GB="18" # this is the size of "/" and required to fit in docker images 18 is a safe bet for different reporting on 20GB min
-readonly MINIMUM_MEMORY="974"      # this is mostly reported for 1GB main memory (DO 992, EC2 990, Linode 989, Serverdiscounter.com 974)
-
-readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400"
-
-# copied from cloudron-resize-fs.sh
-readonly rootfs_type=$(LC_ALL=C df --output=fstype / | tail -n1)
-readonly physical_memory=$(LC_ALL=C free -m | awk '/Mem:/ { print $2 }')
-readonly disk_size_bytes=$(LC_ALL=C df --output=size / | tail -n1)
-readonly disk_size_gb=$((${disk_size_bytes}/1024/1024))
-
-# verify the system has minimum requirements met
-if [[ "${rootfs_type}" != "ext4" ]]; then
-    echo "Error: Cloudron requires '/' to be ext4" # see #364
-    exit 1
-fi
-
-if [[ "${physical_memory}" -lt "${MINIMUM_MEMORY}" ]]; then
-    echo "Error: Cloudron requires atleast 1GB physical memory"
-    exit 1
-fi
-
-if [[ "${disk_size_gb}" -lt "${MINIMUM_DISK_SIZE_GB}" ]]; then
-    echo "Error: Cloudron requires atleast 20GB disk space (Disk space on / is ${disk_size_gb}GB)"
-    exit 1
-fi
-
-initBaseImage="true"
-# provisioning data
-domain=""
-adminLocation="my"
-zoneName=""
-provider=""
-tlsProvider="le-prod"
-requestedVersion=""
-apiServerOrigin="https://api.cloudron.io"
-webServerOrigin="https://cloudron.io"
-dataJson=""
-prerelease="false"
-sourceTarballUrl=""
-rebootServer="true"
-baseDataDir=""
-
-# these are here for pre-1.9 compat
-encryptionKey=""
-restoreUrl=""
-
-args=$(getopt -o "" -l "domain:,help,skip-baseimage-init,data:,data-dir:,provider:,encryption-key:,restore-url:,tls-provider:,version:,dns-provider:,env:,admin-location:,prerelease,skip-reboot,source-url:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-while true; do
-    case "$1" in
-    --domain) domain="$2"; shift 2;;
-    --admin-location) adminLocation="$2"; shift 2;;
-    --help) echo "See https://cloudron.io/documentation/installation/ on how to install Cloudron"; exit 0;;
-    --provider) provider="$2"; shift 2;;
-    --encryption-key) encryptionKey="$2"; shift 2;;
-    --restore-url) restoreUrl="$2"; shift 2;;
-    --tls-provider) tlsProvider="$2"; shift 2;;
-    --version) requestedVersion="$2"; shift 2;;
-    --env)
-        if [[ "$2" == "dev" ]]; then
-            apiServerOrigin="https://api.dev.cloudron.io"
-            webServerOrigin="https://dev.cloudron.io"
-            tlsProvider="le-staging"
-            prerelease="true"
-        elif [[ "$2" == "staging" ]]; then
-            apiServerOrigin="https://api.staging.cloudron.io"
-            webServerOrigin="https://staging.cloudron.io"
-            tlsProvider="le-staging"
-            prerelease="true"
-        fi
-        shift 2;;
-    --skip-baseimage-init) initBaseImage="false"; shift;;
-    --skip-reboot) rebootServer="false"; shift;;
-    --data) dataJson="$2"; shift 2;;
-    --prerelease) prerelease="true"; shift;;
-    --source-url) sourceTarballUrl="$2"; version="0.0.1+custom"; shift 2;;
-    --data-dir) baseDataDir=$(realpath "$2"); shift 2;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-# validate arguments in the absence of data
-if [[ -z "${dataJson}" ]]; then
-    if [[ -z "${provider}" ]]; then
-        echo "--provider is required (azure, cloudscale.ch, digitalocean, ec2, exoscale, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic)"
-        exit 1
-    elif [[  \
-                "${provider}" != "ami" && \
-                "${provider}" != "azure" && \
-                "${provider}" != "cloudscale.ch" && \
-                "${provider}" != "digitalocean" && \
-                "${provider}" != "ec2" && \
-                "${provider}" != "exoscale" && \
-                "${provider}" != "gce" && \
-                "${provider}" != "lightsail" && \
-                "${provider}" != "linode" && \
-                "${provider}" != "ovh" && \
-                "${provider}" != "rosehosting" && \
-                "${provider}" != "scaleway" && \
-                "${provider}" != "vultr" && \
-                "${provider}" != "generic" \
-            ]]; then
-        echo "--provider must be one of: azure, cloudscale.ch, digitalocean, ec2, exoscale, gce, lightsail, linode, ovh, rosehosting, scaleway, vultr or generic"
-        exit 1
-    fi
-
-    if [[ "${tlsProvider}" != "fallback" && "${tlsProvider}" != "le-prod" && "${tlsProvider}" != "le-staging" ]]; then
-        echo "--tls-provider must be one of: le-prod, le-staging, fallback"
-        exit 1
-    fi
-
-    if [[ -n "${baseDataDir}" && ! -d "${baseDataDir}" ]]; then
-        echo "${baseDataDir} does not exist"
-        exit 1
-    fi
-fi
-
-echo ""
-echo "##############################################"
-echo "         Cloudron Setup (${requestedVersion:-latest})"
-echo "##############################################"
-echo ""
-echo " Follow setup logs in a second terminal with:"
-echo " $ tail -f ${LOG_FILE}"
-echo ""
-echo " Join us at https://chat.cloudron.io for any questions."
-echo ""
-
-if [[ "${initBaseImage}" == "true" ]]; then
-    echo "=> Updating apt and installing script dependencies"
-    if ! apt-get update &>> "${LOG_FILE}"; then
-        echo "Could not update package repositories"
-        exit 1
-    fi
-
-    if ! apt-get install curl python3 ubuntu-standard -y &>> "${LOG_FILE}"; then
-        echo "Could not install setup dependencies (curl)"
-        exit 1
-    fi
-fi
-
-echo "=> Checking version"
-if [[ "${sourceTarballUrl}" == "" ]]; then
-    if ! releaseJson=$($curl -s "${apiServerOrigin}/api/v1/releases?prerelease=${prerelease}&boxVersion=${requestedVersion}"); then
-        echo "Failed to get release information"
-        exit 1
-    fi
-
-    if [[ "$requestedVersion" == "" ]]; then
-        version=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["version"])')
-    else
-        version="${requestedVersion}"
-    fi
-
-    if ! sourceTarballUrl=$(echo "${releaseJson}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["info"]["sourceTarballUrl"])'); then
-        echo "No source code for version '${requestedVersion:-latest}'"
-        exit 1
-    fi
-fi
-
-# Build data
-# tlsConfig, dnsConfig, backupConfig are here for backward compat with < 1.9
-# from 1.9, we use autoprovision.json
-if [[ -z "${dataJson}" ]]; then
-    if [[ -z "${restoreUrl}" ]]; then
-        data=$(cat <<EOF
-    {
-        "fqdn": "${domain}",
-        "adminLocation": "${adminLocation}",
-        "adminFqdn": "${adminLocation}.${domain}",
-        "zoneName": "${zoneName}",
-        "provider": "${provider}",
-        "apiServerOrigin": "${apiServerOrigin}",
-        "webServerOrigin": "${webServerOrigin}",
-        "version": "${version}",
-        "tlsConfig": {
-            "provider": "${tlsProvider}"
-        },
-        "backupConfig" : {
-            "provider": "filesystem",
-            "backupFolder": "/var/backups",
-            "key": "${encryptionKey}",
-            "format": "tgz",
-            "retentionSecs": 172800
-        }
-    }
-EOF
-    )
-    else
-        data=$(cat <<EOF
-    {
-        "fqdn": "${domain}",
-        "adminLocation": "${adminLocation}",
-        "adminFqdn": "${adminLocation}.${domain}",
-        "zoneName": "${zoneName}",
-        "provider": "${provider}",
-        "apiServerOrigin": "${apiServerOrigin}",
-        "webServerOrigin": "${webServerOrigin}",
-        "restore": {
-            "url": "${restoreUrl}",
-            "key": "${encryptionKey}"
-        },
-        "version": "${version}"
-    }
-EOF
-    )
-    fi
-else
-    data="${dataJson}"
-fi
-
-echo "=> Downloading version ${version} ..."
-box_src_tmp_dir=$(mktemp -dt box-src-XXXXXX)
-
-if ! $curl -sL "${sourceTarballUrl}" | tar -zxf - -C "${box_src_tmp_dir}"; then
-    echo "Could not download source tarball. See ${LOG_FILE} for details"
-    exit 1
-fi
-
-if [[ "${initBaseImage}" == "true" ]]; then
-    echo -n "=> Installing base dependencies and downloading docker images (this takes some time) ..."
-    if ! /bin/bash "${box_src_tmp_dir}/baseimage/initializeBaseUbuntuImage.sh" "${provider}" "../src" &>> "${LOG_FILE}"; then
-        echo "Init script failed. See ${LOG_FILE} for details"
-        exit 1
-    fi
-    echo ""
-fi
-
-echo "=> Installing version ${version} (this takes some time) ..."
-echo "${data}" > "${DATA_FILE}"
-if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" --data-dir "${baseDataDir}" &>> "${LOG_FILE}"; then
-    echo "Failed to install cloudron. See ${LOG_FILE} for details"
-    exit 1
-fi
-rm "${DATA_FILE}"
-
-echo -n "=> Waiting for cloudron to be ready (this takes some time) ..."
-while true; do
-    echo -n "."
-    if status=$($curl -q -f "http://localhost:3000/api/v1/cloudron/status" 2>/dev/null); then
-        [[ -z "$domain" ]] && break # with no domain, we are up and running
-        [[ "$status" == *"\"tls\": true"* ]] && break # with a domain, wait for the cert
-    fi
-    sleep 10
-done
-
-autoprovision_data=$(cat <<EOF
-{
-    "tlsConfig": {
-        "provider": "${tlsProvider}"
-    }
-}
-EOF
-)
-
-echo "${autoprovision_data}" > /home/yellowtent/configs/autoprovision.json
-
-if [[ -n "${domain}" ]]; then
-    echo -e "\n\nVisit https://my.${domain} to finish setup once the server has rebooted.\n"
-else
-    echo -e "\n\nVisit https://<IP> to finish setup once the server has rebooted.\n"
-fi
-
-if [[ "${rebootServer}" == "true" ]]; then
-    echo -e "\n\nRebooting this server now to let bootloader changes take effect.\n"
-    systemctl stop mysql # sometimes mysql ends up having corrupt privilege tables
-    systemctl reboot
-fi

scripts/createReleaseTarball

@@ -1,86 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-# Only GNU getopt supports long options. OS X comes bundled with the BSD getopt
-# brew install gnu-getopt to get the GNU getopt on OS X
-[[ $(uname -s) == "Darwin" ]] && GNU_GETOPT="/usr/local/opt/gnu-getopt/bin/getopt" || GNU_GETOPT="getopt"
-readonly GNU_GETOPT
-
-args=$(${GNU_GETOPT} -o "" -l "revision:,output:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-readonly SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-
-commitish="HEAD"
-bundle_file=""
-
-while true; do
-    case "$1" in
-    --revision) commitish="$2"; shift 2;;
-    --output) bundle_file="$2"; shift 2;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-readonly TMPDIR=${TMPDIR:-/tmp} # why is this not set on mint?
-
-if ! $(cd "${SOURCE_DIR}" && git diff --exit-code >/dev/null); then
-    echo "You have local changes, stash or commit them to proceed"
-    exit 1
-fi
-
-if [[ "$(node --version)" != "v8.9.3" ]]; then
-    echo "This script requires node 8.9.3"
-    exit 1
-fi
-
-version=$(cd "${SOURCE_DIR}" && git rev-parse "${commitish}")
-bundle_dir=$(mktemp -d -t box 2>/dev/null || mktemp -d box-XXXXXXXXXX --tmpdir=$TMPDIR)
-[[ -z "$bundle_file" ]] && bundle_file="${TMPDIR}/box-${version}.tar.gz"
-
-chmod "o+rx,g+rx" "${bundle_dir}" # otherwise extracted tarball director won't be readable by others/group
-echo "Checking out code [${version}] into ${bundle_dir}"
-(cd "${SOURCE_DIR}" && git archive --format=tar ${version} | (cd "${bundle_dir}" && tar xf -))
-
-if diff "${TMPDIR}/boxtarball.cache/package-lock.json.all" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then
-    echo "Reusing dev modules from cache"
-    cp -r "${TMPDIR}/boxtarball.cache/node_modules-all/." "${bundle_dir}/node_modules"
-else
-    echo "Installing modules with dev dependencies"
-    (cd "${bundle_dir}" && npm install)
-
-    echo "Caching dev dependencies"
-    mkdir -p "${TMPDIR}/boxtarball.cache/node_modules-all"
-    rsync -a --delete "${bundle_dir}/node_modules/" "${TMPDIR}/boxtarball.cache/node_modules-all/"
-    cp "${bundle_dir}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.all"
-fi
-
-echo "Building webadmin assets"
-(cd "${bundle_dir}" && ./node_modules/.bin/gulp)
-
-echo "Remove intermediate files required at build-time only"
-rm -rf "${bundle_dir}/node_modules/"
-rm -rf "${bundle_dir}/webadmin/src"
-rm -rf "${bundle_dir}/gulpfile.js"
-
-if diff "${TMPDIR}/boxtarball.cache/package-lock.json.prod" "${bundle_dir}/package-lock.json" >/dev/null 2>&1; then
-    echo "Reusing prod modules from cache"
-    cp -r "${TMPDIR}/boxtarball.cache/node_modules-prod/." "${bundle_dir}/node_modules"
-else
-    echo "Installing modules for production"
-    (cd "${bundle_dir}" && npm install --production --no-optional)
-
-    echo "Caching prod dependencies"
-    mkdir -p "${TMPDIR}/boxtarball.cache/node_modules-prod"
-    rsync -a --delete "${bundle_dir}/node_modules/" "${TMPDIR}/boxtarball.cache/node_modules-prod/"
-    cp "${bundle_dir}/package-lock.json" "${TMPDIR}/boxtarball.cache/package-lock.json.prod"
-fi
-
-echo "Create final tarball"
-(cd "${bundle_dir}" && tar czf "${bundle_file}" .)
-echo "Cleaning up ${bundle_dir}"
-rm -rf "${bundle_dir}"
-
-echo "Tarball saved at ${bundle_file}"

scripts/installer.sh

@@ -1,118 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root." > /dev/stderr
-    exit 1
-fi
-
-readonly USER=yellowtent
-readonly BOX_SRC_DIR=/home/${USER}/box
-readonly BASE_DATA_DIR=/home/${USER}
-readonly CLOUDRON_CONF=/home/yellowtent/configs/cloudron.conf
-
-readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400"
-readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly box_src_tmp_dir="$(realpath ${script_dir}/..)"
-
-readonly is_update=$([[ -f "${CLOUDRON_CONF}" ]] && echo "yes" || echo "no")
-
-arg_data=""
-arg_data_dir=""
-
-args=$(getopt -o "" -l "data:,data-file:,data-dir:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-while true; do
-    case "$1" in
-    --data) arg_data="$2"; shift 2;;
-    --data-file) arg_data=$(cat $2); shift 2;;
-    --data-dir) arg_data_dir="$2"; shift 2;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-echo "==> installer: updating docker"
-if [[ $(docker version --format {{.Client.Version}}) != "17.09.0-ce" ]]; then
-    $curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.09.0~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
-
-    # https://download.docker.com/linux/ubuntu/dists/xenial/stable/binary-amd64/Packages
-    if [[ $(sha256sum /tmp/docker.deb | cut -d' ' -f1) != "d33f6eb134f0ab0876148bd96de95ea47d583d7f2cddfdc6757979453f9bd9bf" ]]; then
-        echo "docker binary download is corrupt"
-        exit 5
-    fi
-
-    echo "Waiting for all dpkg tasks to finish..."
-    while fuser /var/lib/dpkg/lock; do
-        sleep 1
-    done
-
-    while ! dpkg --force-confold --configure -a; do
-        echo "Failed to fix packages. Retry"
-        sleep 1
-    done
-
-    while ! apt install -y /tmp/docker.deb; do
-        echo "Failed to install docker. Retry"
-        sleep 1
-    done
-
-    rm /tmp/docker.deb
-fi
-
-echo "==> installer: updating node"
-if [[ "$(node --version)" != "v8.9.3" ]]; then
-    mkdir -p /usr/local/node-8.9.3
-    $curl -sL https://nodejs.org/dist/v8.9.3/node-v8.9.3-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.9.3
-    ln -sf /usr/local/node-8.9.3/bin/node /usr/bin/node
-    ln -sf /usr/local/node-8.9.3/bin/npm /usr/bin/npm
-    rm -rf /usr/local/node-6.11.5
-fi
-
-for try in `seq 1 10`; do
-    # for reasons unknown, the dtrace package will fail. but rebuilding second time will work
-
-    # We need --unsafe-perm as we run as root and the folder is owned by root,
-    # however by default npm drops privileges for npm rebuild
-    # https://docs.npmjs.com/misc/config#unsafe-perm
-    if cd "${box_src_tmp_dir}" && npm rebuild --unsafe-perm; then break; fi
-    echo "Failed to rebuild, trying again"
-    sleep 5
-done
-
-if [[ ${try} -eq 10 ]]; then
-    echo "npm rebuild failed"
-    exit 4
-fi
-
-if ! id "${USER}" 2>/dev/null; then
-    useradd "${USER}" -m
-fi
-
-if [[ "${is_update}" == "yes" ]]; then
-    echo "Setting up update splash screen"
-    "${box_src_tmp_dir}/setup/splashpage.sh" --data "${arg_data}" || true # show splash from new code
-    ${BOX_SRC_DIR}/setup/stop.sh # stop the old code
-fi
-
-# setup links to data directory
-if [[ -n "${arg_data_dir}" ]]; then
-    echo "==> installer: setting up links to data directory"
-    mkdir "${arg_data_dir}/appsdata"
-    ln -s "${arg_data_dir}/appsdata" "${BASE_DATA_DIR}/appsdata"
-    mkdir "${arg_data_dir}/platformdata"
-    ln -s "${arg_data_dir}/platformdata" "${BASE_DATA_DIR}/platformdata"
-fi
-
-# ensure we are not inside the source directory, which we will remove now
-cd /root
-
-echo "==> installer: switching the box code"
-rm -rf "${BOX_SRC_DIR}"
-mv "${box_src_tmp_dir}" "${BOX_SRC_DIR}"
-chown -R "${USER}:${USER}" "${BOX_SRC_DIR}"
-
-echo "==> installer: calling box setup script"
-"${BOX_SRC_DIR}/setup/start.sh" --data "${arg_data}"

setup/argparser.sh

@@ -1,81 +0,0 @@
-#!/bin/bash
-
-source_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-json="${source_dir}/../node_modules/.bin/json"
-
-# IMPORTANT: Fix cloudron.js:doUpdate if you add/remove any arg. keep these sorted for readability
-arg_api_server_origin=""
-arg_fqdn=""
-arg_admin_location=""
-arg_admin_fqdn=""
-arg_zone_name=""
-arg_is_custom_domain="false" # can be removed after 1.9
-arg_retire_reason=""
-arg_retire_info=""
-arg_token=""
-arg_version=""
-arg_web_server_origin=""
-arg_provider=""
-arg_is_demo="false"
-
-args=$(getopt -o "" -l "data:,retire-reason:,retire-info:" -n "$0" -- "$@")
-eval set -- "${args}"
-
-while true; do
-    case "$1" in
-    --retire-reason)
-        arg_retire_reason="$2"
-        shift 2
-        ;;
-    --retire-info)
-        arg_retire_info="$2"
-        shift 2
-        ;;
-    --data)
-        # these params must be valid in all cases
-        arg_fqdn=$(echo "$2" | $json fqdn)
-        arg_admin_fqdn=$(echo "$2" | $json adminFqdn)
-        arg_zone_name=$(echo "$2" | $json zoneName)
-        [[ "${arg_zone_name}" == "" ]] && arg_zone_name="${arg_fqdn}"
-
-        # can be removed after 1.9
-        arg_is_custom_domain=$(echo "$2" | $json isCustomDomain)
-        [[ "${arg_is_custom_domain}" == "" ]] && arg_is_custom_domain="true"
-
-        arg_admin_location=$(echo "$2" | $json adminLocation)
-        [[ "${arg_admin_location}" == "" ]] && arg_admin_location="my"
-
-        # only update/restore have this valid (but not migrate)
-        arg_api_server_origin=$(echo "$2" | $json apiServerOrigin)
-        [[ "${arg_api_server_origin}" == "" ]] && arg_api_server_origin="https://api.cloudron.io"
-        arg_web_server_origin=$(echo "$2" | $json webServerOrigin)
-        [[ "${arg_web_server_origin}" == "" ]] && arg_web_server_origin="https://cloudron.io"
-
-        # TODO check if and where this is used
-        arg_version=$(echo "$2" | $json version)
-
-        # read possibly empty parameters here
-        arg_is_demo=$(echo "$2" | $json isDemo)
-        [[ "${arg_is_demo}" == "" ]] && arg_is_demo="false"
-
-        arg_token=$(echo "$2" | $json token)
-
-        arg_provider=$(echo "$2" | $json provider)
-        [[ "${arg_provider}" == "" ]] && arg_provider="generic"
-
-        shift 2
-        ;;
-    --) break;;
-    *) echo "Unknown option $1"; exit 1;;
-    esac
-done
-
-echo "Parsed arguments:"
-echo "api server: ${arg_api_server_origin}"
-echo "fqdn: ${arg_fqdn}"
-echo "custom domain: ${arg_is_custom_domain}"
-# do not dump these as they might become available via logs API
-#echo "token: ${arg_token}"
-echo "version: ${arg_version}"
-echo "web server: ${arg_web_server_origin}"
-echo "provider: ${arg_provider}"

setup/splashpage.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -eu -o pipefail
-
-readonly SETUP_WEBSITE_DIR="/home/yellowtent/setup/website"
-
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly box_src_dir="$(realpath ${script_dir}/..)"
-readonly PLATFORM_DATA_DIR="/home/yellowtent/platformdata"
-
-echo "Setting up nginx update page"
-
-if [[ ! -f "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf" ]]; then
-    echo "No admin.conf found. This Cloudron has no domain yet. Skip splash setup"
-    exit
-fi
-
-source "${script_dir}/argparser.sh" "$@" # this injects the arg_* variables used below
-
-# keep this is sync with config.js appFqdn()
-admin_origin="https://${arg_admin_fqdn}"
-
-# copy the website
-rm -rf "${SETUP_WEBSITE_DIR}" && mkdir -p "${SETUP_WEBSITE_DIR}"
-cp -r "${script_dir}/splash/website/"* "${SETUP_WEBSITE_DIR}"
-
-# create nginx config
-readonly current_infra=$(node -e "console.log(require('${script_dir}/../src/infra_version.js').version);")
-existing_infra="none"
-[[ -f "${PLATFORM_DATA_DIR}/INFRA_VERSION" ]] && existing_infra=$(node -e "console.log(JSON.parse(require('fs').readFileSync('${PLATFORM_DATA_DIR}/INFRA_VERSION', 'utf8')).version);")
-if [[ "${arg_retire_reason}" != "" || "${existing_infra}" != "${current_infra}" ]]; then
-    echo "Showing progress bar on all subdomains in retired mode or infra update. retire: ${arg_retire_reason} existing: ${existing_infra} current: ${current_infra}"
-    rm -f ${PLATFORM_DATA_DIR}/nginx/applications/*
-    ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"~^(.+)\$\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
-else
-    echo "Show progress bar only on admin domain for normal update"
-    ${box_src_dir}/node_modules/.bin/ejs-cli -f "${script_dir}/start/nginx/appconfig.ejs" \
-        -O "{ \"vhost\": \"${arg_admin_fqdn}\", \"adminOrigin\": \"${admin_origin}\", \"endpoint\": \"splash\", \"sourceDir\": \"${SETUP_WEBSITE_DIR}\", \"certFilePath\": \"cert/host.cert\", \"keyFilePath\": \"cert/host.key\", \"xFrameOptions\": \"SAMEORIGIN\", \"robotsTxtQuoted\": null, \"hasIPv6\": false }" > "${PLATFORM_DATA_DIR}/nginx/applications/admin.conf"
-fi
-
-if [[ "${arg_retire_reason}" == "migrate" ]]; then
-    echo "{ \"migrate\": { \"percent\": \"10\", \"message\": \"Migrating cloudron. This could take up to 15 minutes.\", \"info\": ${arg_retire_info} }, \"backup\": null, \"apiServerOrigin\": \"${arg_api_server_origin}\" }" > "${SETUP_WEBSITE_DIR}/progress.json"
-else
-    echo '{ "update": { "percent": "10", "message": "Updating cloudron software" }, "backup": null }' > "${SETUP_WEBSITE_DIR}/progress.json"
-fi
-
-nginx -s reload