3.4.3 changes

track last oom time using a global variable
because it was a local variable, we were just sending out oom mails like crazy also, fixes an issue that if docker.getEvents gets stuck because docker does not respond then we do not do any health monitoring. i guess this can happen if the docker API gets stuck. (cherry picked from commit a536e9fc4b)
2018-12-16 21:07:53 -08:00 · 2018-12-16 21:07:14 -08:00 · 2018-12-16 18:44:46 -08:00 · 2018-12-15 09:28:18 -08:00 · 2018-12-14 17:35:54 -08:00
218 changed files with 12806 additions and 11448 deletions
@@ -1,11 +1,11 @@
 {
    "env": {
-        "node": true,
-        "es6": true
+        "es6": true,
+        "node": true
    },
    "extends": "eslint:recommended",
    "parserOptions": {
-        "ecmaVersion": 8
+        "ecmaVersion": 2017
    },
    "rules": {
        "indent": [
@@ -26,4 +26,4 @@
        ],
        "no-console": "off"
    }
-}
+}
@@ -1505,129 +1505,3 @@
 * Automatic updates can be toggled per app
 * Fix issue where OOM mails are sent out without a rate limit

-[3.5.0]
-* Add UI to switch dashboard domain
-* Fix remote support button to not remove misparsed ssh keys
-* cloudflare: preseve domain proxying status
-* Fix issue where oom killer might kill the box code or the updater
-* Add contabo and netcup as supported providers
-* Allow full logs to be downloaded
-* Update Haraka to 2.8.22
-* Log events in the mail container
-* Fix issue where SpamAssassin and SPF checks were run for outbound email
-* Improve various eventlog messages
-* Track dyndns change events
-* Add new S3 regions - Paris/Stockholm/Osaka
-* Retry errored downloads during restore
-* Add user pagination UI
-* Add namecheap as supported DNS provider
-
-[3.5.1]
-* Add dashboard domain change event
-* Fix issue where notification email were sent from incorrect domain
-* Alert about configuration issues in the notification UI
-* Switching dashboard domain now updates MX, SPF records
-* Mailbox and lists UI is now always visible (but disabled) when incoming email is disabled
-* Fix issue where long passwords were not accepted
-* DNS and backup credential secrets are not returned in API calls anymore
-* Send notification when an app that went down, came back up
-
-[3.5.2]
-* Fix encoding of links in plain text email
-* Hide mail relay password
-* Do not return API tokens in REST API
-
-[3.5.3]
-* Make reboot required check server side
-* Update node to 10.15.1
-* Enable gzip compression for large objects
-* Update docker to 18.09
-* Add a way to lock specific settings
-* Add UI to copy app's backup id
-* Block platform updates based on app manifest constraints
-* Make crash logs viewable via the dashboard
-* Fix issue where uploading of filenames with brackets and plus was not working
-* Add notification for cert renewal and backup failures
-* Fix issue where mail container was not updated with the latest certificate
-
-[3.5.4]
-* Make reboot required check server side
-* Update node to 10.15.1
-* Enable gzip compression for large objects
-* Update docker to 18.09
-* Add a way to lock specific settings
-* Add UI to copy app's backup id
-* Block platform updates based on app manifest constraints
-* Make crash logs viewable via the dashboard
-* Fix issue where uploading of filenames with brackets and plus was not working
-* Add notification for cert renewal and backup failures
-* Fix issue where mail container was not updated with the latest certificate
-
-[4.0.0]
-* (mail) Bump mail_max_userip_connections to 50
-* Fix issue where DKIM was not setup correctly during a restore
-* (mysql) Remove any stale lock file on restart
-* Add a way to disable outbound mail for a domain
-* Cleanup task logs
-* Fix issue where dashboard location might conflict with existing app location
-* Ad graphite to services
-* Add labels and tags to apps
-* Ensure MySQL is storing data/time in UTC
-* Fix bug where the UI redirects to login screen when enabling 2FA with invalid token
-* Use unbound resolver when resolving NS record of a domain
-* Various fixes for notifications
-* Add FTP support for apps
-* Add app version as part of info dialog
-* (backup) Do not abort archive if file(s) disappear
-* Show app upstream version in the info dialog
-* Add Scaleway ObjectStorage backup backend
-* Preserve update backups for 3 weeks
-* Make send test mail functionality work with secondary domain
-* Add support for an external email relay that does not require authentication
-* Add option to accept self-signed certs when using external mail relay
-* Allow publishing and listing community supported apps
-* Remove spaces support
-* Features implementation for customization
-
-[4.0.1]
-* Make it easier to import email
-* Give SFTP access only to admins
-
-[4.0.2]
-* Fix GCDNS crash
-* Add option to update without backing up
-
-[4.0.3]
-* Fix dashboard issue for non-admins
-
-[4.1.0]
-* Remove password requirement for uninstalling apps and users
-* Hosting provider edition
-* Enforce limits in mail container
-* Fix crash when using unauthenticated relay
-* Fix domain and tag filtering
-* Customizable app icons
-* Remove obsolete X-Frame-Options from nginx configs
-* Give SFTP access based on access restriction
-
-[4.1.1]
-* Add UI hint about SFTP access restriction
-
-[4.1.2]
-* Accept incoming mail from a private relay
-* Fix issue where unused addon images were not pruned
-* Add UI for redirect from multiple domains
-* Allow apps to be relocated to custom data directory
-* Make all cloudron env vars have CLOUDRON_ prefix
-* Update manifest version to 2
-* Fix issue where DKIM keys were inaccessible
-* Fix DKIM selector conflict when adding same domain across multiple cloudrons
-* Fix name.com DNS backend issue for naked domains
-* Add DigitalOcean Frankfurt (fra1) region for backup storage
-
-[4.1.3]
-* Update manifest format package
-
-[4.1.4]
-* Add CLOUDRON_ prefix to MySQL addon variables
-
@@ -1,35 +1,661 @@
-The Cloudron Subscription license
-Copyright (c) 2019 Cloudron UG
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

-With regard to the Cloudron Software:
+ 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.

-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.
+                            Preamble

-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.
+  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.

-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.
+  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,2018 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/>.
@@ -37,11 +37,16 @@ anyone to effortlessly host web applications on their server on their own terms.

 ## Demo

-Try our demo at https://my.demo.cloudron.io (username: cloudron password: cloudron).
+Try our demo at https://my-demo.cloudron.me (username: cloudron password: cloudron).

 ## Installing

-[Install script](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
+You can install the Cloudron platform on your own server or get a managed server
+from cloudron.io. In either case, the Cloudron platform will keep your server and
+apps up-to-date and secure.
+
+* [Selfhosting](https://cloudron.io/documentation/installation/) - [Pricing](https://cloudron.io/pricing.html)
+* [Managed Hosting](https://cloudron.io/managed.html)

 **Note:** This repo is a small part of what gets installed on your server - there is
 the dashboard, database addons, graph container, base image etc. Cloudron also relies
@@ -59,7 +64,6 @@ the containers in the Cloudron.

 ## Community

-* [Chat](https://chat.cloudron.io)
 * [Forum](https://forum.cloudron.io/)
 * [Support](mailto:support@cloudron.io)

@@ -0,0 +1,179 @@
+#!/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."
@@ -27,17 +27,13 @@ debconf-set-selections <<< 'mysql-server mysql-server/root_password_again passwo

 # this enables automatic security upgrades (https://help.ubuntu.com/community/AutomaticSecurityUpdates)
 # resolvconf is needed for unbound to work property after disabling systemd-resolved in 18.04
-ubuntu_version=$(lsb_release -rs)
-ubuntu_codename=$(lsb_release -cs)
-gpg_package=$([[ "${ubuntu_version}" == "16.04" ]] && echo "gnupg" || echo "gpg")
 apt-get -y install \
    acl \
+    awscli \
    build-essential \
    cron \
    curl \
-    debconf-utils \
    dmsetup \
-    $gpg_package \
    iptables \
    libpython2.7 \
    logrotate \
@@ -46,41 +42,35 @@ apt-get -y install \
    openssh-server \
    pwgen \
    resolvconf \
+    sudo \
    swaks \
-    tzdata \
    unattended-upgrades \
    unbound \
    xfsprogs

-# on some providers like scaleway the sudo file is changed and we want to keep the old one
-apt-get -o Dpkg::Options::="--force-confold" install -y sudo
-
 # 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-10.15.1
-curl -sL https://nodejs.org/dist/v10.15.1/node-v10.15.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-10.15.1
-ln -sf /usr/local/node-10.15.1/bin/node /usr/bin/node
-ln -sf /usr/local/node-10.15.1/bin/npm /usr/bin/npm
+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. if you channge options here, be sure to fixup installer.sh as well
+# 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

-# there are 3 packages for docker - containerd, CLI and the daemon
-curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/containerd.io_1.2.2-3_amd64.deb" -o /tmp/containerd.deb
-curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/docker-ce-cli_18.09.2~3-0~ubuntu-${ubuntu_codename}_amd64.deb" -o /tmp/docker-ce-cli.deb
-curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/docker-ce_18.09.2~3-0~ubuntu-${ubuntu_codename}_amd64.deb" -o /tmp/docker.deb
+curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.03.1~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb
 # apt install with install deps (as opposed to dpkg -i)
-apt install -y /tmp/containerd.deb  /tmp/docker-ce-cli.deb /tmp/docker.deb
-rm /tmp/containerd.deb /tmp/docker-ce-cli.deb /tmp/docker.deb
+apt install -y /tmp/docker.deb
+rm /tmp/docker.deb

 storage_driver=$(docker info | grep "Storage Driver" | sed 's/.*: //')
 if [[ "${storage_driver}" != "overlay2" ]]; then
@@ -118,7 +108,6 @@ fi
 echo "==> Configuring host"
 sed -e 's/^#NTP=/NTP=0.ubuntu.pool.ntp.org 1.ubuntu.pool.ntp.org 2.ubuntu.pool.ntp.org 3.ubuntu.pool.ntp.org/' -i /etc/systemd/timesyncd.conf
 timedatectl set-ntp 1
-# mysql follows the system timezone
 timedatectl set-timezone UTC

 # Disable bind for good measure (on online.net, kimsufi servers these are pre-installed and conflicts with unbound)
@@ -137,9 +126,3 @@ systemctl disable postfix || true
 systemctl stop systemd-resolved || true
 systemctl disable systemd-resolved || true

-# ubuntu's default config for unbound does not work if ipv6 is disabled. this config is overwritten in start.sh
-# we need unbound to work as this is required for installer.sh to do any DNS requests
-ip6=$([[ -s /proc/net/if_inet6 ]] && echo "yes" || echo "no")
-echo -e "server:\n\tinterface: 127.0.0.1\n\tdo-ip6: ${ip6}" > /etc/unbound/unbound.conf.d/cloudron-network.conf
-systemctl restart unbound
-
@@ -4,24 +4,19 @@

 var database = require('./src/database.js');

-var crashNotifier = require('./src/crashnotifier.js');
+var sendFailureLogs = require('./src/logcollector').sendFailureLogs;

-// This is triggered by systemd with the crashed unit name as argument
 function main() {
-    if (process.argv.length !== 3) return console.error('Usage: crashnotifier.js <unitName>');
+    if (process.argv.length !== 3) return console.error('Usage: crashnotifier.js <processName>');

-    var unitName = process.argv[2];
-    console.log('Started crash notifier for', unitName);
+    var processName = process.argv[2];
+    console.log('Started crash notifier for', processName);

-    // eventlog api needs the db
+    // mailer needs the db
    database.initialize(function (error) {
        if (error) return console.error('Cannot connect to database. Unable to send crash log.', error);

-        crashNotifier.sendFailureLogs(unitName, function (error) {
-            if (error) console.error(error);
-
-            process.exit();
-        });
+        sendFailureLogs(processName, { unit: processName });
    });
 }

@@ -1,27 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    var cmd = 'CREATE TABLE notifications(' +
-        'id int NOT NULL AUTO_INCREMENT,' +
-        'userId VARCHAR(128) NOT NULL,' +
-        'eventId VARCHAR(128) NOT NULL,' +
-        'title VARCHAR(512) NOT NULL,' +
-        'message TEXT,' +
-        'action VARCHAR(512) NOT NULL,' +
-        'acknowledged BOOLEAN DEFAULT false,' +
-        'creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,' +
-        'FOREIGN KEY(eventId) REFERENCES eventlog(id),' +
-        'PRIMARY KEY (id)) CHARACTER SET utf8 COLLATE utf8_bin';
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('DROP TABLE notifications', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,16 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE tasks CHANGE result resultJson TEXT', [], function (error) {
-        if (error) console.error(error);
-
-        db.runSql('DELETE FROM tasks', callback); // empty tasks table since we have bad results format
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE tasks CHANGE resultJson result TEXT', [], function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN dataDir VARCHAR(256) UNIQUE', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN dataDir', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,17 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE domains ADD COLUMN locked BOOLEAN DEFAULT 0', function (error) {
-        if (error) return callback(error);
-
-        callback();
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE domains DROP COLUMN locked', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
@@ -1,22 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        // WARNING in the future always give constraints proper names to not rely on automatic ones
-        db.runSql.bind(db, 'ALTER TABLE notifications DROP FOREIGN KEY notifications_ibfk_1'),
-        db.runSql.bind(db, 'ALTER TABLE notifications MODIFY eventId VARCHAR(128)'),
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-        db.runSql.bind(db, 'ALTER TABLE notifications MODIFY eventId VARCHAR(128) NOT NULL'),
-        db.runSql.bind(db, 'ALTER TABLE notifications ADD FOREIGN KEY(eventId) REFERENCES eventlog(id)'),
-        db.runSql.bind(db, 'COMMIT')
-    ], callback);
-};
@@ -1,23 +0,0 @@
-'use strict';
-
-let async = require('async');
-
-exports.up = function(db, callback) {
-    db.runSql('SELECT * FROM domains', function (error, domains) {
-        if (error) return callback(error);
-
-        async.eachSeries(domains, function (domain, iteratorCallback) {
-            if (domain.provider !== 'namecheap') return iteratorCallback();
-
-            let config = JSON.parse(domain.configJson);
-            config.token = config.apiKey;
-            delete config.apiKey;
-
-            db.runSql('UPDATE domains SET configJson = ? WHERE domain = ?', [ JSON.stringify(config), domain.domain ], iteratorCallback);
-        }, callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};
@@ -1,17 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    var cmd = 'ALTER TABLE apps ADD COLUMN healthTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP';
-
-    db.runSql(cmd, function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN healthTime', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,18 +0,0 @@
-'use strict';
-
-let async = require('async');
-
-exports.up = function(db, callback) {
-    db.runSql('SELECT * FROM tokens WHERE clientId=?', ['cid-sdk'], function (error, tokens) {
-        if (error) console.error(error);
-
-        async.eachSeries(tokens, function (token, iteratorDone) {
-            if (token.name) return iteratorDone();
-            db.runSql('UPDATE tokens SET name=? WHERE accessToken=?', [ 'Unnamed-' + token.accessToken.slice(0,8), token.accessToken ], iteratorDone);
-        }, callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};
@@ -1,29 +0,0 @@
-'use strict';
-
-var async = require('async');
-var uuid = require('uuid');
-
-exports.up = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'START TRANSACTION;'),
-
-        db.runSql.bind(db, 'ALTER TABLE tokens ADD COLUMN id VARCHAR(128)'),
-
-        function (done) {
-            db.runSql('SELECT * FROM tokens', function (error, tokens) {
-                async.eachSeries(tokens, function (token, iteratorDone) {
-                    db.runSql('UPDATE tokens SET id=? WHERE accessToken=?', [ 'tid-'+uuid.v4(), token.accessToken ], iteratorDone);
-                }, done);
-            });
-        },
-
-        db.runSql.bind(db, 'ALTER TABLE tokens MODIFY id VARCHAR(128) NOT NULL UNIQUE'),
-        db.runSql.bind(db, 'COMMIT'),
-    ], callback);
-};
-
-exports.down = function(db, callback) {
-    async.series([
-        db.runSql.bind(db, 'ALTER TABLE tokens DROP COLUMN id'),
-    ], callback);
-};
@@ -1,17 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE settings ADD COLUMN locked BOOLEAN DEFAULT 0', function (error) {
-        if (error) return callback(error);
-
-        callback();
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE settings DROP COLUMN locked', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
@@ -1,14 +0,0 @@
-'use strict';
-
-var async = require('async');
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE notifications DROP COLUMN action', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE notifications ADD COLUMN action VARCHAR(512) NOT NULL', callback);
-};
@@ -1,27 +0,0 @@
-'use strict';
-
-var async = require('async'),
-    crypto = require('crypto'),
-    fs = require('fs'),
-    os = require('os'),
-    path = require('path'),
-    safe = require('safetydance'),
-    tldjs = require('tldjs');
-
-exports.up = function(db, callback) {
-    db.all('SELECT * FROM apps, subdomains WHERE apps.id=subdomains.appId AND type="primary"', function (error, apps) {
-        if (error) return callback(error);
-
-        async.eachSeries(apps, function (app, iteratorDone) {
-            if (app.mailboxName) return iteratorDone();
-
-            const mailboxName = (app.subdomain ? app.subdomain : JSON.parse(app.manifestJson).title.toLowerCase().replace(/[^a-zA-Z0-9]/g, '')) + '.app';
-
-            db.runSql('UPDATE apps SET mailboxName=? WHERE id=?', [ mailboxName, app.id ], iteratorDone);
-        }, callback);
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};
@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN label VARCHAR(128)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN label', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE apps ADD COLUMN tagsJson VARCHAR(2048)', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE apps DROP COLUMN tagsJson ', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE backups ADD COLUMN preserveSecs INTEGER DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE backups DROP COLUMN preserveSecs', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,19 +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 !== 'caas') return callback();
-
-        backupConfig.boxId = backupConfig.prefix; // hack to set the boxId that happens to match the prefix
-        delete backupConfig.fqdn;
-
-        db.runSql('UPDATE settings SET value=? WHERE name="backup_config"', [ JSON.stringify(backupConfig) ], callback);
-    });
-};
-
-exports.down = function(db, callback) {
-  callback();
-};
@@ -1,51 +0,0 @@
-'use strict';
-
-var async = require('async'),
-    fs = require('fs'),
-    superagent = require('superagent');
-
-exports.up = function(db, callback) {
-    if (!fs.existsSync('/etc/cloudron/cloudron.conf')) {
-        console.log('Unable to locate cloudron.conf');
-        return callback();
-    }
-
-    const config = JSON.parse(fs.readFileSync('/etc/cloudron/cloudron.conf', 'utf8'));
-
-    db.all('SELECT * FROM settings WHERE name="appstore_config"', function (error, results) {
-        if (error) return callback(error);
-
-        if (results.length === 0) {
-            console.log('No appstore config, skipping license migration');
-            return callback();
-        }
-
-        console.log('Downloading license');
-
-        const appstoreConfig = JSON.parse(results[0].value);
-
-        superagent.get(`${config.apiServerOrigin}/api/v1/cloudron_license`)
-            .query({ accessToken: appstoreConfig.token, cloudronId: appstoreConfig.cloudronId, provider: config.provider })
-            .timeout(30 * 1000).end(function (error, result) {
-                if (error && !error.response) return callback(new Error('Network error getting license:' + error.message));
-                if (result.statusCode !== 200) return callback(new Error(`Bad status getting license: ${result.status} ${result.text}`));
-
-                if (!result.body.cloudronId || !result.body.licenseKey || !result.body.cloudronToken) return callback(new Error(`Bad response getting license:  ${result.text}`));
-
-                console.log('Adding license', result.body);
-
-                async.series([
-                    db.runSql.bind(db, 'START TRANSACTION;'),
-                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'cloudron_id', result.body.cloudronId ]),
-                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'license_key', result.body.licenseKey ]),
-                    db.runSql.bind(db, 'INSERT settings (name, value) VALUES(?, ?)', [ 'cloudron_token', result.body.cloudronToken ]),
-                    db.runSql.bind(db, 'DELETE FROM settings WHERE name=?', [ 'appstore_config' ]),
-                    db.runSql.bind(db, 'COMMIT')
-                ], callback);
-            });
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};
@@ -1,13 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('UPDATE tokens SET expires=? WHERE clientId=?', [ 1557089270832, 'cid-webadmin' ], function (error) { // force webadmin to get a new token
-        if (error) console.error(error);
-
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    callback();
-};
@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE settings DROP COLUMN locked', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE settings ADD COLUMN locked BOOLEAN DEFAULT 0', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -1,15 +0,0 @@
-'use strict';
-
-exports.up = function(db, callback) {
-    db.runSql('ALTER TABLE mail ADD COLUMN dkimSelector VARCHAR(128) NOT NULL DEFAULT "cloudron"', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
-
-exports.down = function(db, callback) {
-    db.runSql('ALTER TABLE mail DROP COLUMN dkimSelector', function (error) {
-        if (error) console.error(error);
-        callback(error);
-    });
-};
@@ -8,7 +8,6 @@
 #### 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
-#### Times are stored in the database in UTC. And precision is seconds

 # 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
@@ -42,10 +41,9 @@ CREATE TABLE IF NOT EXISTS groupMembers(
    FOREIGN KEY(userId) REFERENCES users(id));

 CREATE TABLE IF NOT EXISTS tokens(
-    id VARCHAR(128) NOT NULL UNIQUE,
    name VARCHAR(64) DEFAULT "", // description
    accessToken VARCHAR(128) NOT NULL UNIQUE,
-    identifier VARCHAR(128) NOT NULL, // resourceId: app id or user id
+    identifier VARCHAR(128) NOT NULL,
    clientId VARCHAR(128),
    scope VARCHAR(512) NOT NULL,
    expires BIGINT NOT NULL, // FIXME: make this a timestamp
@@ -67,7 +65,6 @@ CREATE TABLE IF NOT EXISTS apps(
    installationProgress TEXT,
    runState VARCHAR(512),
    health VARCHAR(128),
-    healthTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, // when the app last responded
    containerId VARCHAR(128),
    manifestJson TEXT,
    httpPort INTEGER,                        // this is the nginx proxy port and not manifest.httpPort
@@ -84,9 +81,7 @@ CREATE TABLE IF NOT EXISTS apps(
    robotsTxt TEXT,
    enableBackup BOOLEAN DEFAULT 1, // misnomer: controls automatic daily backups
    enableAutomaticUpdate BOOLEAN DEFAULT 1,
-    mailboxName VARCHAR(128), // mailbox of this app. default allocated as '.app'
-    label VARCHAR(128),     // display name
-    tagsJson VARCHAR(2048), // array of tags
+    mailboxName VARCHAR(128), // mailbox of this app

    // 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
@@ -140,7 +135,6 @@ CREATE TABLE IF NOT EXISTS backups(
    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",
-    preserveSecs INTEGER DEFAULT 0,

    PRIMARY KEY (id));

@@ -159,7 +153,6 @@ CREATE TABLE IF NOT EXISTS domains(
    provider VARCHAR(16) NOT NULL,
    configJson TEXT, /* JSON containing the dns backend provider config */
    tlsConfigJson TEXT, /* JSON containing the tls provider config */
-    locked BOOLEAN,

    PRIMARY KEY (domain))

@@ -174,8 +167,6 @@ CREATE TABLE IF NOT EXISTS mail(
    catchAllJson TEXT,
    relayJson TEXT,

-    dkimSelector VARCHAR(128) NOT NULL DEFAULT "cloudron",
-
    FOREIGN KEY(domain) REFERENCES domains(domain),
    PRIMARY KEY(domain))

@@ -221,16 +212,5 @@ CREATE TABLE IF NOT EXISTS tasks(
    ts TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
    PRIMARY KEY (id));

-CREATE TABLE IF NOT EXISTS notifications(
-    id int NOT NULL AUTO_INCREMENT,
-    userId VARCHAR(128) NOT NULL,
-    eventId VARCHAR(128), // reference to eventlog. can be null
-    title VARCHAR(512) NOT NULL,
-    message TEXT,
-    acknowledged BOOLEAN DEFAULT false,
-    creationTime TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    CHARACTER SET utf8 COLLATE utf8_bin;

-    PRIMARY KEY (id)
-);
-
-CHARACTER SET utf8 COLLATE utf8_bin;
@@ -14,43 +14,41 @@
    "node": ">=4.0.0 <=4.1.1"
  },
  "dependencies": {
-    "@google-cloud/dns": "^1.1.0",
-    "@google-cloud/storage": "^2.5.0",
-    "@sindresorhus/df": "^3.1.0",
-    "async": "^2.6.2",
-    "aws-sdk": "^2.476.0",
-    "body-parser": "^1.19.0",
-    "cloudron-manifestformat": "^2.15.0",
-    "connect": "^3.7.0",
+    "@google-cloud/dns": "^0.7.2",
+    "@google-cloud/storage": "^1.7.0",
+    "@sindresorhus/df": "^2.1.0",
+    "async": "^2.6.1",
+    "aws-sdk": "^2.253.1",
+    "body-parser": "^1.18.3",
+    "cloudron-manifestformat": "^2.14.2",
+    "connect": "^3.6.6",
    "connect-ensure-login": "^0.1.1",
    "connect-lastmile": "^1.0.2",
    "connect-timeout": "^1.9.0",
-    "cookie-parser": "^1.4.4",
-    "cookie-session": "^1.3.3",
-    "cron": "^1.7.1",
-    "csurf": "^1.10.0",
-    "db-migrate": "^0.11.6",
+    "cookie-parser": "^1.3.5",
+    "cookie-session": "^1.3.2",
+    "cron": "^1.5.1",
+    "csurf": "^1.6.6",
+    "db-migrate": "^0.11.1",
    "db-migrate-mysql": "^1.1.10",
-    "debug": "^4.1.1",
-    "dockerode": "^2.5.8",
+    "debug": "^3.1.0",
+    "dockerode": "^2.5.5",
    "ejs": "^2.6.1",
    "ejs-cli": "^2.0.1",
-    "express": "^4.17.1",
-    "express-session": "^1.16.2",
-    "js-yaml": "^3.13.1",
-    "json": "^9.0.6",
+    "express": "^4.16.3",
+    "express-session": "^1.15.6",
+    "json": "^9.0.3",
    "ldapjs": "^1.0.2",
-    "lodash": "^4.17.11",
    "lodash.chunk": "^4.2.0",
-    "mime": "^2.4.4",
-    "moment-timezone": "^0.5.25",
-    "morgan": "^1.9.1",
-    "multiparty": "^4.2.1",
-    "mysql": "^2.17.1",
-    "nodemailer": "^6.2.1",
+    "mime": "^2.3.1",
+    "moment-timezone": "^0.5.17",
+    "morgan": "^1.9.0",
+    "multiparty": "^4.1.4",
+    "mysql": "^2.15.0",
+    "nodemailer": "^4.6.5",
    "nodemailer-smtp-transport": "^2.7.4",
    "oauth2orize": "^1.11.0",
-    "once": "^1.4.0",
+    "once": "^1.3.2",
    "parse-links": "^0.1.0",
    "passport": "^0.4.0",
    "passport-http": "^0.3.0",
@@ -59,40 +57,42 @@
    "passport-oauth2-client-password": "^0.1.2",
    "progress-stream": "^2.0.0",
    "proxy-middleware": "^0.15.0",
-    "qrcode": "^1.3.3",
-    "readdirp": "^3.0.2",
-    "request": "^2.88.0",
-    "rimraf": "^2.6.3",
+    "qrcode": "^1.2.0",
+    "readdirp": "^2.1.0",
+    "request": "^2.87.0",
+    "rimraf": "^2.6.2",
    "s3-block-read-stream": "^0.5.0",
    "safetydance": "^0.7.1",
-    "semver": "^6.1.1",
-    "showdown": "^1.9.0",
+    "semver": "^5.5.0",
+    "showdown": "^1.8.6",
    "speakeasy": "^2.0.0",
-    "split": "^1.0.1",
-    "superagent": "^5.0.9",
+    "split": "^1.0.0",
+    "superagent": "^3.8.3",
    "supererror": "^0.7.2",
-    "tar-fs": "github:cloudron-io/tar-fs#ignore_stat_error",
-    "tar-stream": "^2.1.0",
+    "tar-fs": "^1.16.2",
+    "tar-stream": "^1.6.1",
    "tldjs": "^2.3.1",
    "underscore": "^1.9.1",
-    "uuid": "^3.3.2",
+    "uuid": "^3.2.1",
    "valid-url": "^1.0.9",
-    "validator": "^11.0.0",
-    "ws": "^7.0.0",
-    "xml2js": "^0.4.19"
+    "validator": "^10.3.0",
+    "ws": "^5.2.0"
  },
  "devDependencies": {
    "expect.js": "*",
-    "hock": "^1.3.3",
-    "js2xmlparser": "^4.0.0",
-    "mocha": "^6.1.4",
+    "hock": "^1.3.2",
+    "istanbul": "*",
+    "js2xmlparser": "^3.0.0",
+    "mocha": "^5.2.0",
    "mock-aws-s3": "git+https://github.com/cloudron-io/mock-aws-s3.git",
-    "nock": "^10.0.6",
-    "node-sass": "^4.12.0",
+    "nock": "^9.0.14",
+    "node-sass": "^4.6.1",
    "recursive-readdir": "^2.2.2"
  },
  "scripts": {
-    "test": "./runTests",
+    "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 -- --no-timeouts --exit -R spec ./src/test ./src/routes/test",
    "postmerge": "/bin/true",
    "precommit": "/bin/true",
    "prepush": "npm test",
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-readonly SOURCE_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly DATA_DIR="${HOME}/.cloudron_test"
-readonly DEFAULT_TESTS="./src/test/*-test.js ./src/routes/test/*-test.js"
-
-! "${SOURCE_dir}/src/test/checkInstall" && exit 1
-
-# cleanup old data dirs some of those docker container data requires sudo to be removed
-echo "=> Provide root password to purge any leftover data in ${DATA_DIR} and load apparmor profile:"
-sudo rm -rf ${DATA_DIR}
-
-# archlinux does not have apparmor
-if hash apparmor_parser 2>/dev/null; then
-    echo "=> Loading app armor profile"
-    sudo apparmor_parser --replace --write-cache ./setup/start/docker-cloudron-app.apparmor
-fi
-
-# create dir structure
-mkdir -p ${DATA_DIR}
-cd ${DATA_DIR}
-mkdir -p appsdata
-mkdir -p boxdata/appicons boxdata/mail boxdata/certs boxdata/mail/dkim/localhost boxdata/mail/dkim/foobar.com
-mkdir -p platformdata/addons/mail platformdata/nginx/cert platformdata/nginx/applications platformdata/collectd/collectd.conf.d platformdata/addons platformdata/logrotate.d platformdata/backup platformdata/logs/tasks
-
-# put cert
-echo "=> Generating a localhost selfsigned cert"
-openssl req -x509 -newkey rsa:2048 -keyout platformdata/nginx/cert/host.key -out platformdata/nginx/cert/host.cert -days 3650 -subj '/CN=localhost' -nodes -config <(cat /etc/ssl/openssl.cnf <(printf "\n[SAN]\nsubjectAltName=DNS:*.localhost"))
-
-# clear out any containers
-echo "=> Delete all docker containers first"
-docker ps -qa | xargs --no-run-if-empty docker rm -f
-
-# create docker network (while the infra code does this, most tests skip infra setup)
-docker network create --subnet=172.18.0.0/16 cloudron || true
-
-# create the same mysql server version to test with
-OUT=`docker inspect mysql-server` || true
-if [[ "${OUT}" = "[]" ]]; then
-    echo "=> Starting mysql-server..."
-    docker run --name mysql-server -e MYSQL_ROOT_PASSWORD=password -d mysql:5.7
-else
-    echo "=> mysql-server already running. If you want to start fresh, run 'docker rm --force mysql-server'"
-fi
-
-export MYSQL_IP=`docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' mysql-server`
-
-echo "=> Waiting for mysql server to be ready..."
-while ! mysqladmin ping -h"${MYSQL_IP}" --silent; do
-    sleep 1
-done
-
-echo "=> Starting cloudron-syslog"
-cloudron-syslog --logdir "${DATA_DIR}/platformdata/logs/" &
-
-echo "=> Ensure database"
-mysql -h"${MYSQL_IP}" -uroot -ppassword -e 'CREATE DATABASE IF NOT EXISTS box'
-
-echo "=> Run database migrations"
-cd "${SOURCE_dir}"
-BOX_ENV=test DATABASE_URL=mysql://root:password@${MYSQL_IP}/box node_modules/.bin/db-migrate up
-
-echo "=> Run tests with mocha"
-TESTS=${DEFAULT_TESTS}
-if [[ $# -gt 0 ]]; then
-    TESTS="$*"
-fi
-
-BOX_ENV=test ./node_modules/mocha/bin/_mocha --bail --no-timeouts --exit -R spec ${TESTS}
@@ -0,0 +1,106 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max-time 2400 --http1.1"
+
+ip=""
+dns_config=""
+tls_cert_file=""
+tls_key_file=""
+license_file=""
+backup_config=""
+
+args=$(getopt -o "" -l "ip:,backup-config:,license:,dns-config:,tls-cert:,tls-key:" -n "$0" -- "$@")
+eval set -- "${args}"
+
+while true; do
+    case "$1" in
+    --ip) ip="$2"; shift 2;;
+    --dns-config) dns_config="$2"; shift 2;;
+    --tls-cert) tls_cert_file="$2"; shift 2;;
+    --tls-key) tls_key_file="$2"; shift 2;;
+    --license) license_file="$2"; shift 2;;
+    --backup-config) backup_config="$2"; shift 2;;
+    --) break;;
+    *) echo "Unknown option $1"; exit 1;;
+    esac
+done
+
+# validate arguments in the absence of data
+if [[ -z "${ip}" ]]; then
+    echo "--ip is required"
+    exit 1
+fi
+
+if [[ -z "${dns_config}" ]]; then
+    echo "--dns-config is required"
+    exit 1
+fi
+
+if [[ ! -f "${license_file}" ]]; then
+    echo "--license must be a valid license file"
+    exit 1
+fi
+
+function get_status() {
+    key="$1"
+    if status=$($curl -q -f -k "https://${ip}/api/v1/cloudron/status" 2>/dev/null); then
+        currentValue=$(echo "${status}" | python3 -c 'import sys, json; print(json.dumps(json.load(sys.stdin)[sys.argv[1]]))' "${key}")
+        echo "${currentValue}"
+        return 0
+    fi
+
+    return 1
+}
+
+function wait_for_status() {
+    key="$1"
+    expectedValue="$2"
+
+    echo "wait_for_status: $key to be $expectedValue"
+    while true; do
+        if currentValue=$(get_status "${key}"); then
+            echo "wait_for_status: $key is current: $currentValue expecting: $expectedValue"
+            if [[ "${currentValue}" == $expectedValue ]]; then
+                break
+            fi
+        fi
+        sleep 3
+    done
+}
+
+echo "=> Waiting for cloudron to be ready"
+wait_for_status "version" '*'
+
+domain=$(echo "${dns_config}" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["domain"])')
+
+echo "Provisioning Cloudron ${domain}"
+if [[ -n "${tls_cert_file}" && -n "${tls_key_file}" ]]; then
+    tls_cert=$(cat "${tls_cert_file}" | awk '{printf "%s\\n", $0}')
+    tls_key=$(cat "${tls_key_file}" | awk '{printf "%s\\n", $0}')
+    fallback_cert=$(printf '{ "cert": "%s", "key": "%s", "provider": "fallback", "restricted": true }' "${tls_cert}" "${tls_key}")
+else
+    fallback_cert=None
+fi
+
+tls_config='{ "provider": "fallback" }'
+dns_config=$(echo "${dns_config}" | python3 -c "import json,sys;obj=json.load(sys.stdin);obj.update(tlsConfig=${tls_config});obj.update(fallbackCertficate=${fallback_cert});print(json.dumps(obj))")
+
+license=$(cat "${license_file}")
+
+if [[ -z "${backup_config:-}" ]]; then
+    backup_config='{ "provider": "filesystem", "backupFolder": "/var/backups", "format": "tgz" }'
+fi
+
+setupData=$(printf '{ "dnsConfig": %s, "autoconf": { "appstoreConfig": %s, "backupConfig": %s } }' "${dns_config}" "${license}" "${backup_config}")
+
+if ! setupResult=$($curl -kq -X POST -H "Content-Type: application/json" -d "${setupData}" https://${ip}/api/v1/cloudron/setup); then
+    echo "Failed to setup with ${setupData} ${setupResult}"
+    exit 1
+fi
+
+wait_for_status "webadminStatus" '*"tls": true*'
+
+echo "Cloudron is ready at https://my-${domain}"
+
@@ -43,20 +43,22 @@ fi
 initBaseImage="true"
 # provisioning data
 provider=""
+edition=""
 requestedVersion=""
 apiServerOrigin="https://api.cloudron.io"
 webServerOrigin="https://cloudron.io"
 sourceTarballUrl=""
 rebootServer="true"
-license=""
+baseDataDir=""

-args=$(getopt -o "" -l "help,skip-baseimage-init,provider:,version:,env:,skip-reboot,license:" -n "$0" -- "$@")
+args=$(getopt -o "" -l "help,skip-baseimage-init,provider:,version:,env:,edition:,skip-reboot" -n "$0" -- "$@")
 eval set -- "${args}"

 while true; do
    case "$1" in
    --help) echo "See https://cloudron.io/documentation/installation/ on how to install Cloudron"; exit 0;;
    --provider) provider="$2"; shift 2;;
+    --edition) edition="$2"; shift 2;;
    --version) requestedVersion="$2"; shift 2;;
    --env)
        if [[ "$2" == "dev" ]]; then
@@ -67,7 +69,6 @@ while true; do
            webServerOrigin="https://staging.cloudron.io"
        fi
        shift 2;;
-    --license) license="$2"; shift 2;;
    --skip-baseimage-init) initBaseImage="false"; shift;;
    --skip-reboot) rebootServer="false"; shift;;
    --) break;;
@@ -93,16 +94,14 @@ echo "Running cloudron-setup with args : $@" > "${LOG_FILE}"

 # validate arguments in the absence of data
 if [[ -z "${provider}" ]]; then
-    echo "--provider is required (azure, contabo, digitalocean, ec2, exoscale, galaxygate, gce, hetzner, lightsail, linode, netcup, ovh, rosehosting, scaleway, upcloud, vultr or generic)"
+    echo "--provider is required (azure, digitalocean, ec2, exoscale, gce, hetzner, lightsail, linode, netcup, ovh, rosehosting, scaleway, vultr or generic)"
    exit 1
 elif [[  \
            "${provider}" != "ami" && \
            "${provider}" != "azure" && \
            "${provider}" != "caas" && \
            "${provider}" != "cloudscale" && \
-            "${provider}" != "contabo" && \
            "${provider}" != "digitalocean" && \
-            "${provider}" != "digitalocean-mp" && \
            "${provider}" != "ec2" && \
            "${provider}" != "exoscale" && \
            "${provider}" != "galaxygate" && \
@@ -111,18 +110,19 @@ elif [[  \
            "${provider}" != "hetzner" && \
            "${provider}" != "lightsail" && \
            "${provider}" != "linode" && \
-            "${provider}" != "linode-stackscript" && \
            "${provider}" != "netcup" && \
-            "${provider}" != "netcup-image" && \
            "${provider}" != "ovh" && \
            "${provider}" != "rosehosting" && \
            "${provider}" != "scaleway" && \
-            "${provider}" != "upcloud" && \
-            "${provider}" != "upcloud-image" && \
            "${provider}" != "vultr" && \
            "${provider}" != "generic" \
        ]]; then
-    echo "--provider must be one of: azure, cloudscale.ch, contabo, digitalocean, ec2, exoscale, galaxygate, gce, hetzner, lightsail, linode, netcup, ovh, rosehosting, scaleway, upcloud, vultr or generic"
+    echo "--provider must be one of: azure, cloudscale.ch, digitalocean, ec2, exoscale, galaxygate, gce, hetzner, lightsail, linode, netcup, ovh, rosehosting, scaleway, vultr or generic"
+    exit 1
+fi
+
+if [[ -n "${baseDataDir}" && ! -d "${baseDataDir}" ]]; then
+    echo "${baseDataDir} does not exist"
    exit 1
 fi

@@ -138,12 +138,6 @@ echo " Join us at https://forum.cloudron.io for any questions."
 echo ""

 if [[ "${initBaseImage}" == "true" ]]; then
-    echo "=> Installing software-properties-common"
-    if ! apt-get install -y software-properties-common &>> "${LOG_FILE}"; then
-        echo "Could not install software-properties-common (for add-apt-repository below). See ${LOG_FILE}"
-        exit 1
-    fi
-
    echo "=> Ensure required apt sources"
    if ! add-apt-repository universe &>> "${LOG_FILE}"; then
        echo "Could not add required apt sources (for nginx-full). See ${LOG_FILE}"
@@ -198,20 +192,41 @@ fi

 # NOTE: this install script only supports 3.x and above
 echo "=> Installing version ${version} (this takes some time) ..."
-mkdir -p /etc/cloudron
-cat > "/etc/cloudron/cloudron.conf" <<CONF_END
+if [[ "${version}" =~ 3\.[0-2]+\.[0-9]+ ]]; then
+    readonly DATA_FILE="/root/cloudron-install-data.json"
+    data=$(cat <<EOF
+{
+    "provider": "${provider}",
+    "edition": "${edition}",
+    "apiServerOrigin": "${apiServerOrigin}",
+    "webServerOrigin": "${webServerOrigin}",
+    "version": "${version}"
+}
+EOF
+)
+    echo "${data}" > "${DATA_FILE}"
+
+    if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" --data-file "${DATA_FILE}" &>> "${LOG_FILE}"; then
+        echo "Failed to install cloudron. See ${LOG_FILE} for details"
+        exit 1
+    fi
+
+    rm "${DATA_FILE}"
+else
+    mkdir -p /etc/cloudron
+    cat > "/etc/cloudron/cloudron.conf" <<CONF_END
 {
    "apiServerOrigin": "${apiServerOrigin}",
    "webServerOrigin": "${webServerOrigin}",
-    "provider": "${provider}"
+    "provider": "${provider}",
+    "edition": "${edition}"
 }
 CONF_END

-[[ -n "${license}" ]] && echo -n "$license" > /etc/cloudron/LICENSE
-
-if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" &>> "${LOG_FILE}"; then
-    echo "Failed to install cloudron. See ${LOG_FILE} for details"
-    exit 1
+    if ! /bin/bash "${box_src_tmp_dir}/scripts/installer.sh" &>> "${LOG_FILE}"; then
+        echo "Failed to install cloudron. See ${LOG_FILE} for details"
+        exit 1
+    fi
 fi

 echo -n "=> Waiting for cloudron to be ready (this takes some time) ..."
@@ -228,7 +243,7 @@ echo -e "\n\n${GREEN}Visit https://<IP> and accept the self-signed certificate t
 if [[ "${rebootServer}" == "true" ]]; then
    systemctl stop box mysql # sometimes mysql ends up having corrupt privilege tables

-    read -p "The server has to be rebooted to apply all the settings. Reboot now ? [Y/n] " yn
+    read -p "This server has to rebooted to apply all the settings. Reboot now ? [Y/n] " yn
    yn=${yn:-y}
    case $yn in
        [Yy]* ) systemctl reboot;;
@@ -1,7 +1,5 @@
 #!/bin/bash

-set -eu -o pipefail
-
 # This script collects diagnostic information to help debug server related issues
 # It also enables SSH access for the cloudron support team

@@ -19,7 +17,7 @@ This script collects diagnostic information to help debug server related issues

 # We require root
 if [[ ${EUID} -ne 0 ]]; then
-    echo "This script should be run as root. Run with sudo"
+    echo "This script should be run as root." > /dev/stderr
    exit 1
 fi

@@ -60,6 +58,21 @@ echo -n "Generating Cloudron Support stats..."
 # clear file
 rm -rf $OUT

+ssh_port=$(cat /etc/ssh/sshd_config | grep "Port " | sed -e "s/.*Port //")
+if [[ $SUDO_USER == "" ]]; then
+    ssh_user="root"
+    ssh_folder="/root/.ssh/"
+    authorized_key_file="${ssh_folder}/authorized_keys"
+else
+    ssh_user="$SUDO_USER"
+    ssh_folder="/home/$SUDO_USER/.ssh/"
+    authorized_key_file="${ssh_folder}/authorized_keys"
+fi
+
+echo -e $LINE"SSH"$LINE >> $OUT
+echo "Username: ${ssh_user}" >> $OUT
+echo "Port:     ${ssh_port}" >> $OUT
+
 echo -e $LINE"cloudron.conf"$LINE >> $OUT
 cat /etc/cloudron/cloudron.conf &>> $OUT

@@ -71,65 +84,31 @@ fi
 echo -e $LINE"Filesystem stats"$LINE >> $OUT
 df -h &>> $OUT

-echo -e $LINE"Appsdata stats"$LINE >> $OUT
-du -hcsL /home/yellowtent/appsdata/* &>> $OUT
-
-echo -e $LINE"Boxdata stats"$LINE >> $OUT
-du -hcsL /home/yellowtent/boxdata/* &>> $OUT
-
-echo -e $LINE"Backup stats (possibly misleading)"$LINE >> $OUT
-du -hcsL /var/backups/* &>> $OUT
-
 echo -e $LINE"System daemon status"$LINE >> $OUT
 systemctl status --lines=100 cloudron.target box mysql unbound cloudron-syslog nginx collectd docker &>> $OUT

 echo -e $LINE"Box logs"$LINE >> $OUT
 tail -n 100 /home/yellowtent/platformdata/logs/box.log &>> $OUT

-echo -e $LINE"Firewall chains"$LINE >> $OUT
-ip addr &>> $OUT
-
 echo -e $LINE"Firewall chains"$LINE >> $OUT
 iptables -L &>> $OUT

 echo "Done"

-if [[ "${enableSSH}" == "true" ]]; then
-    ssh_port=$(cat /etc/ssh/sshd_config | grep "Port " | sed -e "s/.*Port //")
-    permit_root_login=$(grep -q ^PermitRootLogin.*yes /etc/ssh/sshd_config && echo "yes" || echo "no")
-
-    # support.js uses similar logic
-    if $(grep -q "ec2\|lightsail\|ami" /etc/cloudron/cloudron.conf); then
-        ssh_user="ubuntu"
-        keys_file="/home/ubuntu/.ssh/authorized_keys"
-    else
-        ssh_user="root"
-        keys_file="/root/.ssh/authorized_keys"
-    fi
-
-    echo -e $LINE"SSH"$LINE >> $OUT
-    echo "Username: ${ssh_user}" >> $OUT
-    echo "Port:     ${ssh_port}" >> $OUT
-    echo "PermitRootLogin: ${permit_root_login}" >> $OUT
-    echo "Key file: ${keys_file}" >> $OUT
-
-    echo -n "Enabling ssh access for the Cloudron support team..."
-    mkdir -p $(dirname "${keys_file}")       # .ssh does not exist sometimes
-    touch "${keys_file}"                # required for concat to work
-    if ! grep -q "${CLOUDRON_SUPPORT_PUBLIC_KEY}" "${keys_file}"; then
-        echo -e "\n${CLOUDRON_SUPPORT_PUBLIC_KEY}" >> "${keys_file}"
-        chmod 600 "${keys_file}"
-        chown "${ssh_user}" "${keys_file}"
-    fi
-
-    echo "Done"
-fi
-
 echo -n "Uploading information..."
 # for some reason not using $(cat $OUT) will not contain newlines!?
 paste_key=$(curl -X POST ${PASTEBIN}/documents --silent -d "$(cat $OUT)" | python3 -c "import sys, json; print(json.load(sys.stdin)['key'])")
 echo "Done"

+if [[ "${enableSSH}" == "true" ]]; then
+    echo -n "Enabling ssh access for the Cloudron support team..."
+    mkdir -p "${ssh_folder}"
+    echo "${CLOUDRON_SUPPORT_PUBLIC_KEY}" >> ${authorized_key_file}
+    chown -R ${ssh_user} "${ssh_folder}"
+    chmod 600 "${authorized_key_file}"
+    echo "Done"
+fi
+
 echo ""
 echo "Please email the following link to support@cloudron.io"
 echo ""
@@ -41,8 +41,8 @@ if ! $(cd "${SOURCE_DIR}/../dashboard" && git diff --exit-code >/dev/null); then
    exit 1
 fi

-if [[ "$(node --version)" != "v10.15.1" ]]; then
-    echo "This script requires node 10.15.1"
+if [[ "$(node --version)" != "v8.11.2" ]]; then
+    echo "This script requires node 8.11.2"
    exit 1
 fi

@@ -19,18 +19,17 @@ readonly curl="curl --fail --connect-timeout 20 --retry 10 --retry-delay 2 --max
 readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 readonly box_src_tmp_dir="$(realpath ${script_dir}/..)"

-readonly ubuntu_version=$(lsb_release -rs)
-readonly ubuntu_codename=$(lsb_release -cs)
-
 readonly is_update=$(systemctl is-active box && echo "yes" || echo "no")

 echo "==> installer: updating docker"
+if [[ $(docker version --format {{.Client.Version}}) != "18.03.1-ce" ]]; then
+    $curl -sL https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.03.1~ce-0~ubuntu_amd64.deb -o /tmp/docker.deb

-if [[ $(docker version --format {{.Client.Version}}) != "18.09.2" ]]; then
-    # there are 3 packages for docker - containerd, CLI and the daemon
-    $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/containerd.io_1.2.2-3_amd64.deb" -o /tmp/containerd.deb
-    $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/docker-ce-cli_18.09.2~3-0~ubuntu-${ubuntu_codename}_amd64.deb" -o /tmp/docker-ce-cli.deb
-    $curl -sL "https://download.docker.com/linux/ubuntu/dists/${ubuntu_codename}/pool/stable/amd64/docker-ce_18.09.2~3-0~ubuntu-${ubuntu_codename}_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) != "54f4c9268492a4fd2ec2e6bcc95553855b025f35dcc8b9f60ac34e0aa307279b" ]]; then
+        echo "==> installer: docker binary download is corrupt"
+        exit 5
+    fi

    echo "==> installer: Waiting for all dpkg tasks to finish..."
    while fuser /var/lib/dpkg/lock; do
@@ -48,21 +47,21 @@ if [[ $(docker version --format {{.Client.Version}}) != "18.09.2" ]]; then
        sleep 1
    done

-    while ! apt install -y /tmp/containerd.deb  /tmp/docker-ce-cli.deb /tmp/docker.deb; do
+    while ! apt install -y /tmp/docker.deb; do
        echo "==> installer: Failed to install docker. Retry"
        sleep 1
    done

-    rm /tmp/containerd.deb /tmp/docker-ce-cli.deb /tmp/docker.deb
+    rm /tmp/docker.deb
 fi

 echo "==> installer: updating node"
-if [[ "$(node --version)" != "v10.15.1" ]]; then
-    mkdir -p /usr/local/node-10.15.1
-    $curl -sL https://nodejs.org/dist/v10.15.1/node-v10.15.1-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-10.15.1
-    ln -sf /usr/local/node-10.15.1/bin/node /usr/bin/node
-    ln -sf /usr/local/node-10.15.1/bin/npm /usr/bin/npm
-    rm -rf /usr/local/node-8.11.2 /usr/local/node-8.9.3
+if [[ "$(node --version)" != "v8.11.2" ]]; then
+    mkdir -p /usr/local/node-8.11.2
+    $curl -sL https://nodejs.org/dist/v8.11.2/node-v8.11.2-linux-x64.tar.gz | tar zxvf - --strip-components=1 -C /usr/local/node-8.11.2
+    ln -sf /usr/local/node-8.11.2/bin/node /usr/bin/node
+    ln -sf /usr/local/node-8.11.2/bin/npm /usr/bin/npm
+    rm -rf /usr/local/node-6.11.5
 fi

 # this is here (and not in updater.js) because rebuild requires the above node
@@ -13,12 +13,10 @@ readonly BOX_SRC_DIR="${HOME_DIR}/box"
 readonly PLATFORM_DATA_DIR="${HOME_DIR}/platformdata" # platform data
 readonly APPS_DATA_DIR="${HOME_DIR}/appsdata" # app data
 readonly BOX_DATA_DIR="${HOME_DIR}/boxdata" # box data
+readonly CONFIG_DIR="${HOME_DIR}/configs"

 readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 readonly json="$(realpath ${script_dir}/../node_modules/.bin/json)"
-readonly ubuntu_version=$(lsb_release -rs)
-
-cp -f "${script_dir}/../scripts/cloudron-support" /usr/bin/cloudron-support

 echo "==> Configuring docker"
 cp "${script_dir}/start/docker-cloudron-app.apparmor" /etc/apparmor.d/docker-cloudron-app
@@ -26,6 +24,22 @@ systemctl enable apparmor
 systemctl restart apparmor

 usermod ${USER} -a -G docker
+# preserve the existing storage driver (user might be using overlay2)
+storage_driver=$(docker info | grep "Storage Driver" | sed 's/.*: //')
+[[ -n "${storage_driver}" ]] || storage_driver="overlay2" # if the above command fails
+
+temp_file=$(mktemp)
+# create systemd drop-in. some apps do not work with aufs
+echo -e "[Service]\nExecStart=\nExecStart=/usr/bin/dockerd -H fd:// --log-driver=journald --exec-opt native.cgroupdriver=cgroupfs --storage-driver=${storage_driver}" > "${temp_file}"
+
+systemctl enable docker
+# restart docker if options changed
+if [[ ! -f /etc/systemd/system/docker.service.d/cloudron.conf ]] || ! diff -q /etc/systemd/system/docker.service.d/cloudron.conf "${temp_file}" >/dev/null; then
+    mkdir -p /etc/systemd/system/docker.service.d
+    mv "${temp_file}" /etc/systemd/system/docker.service.d/cloudron.conf
+    systemctl daemon-reload
+    systemctl restart docker
+fi
 docker network create --subnet=172.18.0.0/16 cloudron || true

 mkdir -p "${BOX_DATA_DIR}"
@@ -44,10 +58,7 @@ mkdir -p "${PLATFORM_DATA_DIR}/collectd/collectd.conf.d"
 mkdir -p "${PLATFORM_DATA_DIR}/logrotate.d"
 mkdir -p "${PLATFORM_DATA_DIR}/acme"
 mkdir -p "${PLATFORM_DATA_DIR}/backup"
-mkdir -p "${PLATFORM_DATA_DIR}/logs/backup" \
-         "${PLATFORM_DATA_DIR}/logs/updater" \
-         "${PLATFORM_DATA_DIR}/logs/tasks" \
-         "${PLATFORM_DATA_DIR}/logs/crash"
+mkdir -p "${PLATFORM_DATA_DIR}/logs/backup" "${PLATFORM_DATA_DIR}/logs/updater" "${PLATFORM_DATA_DIR}/logs/tasks"
 mkdir -p "${PLATFORM_DATA_DIR}/update"

 mkdir -p "${BOX_DATA_DIR}/appicons"
@@ -77,19 +88,25 @@ systemctl daemon-reload
 systemctl restart systemd-journald
 setfacl -n -m u:${USER}:r /var/log/journal/*/system.journal

+echo "==> Creating config directory"
+mkdir -p "${CONFIG_DIR}"
+
+# remove old cloudron.conf. Can be removed after 3.4
+rm -f "${CONFIG_DIR}/cloudron.conf"
+$json -f /etc/cloudron/cloudron.conf -I -e "delete this.version" # remove the version field
+chown -R "${USER}" /etc/cloudron
+
 echo "==> Setting up unbound"
 # DO uses Google nameservers by default. This causes RBL queries to fail (host 2.0.0.127.zen.spamhaus.org)
 # We do not use dnsmasq because it is not a recursive resolver and defaults to the value in the interfaces file (which is Google DNS!)
 # We listen on 0.0.0.0 because there is no way control ordering of docker (which creates the 172.18.0.0/16) and unbound
-# If IP6 is not enabled, dns queries seem to fail on some hosts. -s returns false if file missing or 0 size
-ip6=$([[ -s /proc/net/if_inet6 ]] && echo "yes" || echo "no")
-echo -e "server:\n\tinterface: 0.0.0.0\n\tdo-ip6: ${ip6}\n\taccess-control: 127.0.0.1 allow\n\taccess-control: 172.18.0.1/16 allow\n\tcache-max-negative-ttl: 30\n\tcache-max-ttl: 300\n\t#logfile: /var/log/unbound.log\n\t#verbosity: 10" > /etc/unbound/unbound.conf.d/cloudron-network.conf
+# If IP6 is not enabled, dns queries seem to fail on some hosts
+echo -e "server:\n\tinterface: 0.0.0.0\n\tdo-ip6: yes\n\taccess-control: 127.0.0.1 allow\n\taccess-control: 172.18.0.1/16 allow\n\tcache-max-negative-ttl: 30\n\tcache-max-ttl: 300\n\t#logfile: /var/log/unbound.log\n\t#verbosity: 10" > /etc/unbound/unbound.conf.d/cloudron-network.conf
 # update the root anchor after a out-of-disk-space situation (see #269)
 unbound-anchor -a /var/lib/unbound/root.key

 echo "==> Adding systemd services"
 cp -r "${script_dir}/start/systemd/." /etc/systemd/system/
-[[ "${ubuntu_version}" == "16.04" ]] && sed -e 's/MemoryMax/MemoryLimit/g' -i /etc/systemd/system/box.service
 systemctl daemon-reload
 systemctl enable unbound
 systemctl enable cloudron-syslog
@@ -108,8 +125,6 @@ systemctl restart unbound
 # ensure cloudron-syslog runs
 systemctl restart cloudron-syslog

-$json -f /etc/cloudron/cloudron.conf -I -e "delete this.edition" # can be removed after 4.0
-
 echo "==> Configuring sudoers"
 rm -f /etc/sudoers.d/${USER}
 cp "${script_dir}/start/sudoers" /etc/sudoers.d/${USER}
@@ -124,11 +139,8 @@ echo "==> Configuring logrotate"
 if ! grep -q "^include ${PLATFORM_DATA_DIR}/logrotate.d" /etc/logrotate.conf; then
    echo -e "\ninclude ${PLATFORM_DATA_DIR}/logrotate.d\n" >> /etc/logrotate.conf
 fi
-cp "${script_dir}/start/logrotate/"* "${PLATFORM_DATA_DIR}/logrotate.d/"
-rm -f "${PLATFORM_DATA_DIR}/logrotate.d/box-logrotate" "${PLATFORM_DATA_DIR}/logrotate.d/app-logrotate" # remove pre 3.6 config files
-
-# logrotate files have to be owned by root, this is here to fixup existing installations where we were resetting the owner to yellowtent
-chown root:root "${PLATFORM_DATA_DIR}/logrotate.d/"
+cp "${script_dir}/start/box-logrotate" "${script_dir}/start/app-logrotate" "${PLATFORM_DATA_DIR}/logrotate.d/"
+chown root:root "${PLATFORM_DATA_DIR}/logrotate.d/box-logrotate" "${PLATFORM_DATA_DIR}/logrotate.d/app-logrotate"

 echo "==> Adding motd message for admins"
 cp "${script_dir}/start/cloudron-motd" /etc/update-motd.d/92-cloudron
@@ -171,7 +183,11 @@ mysqladmin -u root -ppassword password password # reset default root password
 mysql -u root -p${mysql_root_password} -e 'CREATE DATABASE IF NOT EXISTS box'

 echo "==> Migrating data"
-(cd "${BOX_SRC_DIR}" && BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@127.0.0.1/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up)
+sudo -u "${USER}" -H bash <<EOF
+set -eu
+cd "${BOX_SRC_DIR}"
+BOX_ENV=cloudron DATABASE_URL=mysql://root:${mysql_root_password}@127.0.0.1/box "${BOX_SRC_DIR}/node_modules/.bin/db-migrate" up
+EOF

 if [[ ! -f "${BOX_DATA_DIR}/dhparams.pem" ]]; then
    echo "==> Generating dhparams (takes forever)"
@@ -181,18 +197,17 @@ else
    cp "${BOX_DATA_DIR}/dhparams.pem" "${PLATFORM_DATA_DIR}/addons/mail/dhparams.pem"
 fi

-# old installations used to create appdata/<app>/redis which is now part of old backups and prevents restore
-echo "==> Cleaning up stale redis directories"
-find "${APPS_DATA_DIR}" -maxdepth 2 -type d -name redis -exec rm -rf {} +
-
 echo "==> Changing ownership"
+chown "${USER}:${USER}" -R "${CONFIG_DIR}"
 # be careful of what is chown'ed here. subdirs like mysql,redis etc are owned by the containers and will stop working if perms change
-chown -R "${USER}" /etc/cloudron
 chown "${USER}:${USER}" -R "${PLATFORM_DATA_DIR}/nginx" "${PLATFORM_DATA_DIR}/collectd" "${PLATFORM_DATA_DIR}/addons" "${PLATFORM_DATA_DIR}/acme" "${PLATFORM_DATA_DIR}/backup" "${PLATFORM_DATA_DIR}/logs" "${PLATFORM_DATA_DIR}/update"
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}/INFRA_VERSION" 2>/dev/null || true
 chown "${USER}:${USER}" "${PLATFORM_DATA_DIR}"
 chown "${USER}:${USER}" "${APPS_DATA_DIR}"

+# logrotate files have to be owned by root, this is here to fixup existing installations where we were resetting the owner to yellowtent
+chown root:root -R "${PLATFORM_DATA_DIR}/logrotate.d"
+
 # do not chown the boxdata/mail directory; dovecot gets upset
 chown "${USER}:${USER}" "${BOX_DATA_DIR}"
 find "${BOX_DATA_DIR}" -mindepth 1 -maxdepth 1 -not -path "${BOX_DATA_DIR}/mail" -exec chown -R "${USER}:${USER}" {} \;
@@ -0,0 +1,10 @@
+# logrotate config for app logs
+
+/home/yellowtent/platformdata/logs/*/*.log {
+    # only keep one rotated file, we currently do not send that over the api
+    rotate 1
+    size 10M
+    # we never compress so we can simply tail the files
+    nocompress
+    copytruncate
+}
@@ -9,7 +9,7 @@ iptables -t filter -F CLOUDRON # empty any existing rules
 # NOTE: keep these in sync with src/apps.js validatePortBindings
 # allow ssh, http, https, ping, dns
 iptables -t filter -I CLOUDRON -m state --state RELATED,ESTABLISHED -j ACCEPT
-# ssh is allowed alternately on port 202
+# caas has ssh on port 202
 iptables -A CLOUDRON -p tcp -m tcp -m multiport --dports 22,25,80,202,443,587,993,4190 -j ACCEPT

 iptables -t filter -A CLOUDRON -p icmp --icmp-type echo-request -j ACCEPT
@@ -1,24 +1,15 @@
-#!/bin/bash
+#!/bin/sh
+# motd hook to remind admins about updates
+printf "\t\t\tNOTE TO CLOUDRON ADMINS\n"
+printf "\t\t\t-----------------------\n"
+printf "Please do not run apt upgrade manually as it will update packages that\n"
+printf "Cloudron relies on and may break your installation. Ubuntu security updates\n"
+printf "are automatically installed on this server every night.\n"
+printf "\n"
+printf "Read more at https://cloudron.io/documentation/security/#os-updates\n"

-printf "**********************************************************************\n\n"
-
-if [[ -z "$(ls -A /home/yellowtent/boxdata/mail/dkim)" ]]; then
-    printf "\t\t\tWELCOME TO CLOUDRON\n"
-    printf "\t\t\t-------------------\n"
-
-    printf '\n\e[1;32m%-6s\e[m\n\n' "Visit https://<IP> on your browser and accept the self-signed certificate to finish setup."
-    printf "Cloudron overview - https://cloudron.io/documentation/ \n"
-    printf "Cloudron setup - https://cloudron.io/documentation/installation/#setup \n"
-else
-    printf "\t\t\tNOTE TO CLOUDRON ADMINS\n"
-    printf "\t\t\t-----------------------\n"
-    printf "Please do not run apt upgrade manually as it will update packages that\n"
-    printf "Cloudron relies on and may break your installation. Ubuntu security updates\n"
-    printf "are automatically installed on this server every night.\n"
-    printf "\n"
-    printf "Read more at https://cloudron.io/documentation/security/#os-updates\n"
+if grep -q "^PasswordAuthentication yes" /etc/ssh/sshd_config; then
+    printf "\nPlease disable password based SSH access to secure your server. Read more at\n"
+    printf "https://cloudron.io/documentation/security/#securing-ssh-access\n"
 fi

-printf "\nFor help and more information, visit https://forum.cloudron.io\n\n"
-
-printf "**********************************************************************\n"
@@ -1,40 +0,0 @@
-# add customizations here
-# after making changes run "sudo systemctl restart box"
-
-# appstore:
-#   blacklist:
-#     - io.wekan.cloudronapp
-#     - io.cloudron.openvpn
-#   whitelist:
-#     org.wordpress.cloudronapp: {}
-#     chat.rocket.cloudronapp: {}
-#     com.nextcloud.cloudronapp: {}
-#
-# backups:
-#   configurable: true
-#
-# domains:
-#   dynamicDns: true
-#   changeDashboardDomain: true
-#
-# subscription:
-#   configurable: true
-#
-# support:
-#   email: support@cloudron.io
-#   remoteSupport: true
-#
-#   ticketFormBody: |
-#     Use this form to open support tickets. You can also write directly to [support@cloudron.io](mailto:support@cloudron.io).
-#       * [Knowledge Base & App Docs](https://cloudron.io/documentation/apps/?support_view)
-#       * [Custom App Packaging & API](https://cloudron.io/developer/packaging/?support_view)
-#       * [Forum](https://forum.cloudron.io/)
-#
-#   submitTickets: true
-#
-# alerts:
-#   email: support@cloudron.io
-#   notifyCloudronAdmins: false
-#
-# footer:
-#   body: '&copy; 2019 [Cloudron](https://cloudron.io) [Forum <i class="fa fa-comments"></i>](https://forum.cloudron.io)'
@@ -1,18 +0,0 @@
-# logrotate config for app, crash, addon and task logs
-
-# man 7 glob
-/home/yellowtent/platformdata/logs/[!t][!a][!s][!k][!s]/*.log {
-    # only keep one rotated file, we currently do not send that over the api
-    rotate 1
-    size 10M
-    # we never compress so we can simply tail the files
-    nocompress
-    copytruncate
-}
-
-/home/yellowtent/platformdata/logs/tasks/*.log {
-    monthly
-    rotate 0
-    missingok
-}
-
@@ -12,9 +12,6 @@ max_allowed_packet=32M
 character-set-server = utf8mb4
 collation-server = utf8mb4_unicode_ci

-# set timezone to UTC
-default_time_zone='+00:00'
-
 [mysqldump]
 quick
 quote-names
@@ -72,6 +72,10 @@ server {
    ssl_dhparam /home/yellowtent/boxdata/dhparams.pem;
    add_header Strict-Transport-Security "max-age=15768000";

+    # https://developer.mozilla.org/en-US/docs/Web/HTTP/X-Frame-Options
+    add_header X-Frame-Options "<%= xFrameOptions %>";
+    proxy_hide_header X-Frame-Options;
+
    # https://github.com/twitter/secureheaders
    # https://www.owasp.org/index.php/OWASP_Secure_Headers_Project#tab=Compatibility_Matrix
    # https://wiki.mozilla.org/Security/Guidelines/Web_Security
@@ -86,14 +90,6 @@ server {
    add_header Referrer-Policy "no-referrer-when-downgrade";
    proxy_hide_header Referrer-Policy;

-    # gzip responses that are > 50k and not images
-    gzip on;
-    gzip_min_length 50k;
-    gzip_types text/css text/javascript text/xml text/plain application/javascript application/x-javascript application/json;
-
-    # enable for proxied requests as well
-    gzip_proxied any;
-
 <% if ( endpoint === 'admin' ) { -%>
    # CSP headers for the admin/dashboard resources
    add_header Content-Security-Policy "default-src 'none'; connect-src wss: https: 'self' *.cloudron.io; script-src https: 'self' 'unsafe-inline' 'unsafe-eval'; img-src * data:; style-src https: 'unsafe-inline'; object-src 'none'; font-src https: 'self'; frame-ancestors 'none'; base-uri 'none'; form-action 'self';";
@@ -1,14 +1,8 @@
 # sudo logging breaks journalctl output with very long urls (systemd bug)
 Defaults !syslog

-Defaults!/home/yellowtent/box/src/scripts/clearvolume.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/clearvolume.sh
-
-Defaults!/home/yellowtent/box/src/scripts/mvvolume.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/mvvolume.sh
-
-Defaults!/home/yellowtent/box/src/scripts/mkdirvolume.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/mkdirvolume.sh
+Defaults!/home/yellowtent/box/src/scripts/rmvolume.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/rmvolume.sh

 Defaults!/home/yellowtent/box/src/scripts/rmaddondir.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/rmaddondir.sh
@@ -31,8 +25,8 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/retire.sh
 Defaults!/home/yellowtent/box/src/scripts/update.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/update.sh

-Defaults!/home/yellowtent/box/src/scripts/remotesupport.sh env_keep="HOME BOX_ENV"
-yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/remotesupport.sh
+Defaults!/home/yellowtent/box/src/scripts/authorized_keys.sh env_keep="HOME BOX_ENV"
+yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/authorized_keys.sh

 Defaults!/home/yellowtent/box/src/scripts/configurelogrotate.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/configurelogrotate.sh
@@ -49,4 +43,3 @@ yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restartdocker.s

 Defaults!/home/yellowtent/box/src/scripts/restartunbound.sh env_keep="HOME BOX_ENV"
 yellowtent ALL=(root) NOPASSWD: /home/yellowtent/box/src/scripts/restartunbound.sh
-
@@ -17,12 +17,9 @@ ExecStart=/bin/sh -c 'echo "Logging to /home/yellowtent/platformdata/logs/box.lo
 Environment="HOME=/home/yellowtent" "USER=yellowtent" "DEBUG=box*,connect-lastmile" "BOX_ENV=cloudron" "NODE_ENV=production"
 ; kill apptask processes as well
 KillMode=control-group
-; Do not kill this process on OOM. Children inherit this score. Do not set it to -1000 so that MemoryMax can keep working
-OOMScoreAdjust=-999
 User=yellowtent
 Group=yellowtent
-; OOM killer is invoked in this unit beyond this. The start script replaces this with MemoryLimit for Ubuntu 16
-MemoryMax=400M
+MemoryLimit=200M
 TimeoutStopSec=5s
 StartLimitInterval=1
 StartLimitBurst=60
@@ -3,7 +3,6 @@
 exports = module.exports = {
    SCOPE_APPS_READ: 'apps:read',
    SCOPE_APPS_MANAGE: 'apps:manage',
-    SCOPE_APPSTORE: 'appstore',
    SCOPE_CLIENTS: 'clients',
    SCOPE_CLOUDRON: 'cloudron',
    SCOPE_DOMAINS_READ: 'domains:read',
@@ -11,10 +10,10 @@ exports = module.exports = {
    SCOPE_MAIL: 'mail',
    SCOPE_PROFILE: 'profile',
    SCOPE_SETTINGS: 'settings',
-    SCOPE_SUBSCRIPTION: 'subscription',
    SCOPE_USERS_READ: 'users:read',
    SCOPE_USERS_MANAGE: 'users:manage',
-    VALID_SCOPES: [ 'apps', 'appstore', 'clients', 'cloudron', 'domains', 'mail', 'profile', 'settings', 'subscription', 'users' ], // keep this sorted
+    SCOPE_APPSTORE: 'appstore',
+    VALID_SCOPES: [ 'apps', 'appstore', 'clients', 'cloudron', 'domains', 'mail', 'profile', 'settings', 'users' ], // keep this sorted

    SCOPE_ANY: '*',

@@ -115,14 +114,14 @@ function scopesForUser(user, callback) {

    if (user.admin) return callback(null, exports.VALID_SCOPES);

-    callback(null, [ 'profile', 'apps:read' ]);
+    callback(null, config.isSpacesEnabled() ? [ 'profile', 'apps', 'domains:read', 'users:read' ] : [ 'profile', 'apps:read' ]);
 }

 function validateToken(accessToken, callback) {
    assert.strictEqual(typeof accessToken, 'string');
    assert.strictEqual(typeof callback, 'function');

-    tokendb.getByAccessToken(accessToken, function (error, token) {
+    tokendb.get(accessToken, function (error, token) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null, null /* user */, 'Invalid Token'); // will end up as a 401
        if (error) return callback(error); // this triggers 'internal error' in passport

@@ -33,7 +33,6 @@ exports = module.exports = {

 var accesscontrol = require('./accesscontrol.js'),
    appdb = require('./appdb.js'),
-    apps = require('./apps.js'),
    assert = require('assert'),
    async = require('async'),
    clients = require('./clients.js'),
@@ -110,7 +109,7 @@ var KNOWN_ADDONS = {
        clear: NOOP,
    },
    localstorage: {
-        setup: setupLocalStorage,
+        setup: setupLocalStorage, // docker creates the directory for us
        teardown: teardownLocalStorage,
        backup: NOOP, // no backup because it's already inside app data
        restore: NOOP,
@@ -184,7 +183,7 @@ var KNOWN_ADDONS = {
 const KNOWN_SERVICES = {
    mail: {
        status: containerStatus.bind(null, 'mail', 'CLOUDRON_MAIL_TOKEN'),
-        restart: mail.restartMail,
+        restart: restartContainer.bind(null, 'mail'),
        defaultMemoryLimit: Math.max((1 + Math.round(os.totalmem()/(1024*1024*1024)/4)) * 128, 256) * 1024 * 1024
    },
    mongodb: {
@@ -211,25 +210,10 @@ const KNOWN_SERVICES = {
        status: statusUnbound,
        restart: restartUnbound,
        defaultMemoryLimit: 0
-    },
-    sftp: {
-        status: statusSftp,
-        restart: restartContainer.bind(null, 'sftp'),
-        defaultMemoryLimit: 256 * 1024 * 1024
-    },
-    graphite: {
-        status: statusGraphite,
-        restart: restartContainer.bind(null, 'graphite'),
-        defaultMemoryLimit: 75 * 1024 * 1024
-    },
-    nginx: {
-        status: statusNginx,
-        restart: restartNginx,
-        defaultMemoryLimit: 0
    }
 };

-function debugApp(app /*, args */) {
+function debugApp(app, args) {
    assert(typeof app === 'object');

    debug((app.fqdn || app.location) + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
@@ -276,30 +260,6 @@ function restartContainer(serviceName, callback) {
    });
 }

-function getServiceDetails(containerName, tokenEnvName, callback) {
-    assert.strictEqual(typeof containerName, 'string');
-    assert.strictEqual(typeof tokenEnvName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    docker.inspect(containerName, function (error, result) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
-        if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
-
-        const ip = safe.query(result, 'NetworkSettings.Networks.cloudron.IPAddress', null);
-        if (!ip) return callback(new AddonsError(AddonsError.NOT_ACTIVE, `Error getting ${containerName} container ip`));
-
-        // extract the cloudron token for auth
-        const env = safe.query(result, 'Config.Env', null);
-        if (!env) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, `Error getting ${containerName} env`));
-        const tmp = env.find(function (e) { return e.indexOf(tokenEnvName) === 0; });
-        if (!tmp) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, `Error getting ${containerName} cloudron token env var`));
-        const token = tmp.slice(tokenEnvName.length + 1); // +1 for the = sign
-        if (!token)  return callback(new AddonsError(AddonsError.INTERNAL_ERROR, `Error getting ${containerName} cloudron token`));
-
-        callback(null, { ip: ip, token: token, state: result.State });
-    });
-}
-
 function containerStatus(addonName, addonTokenName, callback) {
    assert.strictEqual(typeof addonName, 'string');
    assert.strictEqual(typeof addonTokenName, 'string');
@@ -409,25 +369,24 @@ function getServiceLogs(serviceName, options, callback) {
    assert(options && typeof options === 'object');
    assert.strictEqual(typeof callback, 'function');

-    assert.strictEqual(typeof options.lines, 'number');
-    assert.strictEqual(typeof options.format, 'string');
-    assert.strictEqual(typeof options.follow, 'boolean');
-
    if (!KNOWN_SERVICES[serviceName]) return callback(new AddonsError(AddonsError.NOT_FOUND));

    debug(`Getting logs for ${serviceName}`);

-    var lines = options.lines,
+    var lines = options.lines || 100,
        format = options.format || 'json',
-        follow = options.follow;
+        follow = !!options.follow;

-    let cmd, args = [];
+    assert.strictEqual(typeof lines, 'number');
+    assert.strictEqual(typeof format, 'string');
+
+    var cmd;
+    var args = [ '--lines=' + lines ];

    // docker and unbound use journald
    if (serviceName === 'docker' || serviceName === 'unbound') {
        cmd = 'journalctl';

-        args.push('--lines=' + (lines === -1 ? 'all' : lines));
        args.push(`--unit=${serviceName}`);
        args.push('--no-pager');
        args.push('--output=short-iso');
@@ -436,7 +395,6 @@ function getServiceLogs(serviceName, options, callback) {
    } else {
        cmd = '/usr/bin/tail';

-        args.push('--lines=' + (lines === -1 ? '+1' : lines));
        if (follow) args.push('--follow', '--retry', '--quiet'); // same as -F. to make it work if file doesn't exist, --quiet to not output file headers, which are no logs
        args.push(path.join(paths.LOG_DIR, serviceName, 'app.log'));
    }
@@ -477,6 +435,30 @@ function restartService(serviceName, callback) {
    KNOWN_SERVICES[serviceName].restart(callback);
 }

+function getServiceDetails(containerName, tokenEnvName, callback) {
+    assert.strictEqual(typeof containerName, 'string');
+    assert.strictEqual(typeof tokenEnvName, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    docker.inspect(containerName, function (error, result) {
+        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
+        if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
+
+        const ip = safe.query(result, 'NetworkSettings.Networks.cloudron.IPAddress', null);
+        if (!ip) return callback(new AddonsError(AddonsError.NOT_ACTIVE, `Error getting ${containerName} container ip`));
+
+        // extract the cloudron token for auth
+        const env = safe.query(result, 'Config.Env', null);
+        if (!env) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, `Error getting ${containerName} env`));
+        const tmp = env.find(function (e) { return e.indexOf(tokenEnvName) === 0; });
+        if (!tmp) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, `Error getting ${containerName} cloudron token env var`));
+        const token = tmp.slice(tokenEnvName.length + 1); // +1 for the = sign
+        if (!token)  return callback(new AddonsError(AddonsError.INTERNAL_ERROR, `Error getting ${containerName} cloudron token`));
+
+        callback(null, { ip: ip, token: token, state: result.State });
+    });
+}
+
 function waitForService(containerName, tokenEnvName, callback) {
    assert.strictEqual(typeof containerName, 'string');
    assert.strictEqual(typeof tokenEnvName, 'string');
@@ -632,7 +614,7 @@ function updateServiceConfig(platformConfig, callback) {
    debug('updateServiceConfig: %j', platformConfig);

    // TODO: this should possibly also rollback memory to default
-    async.eachSeries([ 'mysql', 'postgresql', 'mail', 'mongodb', 'graphite' ], function iterator(serviceName, iteratorCallback) {
+    async.eachSeries([ 'mysql', 'postgresql', 'mail', 'mongodb' ], function iterator(serviceName, iteratorCallback) {
        const containerConfig = platformConfig[serviceName];
        let memory, memorySwap;
        if (containerConfig && containerConfig.memory && containerConfig.memorySwap) {
@@ -744,13 +726,8 @@ function setupLocalStorage(app, options, callback) {

    debugApp(app, 'setupLocalStorage');

-    const volumeDataDir = apps.getDataDir(app, app.dataDir);
-
-    // reomve any existing volume in case it's bound with an old dataDir
-    async.series([
-        docker.removeVolume.bind(null, app, `${app.id}-localstorage`),
-        docker.createVolume.bind(null, app, `${app.id}-localstorage`, volumeDataDir)
-    ], callback);
+    // if you change the name, you have to change getMountsSync
+    docker.createVolume(app, `${app.id}-localstorage`, 'data', callback);
 }

 function clearLocalStorage(app, options, callback) {
@@ -760,7 +737,7 @@ function clearLocalStorage(app, options, callback) {

    debugApp(app, 'clearLocalStorage');

-    docker.clearVolume(app, `${app.id}-localstorage`, { removeDirectory: false }, callback);
+    docker.clearVolume(app, `${app.id}-localstorage`, 'data', callback);
 }

 function teardownLocalStorage(app, options, callback) {
@@ -770,10 +747,7 @@ function teardownLocalStorage(app, options, callback) {

    debugApp(app, 'teardownLocalStorage');

-    async.series([
-        docker.clearVolume.bind(null, app, `${app.id}-localstorage`, { removeDirectory: true }),
-        docker.removeVolume.bind(null, app, `${app.id}-localstorage`)
-    ], callback);
+    docker.removeVolume(app, `${app.id}-localstorage`, 'data', callback);
 }

 function setupOauth(app, options, callback) {
@@ -795,12 +769,10 @@ function setupOauth(app, options, callback) {
        clients.add(appId, clients.TYPE_OAUTH, redirectURI, scope, function (error, result) {
            if (error) return callback(error);

-            const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
            var env = [
-                { name: `${envPrefix}OAUTH_CLIENT_ID`, value: result.id },
-                { name: `${envPrefix}OAUTH_CLIENT_SECRET`, value: result.clientSecret },
-                { name: `${envPrefix}OAUTH_ORIGIN`, value: config.adminOrigin() }
+                { name: 'OAUTH_CLIENT_ID', value: result.id },
+                { name: 'OAUTH_CLIENT_SECRET', value: result.clientSecret },
+                { name: 'OAUTH_ORIGIN', value: config.adminOrigin() }
            ];

            debugApp(app, 'Setting oauth addon config to %j', env);
@@ -834,19 +806,17 @@ function setupEmail(app, options, callback) {

        const mailInDomains = mailDomains.filter(function (d) { return d.enabled; }).map(function (d) { return d.domain; }).join(',');

-        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
        // note that "external" access info can be derived from MAIL_DOMAIN (since it's part of user documentation)
        var env = [
-            { name: `${envPrefix}MAIL_SMTP_SERVER`, value: 'mail' },
-            { name: `${envPrefix}MAIL_SMTP_PORT`, value: '2525' },
-            { name: `${envPrefix}MAIL_IMAP_SERVER`, value: 'mail' },
-            { name: `${envPrefix}MAIL_IMAP_PORT`, value: '9993' },
-            { name: `${envPrefix}MAIL_SIEVE_SERVER`, value: 'mail' },
-            { name: `${envPrefix}MAIL_SIEVE_PORT`, value: '4190' },
-            { name: `${envPrefix}MAIL_DOMAIN`, value: app.domain },
-            { name: `${envPrefix}MAIL_DOMAINS`, value: mailInDomains },
-            { name: `${envPrefix}LDAP_MAILBOXES_BASE_DN`, value: 'ou=mailboxes,dc=cloudron' }
+            { name: 'MAIL_SMTP_SERVER', value: 'mail' },
+            { name: 'MAIL_SMTP_PORT', value: '2525' },
+            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
+            { name: 'MAIL_IMAP_PORT', value: '9993' },
+            { name: 'MAIL_SIEVE_SERVER', value: 'mail' },
+            { name: 'MAIL_SIEVE_PORT', value: '4190' },
+            { name: 'MAIL_DOMAIN', value: app.domain },
+            { name: 'MAIL_DOMAINS', value: mailInDomains },
+            { name: 'LDAP_MAILBOXES_BASE_DN', value: 'ou=mailboxes,dc=cloudron' }
        ];

        debugApp(app, 'Setting up Email');
@@ -872,16 +842,14 @@ function setupLdap(app, options, callback) {

    if (!app.sso) return callback(null);

-    const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
    var env = [
-        { name: `${envPrefix}LDAP_SERVER`, value: '172.18.0.1' },
-        { name: `${envPrefix}LDAP_PORT`, value: '' + config.get('ldapPort') },
-        { name: `${envPrefix}LDAP_URL`, value: 'ldap://172.18.0.1:' + config.get('ldapPort') },
-        { name: `${envPrefix}LDAP_USERS_BASE_DN`, value: 'ou=users,dc=cloudron' },
-        { name: `${envPrefix}LDAP_GROUPS_BASE_DN`, value: 'ou=groups,dc=cloudron' },
-        { name: `${envPrefix}LDAP_BIND_DN`, value: 'cn='+ app.id + ',ou=apps,dc=cloudron' },
-        { name: `${envPrefix}LDAP_BIND_PASSWORD`, value: hat(4 * 128) } // this is ignored
+        { name: 'LDAP_SERVER', value: '172.18.0.1' },
+        { name: 'LDAP_PORT', value: '' + config.get('ldapPort') },
+        { name: 'LDAP_URL', value: 'ldap://172.18.0.1:' + config.get('ldapPort') },
+        { name: 'LDAP_USERS_BASE_DN', value: 'ou=users,dc=cloudron' },
+        { name: 'LDAP_GROUPS_BASE_DN', value: 'ou=groups,dc=cloudron' },
+        { name: 'LDAP_BIND_DN', value: 'cn='+ app.id + ',ou=apps,dc=cloudron' },
+        { name: 'LDAP_BIND_PASSWORD', value: hat(4 * 128) } // this is ignored
    ];

    debugApp(app, 'Setting up LDAP');
@@ -911,16 +879,14 @@ function setupSendMail(app, options, callback) {

        var password = error ? hat(4 * 48) : existingPassword; // see box#565 for password length

-        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
        var env = [
-            { name: `${envPrefix}MAIL_SMTP_SERVER`, value: 'mail' },
-            { name: `${envPrefix}MAIL_SMTP_PORT`, value: '2525' },
-            { name: `${envPrefix}MAIL_SMTPS_PORT`, value: '2465' },
-            { name: `${envPrefix}MAIL_SMTP_USERNAME`, value: app.mailboxName + '@' + app.domain },
-            { name: `${envPrefix}MAIL_SMTP_PASSWORD`, value: password },
-            { name: `${envPrefix}MAIL_FROM`, value: app.mailboxName + '@' + app.domain },
-            { name: `${envPrefix}MAIL_DOMAIN`, value: app.domain }
+            { name: 'MAIL_SMTP_SERVER', value: 'mail' },
+            { name: 'MAIL_SMTP_PORT', value: '2525' },
+            { name: 'MAIL_SMTPS_PORT', value: '2465' },
+            { name: 'MAIL_SMTP_USERNAME', value: app.mailboxName + '@' + app.domain },
+            { name: 'MAIL_SMTP_PASSWORD', value: password },
+            { name: 'MAIL_FROM', value: app.mailboxName + '@' + app.domain },
+            { name: 'MAIL_DOMAIN', value: app.domain }
        ];
        debugApp(app, 'Setting sendmail addon config to %j', env);
        appdb.setAddonConfig(app.id, 'sendmail', env, callback);
@@ -949,15 +915,13 @@ function setupRecvMail(app, options, callback) {

        var password = error ? hat(4 * 48) : existingPassword;  // see box#565 for password length

-        const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
        var env = [
-            { name: `${envPrefix}MAIL_IMAP_SERVER`, value: 'mail' },
-            { name: `${envPrefix}MAIL_IMAP_PORT`, value: '9993' },
-            { name: `${envPrefix}MAIL_IMAP_USERNAME`, value: app.mailboxName + '@' + app.domain },
-            { name: `${envPrefix}MAIL_IMAP_PASSWORD`, value: password },
-            { name: `${envPrefix}MAIL_TO`, value: app.mailboxName + '@' + app.domain },
-            { name: `${envPrefix}MAIL_DOMAIN`, value: app.domain }
+            { name: 'MAIL_IMAP_SERVER', value: 'mail' },
+            { name: 'MAIL_IMAP_PORT', value: '9993' },
+            { name: 'MAIL_IMAP_USERNAME', value: app.mailboxName + '@' + app.domain },
+            { name: 'MAIL_IMAP_PASSWORD', value: password },
+            { name: 'MAIL_TO', value: app.mailboxName + '@' + app.domain },
+            { name: 'MAIL_DOMAIN', value: app.domain }
        ];

        debugApp(app, 'Setting sendmail addon config to %j', env);
@@ -1002,7 +966,6 @@ function startMysql(existingInfra, callback) {
        if (error) return callback(error);

        const cmd = `docker run --restart=always -d --name="mysql" \
-                    --hostname mysql \
                    --net cloudron \
                    --net-alias mysql \
                    --log-driver syslog \
@@ -1059,21 +1022,19 @@ function setupMySql(app, options, callback) {
                if (error) return callback(new Error('Error setting up mysql: ' + error));
                if (response.statusCode !== 201) return callback(new Error(`Error setting up mysql. Status code: ${response.statusCode} message: ${response.body.message}`));

-                const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
                var env = [
-                    { name: `${envPrefix}MYSQL_USERNAME`, value: data.username },
-                    { name: `${envPrefix}MYSQL_PASSWORD`, value: data.password },
-                    { name: `${envPrefix}MYSQL_HOST`, value: 'mysql' },
-                    { name: `${envPrefix}MYSQL_PORT`, value: '3306' }
+                    { name: 'MYSQL_USERNAME', value: data.username },
+                    { name: 'MYSQL_PASSWORD', value: data.password },
+                    { name: 'MYSQL_HOST', value: 'mysql' },
+                    { name: 'MYSQL_PORT', value: '3306' }
                ];

                if (options.multipleDatabases) {
-                    env = env.concat({ name: `${envPrefix}MYSQL_DATABASE_PREFIX`, value: `${data.prefix}_` });
+                    env = env.concat({ name: 'MYSQL_DATABASE_PREFIX', value: `${data.prefix}_` });
                } else {
                    env = env.concat(
-                        { name: `${envPrefix}MYSQL_URL`, value: `mysql://${data.username}:${data.password}@mysql/${data.database}` },
-                        { name: `${envPrefix}MYSQL_DATABASE`, value: data.database }
+                        { name: 'MYSQL_URL', value: `mysql://${data.username}:${data.password}@mysql/${data.database}` },
+                        { name: 'MYSQL_DATABASE', value: data.database }
                    );
                }

@@ -1217,7 +1178,6 @@ function startPostgresql(existingInfra, callback) {
        if (error) return callback(error);

        const cmd = `docker run --restart=always -d --name="postgresql" \
-                    --hostname postgresql \
                    --net cloudron \
                    --net-alias postgresql \
                    --log-driver syslog \
@@ -1272,15 +1232,13 @@ function setupPostgreSql(app, options, callback) {
                if (error) return callback(new Error('Error setting up postgresql: ' + error));
                if (response.statusCode !== 201) return callback(new Error(`Error setting up postgresql. Status code: ${response.statusCode} message: ${response.body.message}`));

-                const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
                var env = [
-                    { name: `${envPrefix}POSTGRESQL_URL`, value: `postgres://${data.username}:${data.password}@postgresql/${data.database}` },
-                    { name: `${envPrefix}POSTGRESQL_USERNAME`, value: data.username },
-                    { name: `${envPrefix}POSTGRESQL_PASSWORD`, value: data.password },
-                    { name: `${envPrefix}POSTGRESQL_HOST`, value: 'postgresql' },
-                    { name: `${envPrefix}POSTGRESQL_PORT`, value: '5432' },
-                    { name: `${envPrefix}POSTGRESQL_DATABASE`, value: data.database }
+                    { name: 'POSTGRESQL_URL', value: `postgres://${data.username}:${data.password}@postgresql/${data.database}` },
+                    { name: 'POSTGRESQL_USERNAME', value: data.username },
+                    { name: 'POSTGRESQL_PASSWORD', value: data.password },
+                    { name: 'POSTGRESQL_HOST', value: 'postgresql' },
+                    { name: 'POSTGRESQL_PORT', value: '5432' },
+                    { name: 'POSTGRESQL_DATABASE', value: data.database }
                ];

                debugApp(app, 'Setting postgresql addon config to %j', env);
@@ -1394,7 +1352,6 @@ function startMongodb(existingInfra, callback) {
        if (error) return callback(error);

        const cmd = `docker run --restart=always -d --name="mongodb" \
-                    --hostname mongodb \
                    --net cloudron \
                    --net-alias mongodb \
                    --log-driver syslog \
@@ -1447,15 +1404,13 @@ function setupMongoDb(app, options, callback) {
                if (error) return callback(new Error('Error setting up mongodb: ' + error));
                if (response.statusCode !== 201) return callback(new Error(`Error setting up mongodb. Status code: ${response.statusCode}`));

-                const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
                var env = [
-                    { name: `${envPrefix}MONGODB_URL`, value : `mongodb://${data.username}:${data.password}@mongodb/${data.database}` },
-                    { name: `${envPrefix}MONGODB_USERNAME`, value : data.username },
-                    { name: `${envPrefix}MONGODB_PASSWORD`, value: data.password },
-                    { name: `${envPrefix}MONGODB_HOST`, value : 'mongodb' },
-                    { name: `${envPrefix}MONGODB_PORT`, value : '27017' },
-                    { name: `${envPrefix}MONGODB_DATABASE`, value : data.database }
+                    { name: 'MONGODB_URL', value : `mongodb://${data.username}:${data.password}@mongodb/${data.database}` },
+                    { name: 'MONGODB_USERNAME', value : data.username },
+                    { name: 'MONGODB_PASSWORD', value: data.password },
+                    { name: 'MONGODB_HOST', value : 'mongodb' },
+                    { name: 'MONGODB_PORT', value : '27017' },
+                    { name: 'MONGODB_DATABASE', value : data.database }
                ];

                debugApp(app, 'Setting mongodb addon config to %j', env);
@@ -1591,7 +1546,6 @@ function setupRedis(app, options, callback) {
            const label = app.fqdn;
            // note that we do not add appId label because this interferes with the stop/start app logic
            const cmd = `docker run --restart=always -d --name=${redisName} \
-                        --hostname ${redisName} \
                        --label=location=${label} \
                        --net cloudron \
                        --net-alias ${redisName} \
@@ -1609,13 +1563,11 @@ function setupRedis(app, options, callback) {
                        --label isCloudronManaged=true \
                        --read-only -v /tmp -v /run ${tag}`;

-            const envPrefix = app.manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
            var env = [
-                { name: `${envPrefix}REDIS_URL`, value: 'redis://redisuser:' + redisPassword + '@redis-' + app.id },
-                { name: `${envPrefix}REDIS_PASSWORD`, value: redisPassword },
-                { name: `${envPrefix}REDIS_HOST`, value: redisName },
-                { name: `${envPrefix}REDIS_PORT`, value: '6379' }
+                { name: 'REDIS_URL', value: 'redis://redisuser:' + redisPassword + '@redis-' + app.id },
+                { name: 'REDIS_PASSWORD', value: redisPassword },
+                { name: 'REDIS_HOST', value: redisName },
+                { name: 'REDIS_PORT', value: '6379' }
            ];

            async.series([
@@ -1752,66 +1704,3 @@ function restartUnbound(callback) {

    callback(null);
 }
-
-function statusNginx(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    shell.exec('statusNginx', 'systemctl is-active nginx', function (error) {
-        callback(null, { status: error ? exports.SERVICE_STATUS_STOPPED : exports.SERVICE_STATUS_ACTIVE });
-    });
-}
-
-function restartNginx(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    shell.sudo('reloadnginx', [ path.join(__dirname, 'scripts/reloadnginx.sh') ], {}, NOOP_CALLBACK);
-
-    callback(null);
-}
-
-function statusSftp(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    docker.inspect('sftp', function (error, container) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
-        if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
-
-        docker.memoryUsage('sftp', function (error, result) {
-            if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
-
-            var tmp = {
-                status: container.State.Running ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STOPPED,
-                memoryUsed: result.memory_stats.usage,
-                memoryPercent: parseInt(100 * result.memory_stats.usage / result.memory_stats.limit)
-            };
-
-            callback(null, tmp);
-        });
-    });
-}
-
-function statusGraphite(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    docker.inspect('graphite', function (error, container) {
-        if (error && error.reason === DockerError.NOT_FOUND) return callback(new AddonsError(AddonsError.NOT_ACTIVE, error));
-        if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
-
-        request.get('http://127.0.0.1:8417', { timeout: 3000 }, function (error, response) {
-            if (error) return callback(null, { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite: ${error.message}` });
-            if (response.statusCode !== 200) return callback(null, { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite. Status code: ${response.statusCode} message: ${response.body.message}` });
-
-            docker.memoryUsage('graphite', function (error, result) {
-                if (error) return callback(new AddonsError(AddonsError.INTERNAL_ERROR, error));
-
-                var tmp = {
-                    status: container.State.Running ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STOPPED,
-                    memoryUsed: result.memory_stats.usage,
-                    memoryPercent: parseInt(100 * result.memory_stats.usage / result.memory_stats.limit)
-                };
-
-                callback(null, tmp);
-            });
-        });
-    });
-}
@@ -43,7 +43,7 @@ exports = module.exports = {
    RSTATE_RUNNING: 'running',
    RSTATE_PENDING_START: 'pending_start',
    RSTATE_PENDING_STOP: 'pending_stop',
-    RSTATE_STOPPED: 'stopped', // app stopped by us
+    RSTATE_STOPPED: 'stopped', // app stopped by use

    // run codes (keep in sync in UI)
    HEALTH_HEALTHY: 'healthy',
@@ -68,10 +68,8 @@ var assert = require('assert'),
 var APPS_FIELDS_PREFIXED = [ 'apps.id', 'apps.appStoreId', 'apps.installationState', 'apps.installationProgress', 'apps.runState',
    'apps.health', 'apps.containerId', 'apps.manifestJson', 'apps.httpPort', 'subdomains.subdomain AS location', 'subdomains.domain',
    'apps.accessRestrictionJson', 'apps.restoreConfigJson', 'apps.oldConfigJson', 'apps.updateConfigJson', 'apps.memoryLimit',
-    'apps.label', 'apps.tagsJson',
-    'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
-    'apps.creationTime', 'apps.updateTime', 'apps.ownerId', 'apps.mailboxName', 'apps.enableAutomaticUpdate',
-    'apps.dataDir', 'apps.ts', 'apps.healthTime' ].join(',');
+    'apps.xFrameOptions', 'apps.sso', 'apps.debugModeJson', 'apps.robotsTxt', 'apps.enableBackup',
+    'apps.creationTime', 'apps.updateTime', 'apps.ownerId', 'apps.mailboxName', 'apps.enableAutomaticUpdate', 'apps.ts' ].join(',');

 var PORT_BINDINGS_FIELDS = [ 'hostPort', 'type', 'environmentVariable', 'appId' ].join(',');

@@ -96,10 +94,6 @@ function postProcess(result) {
    result.restoreConfig = safe.JSON.parse(result.restoreConfigJson);
    delete result.restoreConfigJson;

-    assert(result.tagsJson === null || typeof result.tagsJson === 'string');
-    result.tags = safe.JSON.parse(result.tagsJson) || [];
-    delete result.tagsJson;
-
    assert(result.hostPorts === null || typeof result.hostPorts === 'string');
    assert(result.environmentVariables === null || typeof result.environmentVariables === 'string');

@@ -121,6 +115,9 @@ function postProcess(result) {
    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.enableBackup = !!result.enableBackup; // make it bool
    result.enableAutomaticUpdate = !!result.enableAutomaticUpdate; // make it bool
@@ -142,9 +139,6 @@ function postProcess(result) {
    for (let i = 0; i < envNames.length; i++) { // NOTE: envNames is [ null ] when env of an app is empty
        if (envNames[i]) result.env[envNames[i]] = envValues[i];
    }
-
-    // in the db, we store dataDir as unique/nullable
-    result.dataDir = result.dataDir || '';
 }

 function get(id, callback) {
@@ -273,27 +267,24 @@ function add(id, appStoreId, manifest, location, domain, ownerId, portBindings,

    var manifestJson = JSON.stringify(manifest);

-    const accessRestriction = data.accessRestriction || null;
-    const accessRestrictionJson = JSON.stringify(accessRestriction);
-    const memoryLimit = data.memoryLimit || 0;
-    const installationState = data.installationState || exports.ISTATE_PENDING_INSTALL;
-    const restoreConfigJson = data.restoreConfig ? JSON.stringify(data.restoreConfig) : null; // used when cloning
-    const sso = 'sso' in data ? data.sso : null;
-    const robotsTxt = 'robotsTxt' in data ? data.robotsTxt : null;
-    const debugModeJson = data.debugMode ? JSON.stringify(data.debugMode) : null;
-    const env = data.env || {};
-    const label = data.label || null;
-    const tagsJson = data.tags ? JSON.stringify(data.tags) : null;
+    var accessRestriction = data.accessRestriction || null;
+    var accessRestrictionJson = JSON.stringify(accessRestriction);
+    var memoryLimit = data.memoryLimit || 0;
+    var xFrameOptions = data.xFrameOptions || '';
+    var installationState = data.installationState || exports.ISTATE_PENDING_INSTALL;
+    var restoreConfigJson = data.restoreConfig ? JSON.stringify(data.restoreConfig) : null; // used when cloning
+    var sso = 'sso' in data ? data.sso : null;
+    var robotsTxt = 'robotsTxt' in data ? data.robotsTxt : null;
+    var debugModeJson = data.debugMode ? JSON.stringify(data.debugMode) : null;
+    var env = data.env || {};
    const mailboxName = data.mailboxName || null;

    var queries = [];

    queries.push({
-        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, '
-            + 'restoreConfigJson, sso, debugModeJson, robotsTxt, ownerId, mailboxName, label, tagsJson) '
-            + ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
-        args: [ id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, restoreConfigJson,
-            sso, debugModeJson, robotsTxt, ownerId, mailboxName, label, tagsJson ]
+        query: 'INSERT INTO apps (id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson, sso, debugModeJson, robotsTxt, ownerId, mailboxName) ' +
+            ' VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
+        args: [ id, appStoreId, manifestJson, installationState, accessRestrictionJson, memoryLimit, xFrameOptions, restoreConfigJson, sso, debugModeJson, robotsTxt, ownerId, mailboxName ]
    });

    queries.push({
@@ -419,7 +410,6 @@ function updateWithConstraints(id, app, constraints, callback) {
    assert(!('portBindings' in app) || typeof app.portBindings === 'object');
    assert(!('accessRestriction' in app) || typeof app.accessRestriction === 'object' || app.accessRestriction === '');
    assert(!('alternateDomains' in app) || Array.isArray(app.alternateDomains));
-    assert(!('tags' in app) || Array.isArray(app.tags));
    assert(!('env' in app) || typeof app.env === 'object');

    var queries = [ ];
@@ -458,7 +448,7 @@ function updateWithConstraints(id, app, constraints, callback) {

    var fields = [ ], values = [ ];
    for (var p in app) {
-        if (p === 'manifest' || p === 'oldConfig' || p === 'updateConfig' || p === 'restoreConfig' || p === 'tags' || p === 'accessRestriction' || p === 'debugMode') {
+        if (p === 'manifest' || p === 'oldConfig' || p === 'updateConfig' || p === 'restoreConfig' || p === 'accessRestriction' || p === 'debugMode') {
            fields.push(`${p}Json = ?`);
            values.push(JSON.stringify(app[p]));
        } else if (p !== 'portBindings' && p !== 'location' && p !== 'domain' && p !== 'alternateDomains' && p !== 'env') {
@@ -482,13 +472,12 @@ function updateWithConstraints(id, app, constraints, callback) {
 }

 // not sure if health should influence runState
-function setHealth(appId, health, healthTime, callback) {
+function setHealth(appId, health, callback) {
    assert.strictEqual(typeof appId, 'string');
    assert.strictEqual(typeof health, 'string');
-    assert(util.isDate(healthTime));
    assert.strictEqual(typeof callback, 'function');

-    var values = { health, healthTime };
+    var values = { health: health };

    var constraints = 'AND runState NOT LIKE "pending_%" AND installationState = "installed"';

@@ -621,13 +610,13 @@ function getAddonConfigByAppId(appId, callback) {
    });
 }

-function getAppIdByAddonConfigValue(addonId, namePattern, value, callback) {
+function getAppIdByAddonConfigValue(addonId, name, value, callback) {
    assert.strictEqual(typeof addonId, 'string');
-    assert.strictEqual(typeof namePattern, 'string');
+    assert.strictEqual(typeof name, 'string');
    assert.strictEqual(typeof value, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT appId FROM appAddonConfigs WHERE addonId = ? AND name LIKE ? AND value = ?', [ addonId, namePattern, value ], function (error, results) {
+    database.query('SELECT appId FROM appAddonConfigs WHERE addonId = ? AND name = ? AND value = ?', [ addonId, name, value ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (results.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

@@ -4,12 +4,10 @@ var appdb = require('./appdb.js'),
    apps = require('./apps.js'),
    assert = require('assert'),
    async = require('async'),
-    auditSource = require('./auditsource.js'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:apphealthmonitor'),
-    docker = require('./docker.js'),
-    eventlog = require('./eventlog.js'),
-    safe = require('safetydance'),
+    docker = require('./docker.js').connection,
+    mailer = require('./mailer.js'),
    superagent = require('superagent'),
    util = require('util');

@@ -19,8 +17,9 @@ exports = module.exports = {

 const HEALTHCHECK_INTERVAL = 10 * 1000; // every 10 seconds. this needs to be small since the UI makes only healthy apps clickable
 const UNHEALTHY_THRESHOLD = 10 * 60 * 1000; // 10 minutes
+let gHealthInfo = { }; // { time, emailSent }

-const OOM_EVENT_LIMIT = 60 * 60 * 1000; // 60 minutes
+const OOM_MAIL_LIMIT = 60 * 60 * 1000; // 60 minutes
 let gLastOomMailTime = Date.now() - (5 * 60 * 1000); // pretend we sent email 5 minutes ago

 function debugApp(app) {
@@ -34,29 +33,27 @@ function setHealth(app, health, callback) {
    assert.strictEqual(typeof health, 'string');
    assert.strictEqual(typeof callback, 'function');

-    let now = new Date(), healthTime = app.healthTime, curHealth = app.health;
+    var now = new Date();
+
+    if (!(app.id in gHealthInfo)) { // add new apps to list
+        gHealthInfo[app.id] = { time: now, emailSent: false };
+    }

    if (health === appdb.HEALTH_HEALTHY) {
-        healthTime = now;
-        if (curHealth && curHealth !== appdb.HEALTH_HEALTHY) { // app starts out with null health
-            debugApp(app, 'app switched from %s to healthy', curHealth);
+        gHealthInfo[app.id].time = now;
+    } else if (Math.abs(now - gHealthInfo[app.id].time) > UNHEALTHY_THRESHOLD) {
+        if (gHealthInfo[app.id].emailSent) return callback(null);

-            // do not send mails for dev apps
-            if (!app.debugMode) eventlog.add(eventlog.ACTION_APP_UP, auditSource.HEALTH_MONITOR, { app: app });
-        }
-    } else if (Math.abs(now - healthTime) > UNHEALTHY_THRESHOLD) {
-        if (curHealth === appdb.HEALTH_HEALTHY) {
-            debugApp(app, 'marking as unhealthy since not seen for more than %s minutes', UNHEALTHY_THRESHOLD/(60 * 1000));
+        debugApp(app, 'marking as unhealthy since not seen for more than %s minutes', UNHEALTHY_THRESHOLD/(60 * 1000));

-            // do not send mails for dev apps
-            if (!app.debugMode) eventlog.add(eventlog.ACTION_APP_DOWN, auditSource.HEALTH_MONITOR, { app: app });
-        }
+        if (!app.debugMode) mailer.appDied(app); // do not send mails for dev apps
+        gHealthInfo[app.id].emailSent = true;
    } else {
-        debugApp(app, 'waiting for %s seconds to update the app health', (UNHEALTHY_THRESHOLD - Math.abs(now - healthTime))/1000);
+        debugApp(app, 'waiting for sometime to update the app health');
        return callback(null);
    }

-    appdb.setHealth(app.id, health, healthTime, function (error) {
+    appdb.setHealth(app.id, health, function (error) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(null); // app uninstalled?
        if (error) return callback(error);

@@ -77,10 +74,11 @@ function checkAppHealth(app, callback) {
        return callback(null);
    }

-    const manifest = app.manifest;
+    var container = docker.getContainer(app.containerId),
+        manifest = app.manifest;

-    docker.inspect(app.containerId, function (error, data) {
-        if (error || !data || !data.State) {
+    container.inspect(function (err, data) {
+        if (err || !data || !data.State) {
            debugApp(app, 'Error inspecting container');
            return setHealth(app, appdb.HEALTH_ERROR, callback);
        }
@@ -115,18 +113,6 @@ function checkAppHealth(app, callback) {
    });
 }

-function getContainerInfo(containerId, callback) {
-    docker.inspect(containerId, function (error, result) {
-        if (error) return callback(error);
-
-        const appId = safe.query(result, 'Config.Labels.appId', null);
-
-        if (!appId) return callback(null, null /* app */, { name: result.Name }); // addon
-
-        apps.get(appId, callback); // don't get by container id as this can be an exec container
-    });
-}
-
 /*
    OOM can be tested using stress tool like so:
        docker run -ti -m 100M cloudron/base:0.10.0 /bin/bash
@@ -145,21 +131,20 @@ function processDockerEvents(intervalSecs, callback) {

        stream.setEncoding('utf8');
        stream.on('data', function (data) {
-            const event = JSON.parse(data);
-            const containerId = String(event.id);
+            var ev = JSON.parse(data);
+            appdb.getByContainerId(ev.id, function (error, app) { // this can error for addons
+                var program = error || !app.appStoreId ? ev.id : app.appStoreId;
+                var context = JSON.stringify(ev);
+                var now = Date.now();
+                if (app) context = context + '\n\n' + JSON.stringify(app, null, 4) + '\n';

-            getContainerInfo(containerId, function (error, app, addon) {
-                const program = error ? containerId : (app ? app.fqdn : addon.name);
-                const now = Date.now();
-                const notifyUser = !(app && app.debugMode) && ((now - gLastOomMailTime) > OOM_EVENT_LIMIT);
+                const notifyUser = (!app || !app.debugMode) && (now - gLastOomMailTime > OOM_MAIL_LIMIT);

-                debug('OOM %s notifyUser: %s. lastOomTime: %s (now: %s)', program, notifyUser, gLastOomMailTime, now);
+                debug('OOM Context: %s. notifyUser: %s. lastOomTime: %s (now: %s)', context, notifyUser, gLastOomMailTime, now);

                // do not send mails for dev apps
                if (notifyUser) {
-                    // app can be null for addon containers
-                    eventlog.add(eventlog.ACTION_APP_OOM, auditSource.HEALTH_MONITOR, { event: event, containerId: containerId, addon: addon || null, app: app || null });
-
+                    mailer.oomEvent(program, context); // app can be null if it's an addon crash
                    gLastOomMailTime = now;
                }
            });
@@ -8,9 +8,7 @@ exports = module.exports = {
    removeRestrictedFields: removeRestrictedFields,

    get: get,
-    getByContainerId: getByContainerId,
    getByIpAddress: getByIpAddress,
-    getByFqdn: getByFqdn,
    getAll: getAll,
    getAllByUser: getAllByUser,
    install: install,
@@ -34,14 +32,12 @@ exports = module.exports = {

    checkManifestConstraints: checkManifestConstraints,

-    canAutoupdateApp: canAutoupdateApp,
    autoupdateApps: autoupdateApps,

    restoreInstalledApps: restoreInstalledApps,
    configureInstalledApps: configureInstalledApps,

    getAppConfig: getAppConfig,
-    getDataDir: getDataDir,

    downloadFile: downloadFile,
    uploadFile: uploadFile,
@@ -77,7 +73,6 @@ var appdb = require('./appdb.js'),
    fs = require('fs'),
    mail = require('./mail.js'),
    manifestFormat = require('cloudron-manifestformat'),
-    once = require('once'),
    os = require('os'),
    path = require('path'),
    paths = require('./paths.js'),
@@ -90,6 +85,7 @@ var appdb = require('./appdb.js'),
    taskmanager = require('./taskmanager.js'),
    TransformStream = require('stream').Transform,
    updateChecker = require('./updatechecker.js'),
+    url = require('url'),
    util = require('util'),
    uuid = require('uuid'),
    validator = require('validator'),
@@ -124,7 +120,7 @@ AppsError.BAD_FIELD = 'Bad Field';
 AppsError.BAD_STATE = 'Bad State';
 AppsError.PORT_RESERVED = 'Port Reserved';
 AppsError.PORT_CONFLICT = 'Port Conflict';
-AppsError.PLAN_LIMIT = 'Plan Limit';
+AppsError.BILLING_REQUIRED = 'Billing Required';
 AppsError.ACCESS_DENIED = 'Access denied';
 AppsError.BAD_CERTIFICATE = 'Invalid certificate';

@@ -142,8 +138,7 @@ function validatePortBindings(portBindings, manifest) {
        53, /* dns */
        80, /* http */
        143, /* imap */
-        202, /* alternate ssh */
-        222, /* proftd */
+        202, /* caas ssh */
        443, /* https */
        465, /* smtps */
        587, /* submission */
@@ -201,6 +196,21 @@ function translatePortBindings(portBindings, manifest) {
    return result;
 }

+function postProcess(app) {
+    let result = {};
+    for (let portName in app.portBindings) {
+        result[portName] = app.portBindings[portName].hostPort;
+    }
+    app.portBindings = result;
+}
+
+function addSpacesSuffix(location, user) {
+    if (user.admin || !config.isSpacesEnabled()) return location;
+
+    const spacesSuffix = user.username.replace(/\./g, '-');
+    return location === '' ? spacesSuffix : `${location}-${spacesSuffix}`;
+}
+
 function validateAccessRestriction(accessRestriction) {
    assert.strictEqual(typeof accessRestriction, 'object');

@@ -240,6 +250,20 @@ function validateMemoryLimit(manifest, memoryLimit) {
    return null;
 }

+// https://tools.ietf.org/html/rfc7034
+function validateXFrameOptions(xFrameOptions) {
+    assert.strictEqual(typeof xFrameOptions, 'string');
+
+    if (xFrameOptions === 'DENY') return null;
+    if (xFrameOptions === 'SAMEORIGIN') return null;
+
+    var parts = xFrameOptions.split(' ');
+    if (parts.length !== 2 || parts[0] !== 'ALLOW-FROM') return new AppsError(AppsError.BAD_FIELD, 'xFrameOptions must be "DENY", "SAMEORIGIN" or "ALLOW-FROM uri"' );
+
+    var uri = url.parse(parts[1]);
+    return (uri.protocol === 'http:' || uri.protocol === 'https:') ? null : new AppsError(AppsError.BAD_FIELD, 'xFrameOptions ALLOW-FROM uri must be a valid http[s] uri' );
+}
+
 function validateDebugMode(debugMode) {
    assert.strictEqual(typeof debugMode, 'object');

@@ -262,31 +286,11 @@ function validateRobotsTxt(robotsTxt) {
 }

 function validateBackupFormat(format) {
-    assert.strictEqual(typeof format, 'string');
-
    if (format === 'tgz' || format == 'rsync') return null;

    return new AppsError(AppsError.BAD_FIELD, 'Invalid backup format');
 }

-function validateLabel(label) {
-    if (label === null) return null;
-
-    if (label.length > 128) return new AppsError(AppsError.BAD_FIELD, 'label must be less than 128');
-
-    return null;
-}
-
-function validateTags(tags) {
-    if (!Array.isArray(tags)) return new AppsError(AppsError.BAD_FIELD, 'tags must be an array of strings');
-    if (tags.length > 64) return new AppsError(AppsError.BAD_FIELD, 'Can only set up to 64 tags');
-
-    if (tags.some(tag => (!tag || typeof tag !== 'string'))) return new AppsError(AppsError.BAD_FIELD, 'tags must be an array of non-empty strings');
-    if (tags.some(tag => tag.length > 128)) return new AppsError(AppsError.BAD_FIELD, 'tag must be less than 128');
-
-    return null;
-}
-
 function validateEnv(env) {
    for (let key in env) {
        if (key.length > 512) return new AppsError(AppsError.BAD_FIELD, 'Max env var key length is 512');
@@ -297,62 +301,26 @@ function validateEnv(env) {
    return null;
 }

-function validateDataDir(dataDir) {
-    if (dataDir === '') return null; // revert back to default dataDir
-
-    if (path.resolve(dataDir) !== dataDir) return new AppsError(AppsError.BAD_FIELD, 'dataDir must be an absolute path');
-
-    // nfs shares will have the directory mounted already
-    let stat = safe.fs.lstatSync(dataDir);
-    if (stat) {
-        if (!stat.isDirectory()) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} is not a directory`);
-        let entries = safe.fs.readdirSync(dataDir);
-        if (!entries) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} could not be listed`);
-        if (entries.length !== 0) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} is not empty`);
-    }
-
-    // backup logic relies on paths not overlapping (because it recurses)
-    if (dataDir.startsWith(paths.APPS_DATA_DIR)) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} cannot be inside apps data`);
-
-    // if we made it this far, it cannot start with any of these realistically
-    const fhs = [ '/bin', '/boot', '/etc', '/lib', '/lib32', '/lib64', '/proc', '/run', '/sbin', '/tmp', '/usr' ];
-    if (fhs.some((p) => dataDir.startsWith(p))) return new AppsError(AppsError.BAD_FIELD, `dataDir ${dataDir} cannot be placed inside this location`);
-
-    return null;
-}
-
-function getDuplicateErrorDetails(error, location, domainObject, portBindings, alternateDomains) {
-    assert.strictEqual(error.reason, DatabaseError.ALREADY_EXISTS);
+function getDuplicateErrorDetails(location, portBindings, error) {
    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof domainObject, 'object');
    assert.strictEqual(typeof portBindings, 'object');
-    assert(Array.isArray(alternateDomains));
+    assert.strictEqual(error.reason, DatabaseError.ALREADY_EXISTS);

-    var match = error.message.match(/ER_DUP_ENTRY: Duplicate entry '(.*)' for key '(.*)'/);
+    var match = error.message.match(/ER_DUP_ENTRY: Duplicate entry '(.*)' for key/);
    if (!match) {
        debug('Unexpected SQL error message.', error);
-        return new AppsError(AppsError.INTERNAL_ERROR, error);
+        return new AppsError(AppsError.INTERNAL_ERROR);
    }

-    // check if the location or alternateDomains conflicts
-    if (match[2] === 'subdomain') {
-        // mysql reports a unique conflict with a dash: eg. domain:example.com subdomain:test => test-example.com
-        if (match[1] === `${location}-${domainObject.domain}`) return new AppsError(AppsError.ALREADY_EXISTS, `Domain '${domains.fqdn(location, domainObject)}' is in use`);
-
-        // check alternateDomains
-        let tmp = alternateDomains.filter(function (d) {
-            return match[1] === `${d.subdomain}-${d.domain}`;
-        });
-
-        if (tmp.length > 0) return new AppsError(AppsError.ALREADY_EXISTS, `Alternate domain '${tmp[0].subdomain}.${tmp[0].domain}' is in use`);
-    }
+    // check if the location conflicts
+    if (match[1] === location) return new AppsError(AppsError.ALREADY_EXISTS);

    // check if any of the port bindings conflict
    for (let portName in portBindings) {
        if (portBindings[portName] === parseInt(match[1])) return new AppsError(AppsError.PORT_CONFLICT, match[1]);
    }

-    return new AppsError(AppsError.ALREADY_EXISTS, `${match[2]} '${match[1]}' is in use`);
+    return new AppsError(AppsError.ALREADY_EXISTS);
 }

 // app configs that is useful for 'archival' into the app backup config.json
@@ -361,61 +329,35 @@ function getAppConfig(app) {
        manifest: app.manifest,
        location: app.location,
        domain: app.domain,
-        fqdn: app.fqdn,
        accessRestriction: app.accessRestriction,
        portBindings: app.portBindings,
        memoryLimit: app.memoryLimit,
-
+        xFrameOptions: app.xFrameOptions || 'SAMEORIGIN',
        robotsTxt: app.robotsTxt,
        sso: app.sso,
        alternateDomains: app.alternateDomains || [],
-        env: app.env,
-        dataDir: app.dataDir
+        env: app.env
    };
 }

-function getDataDir(app, dataDir) {
-    return dataDir || path.join(paths.APPS_DATA_DIR, app.id, 'data');
-}
-
 function removeInternalFields(app) {
    return _.pick(app,
        'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health',
        'location', 'domain', 'fqdn', 'mailboxName',
-        'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit',
-        'sso', 'debugMode', 'robotsTxt', 'enableBackup', 'creationTime', 'updateTime', 'ts', 'tags',
-        'label', 'alternateDomains', 'ownerId', 'env', 'enableAutomaticUpdate', 'dataDir');
+        'accessRestriction', 'manifest', 'portBindings', 'iconUrl', 'memoryLimit', 'xFrameOptions',
+        'sso', 'debugMode', 'robotsTxt', 'enableBackup', 'creationTime', 'updateTime', 'ts',
+        'alternateDomains', 'ownerId', 'env', 'enableAutomaticUpdate');
 }

-// non-admins can only see these
 function removeRestrictedFields(app) {
    return _.pick(app,
        'id', 'appStoreId', 'installationState', 'installationProgress', 'runState', 'health', 'ownerId',
-        'location', 'domain', 'fqdn', 'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts', 'tags', 'label');
+        'location', 'domain', 'fqdn', 'manifest', 'portBindings', 'iconUrl', 'creationTime', 'ts');
 }

 function getIconUrlSync(app) {
-    const iconUrl = '/api/v1/apps/' + app.id + '/icon';
-
-    const userIconPath = `${paths.APP_ICONS_DIR}/${app.id}.user.png`;
-    if (safe.fs.existsSync(userIconPath)) return iconUrl;
-
-    const appstoreIconPath = `${paths.APP_ICONS_DIR}/${app.id}.png`;
-    if (safe.fs.existsSync(appstoreIconPath)) return iconUrl;
-
-    return null;
-}
-
-function postProcess(app, domainObjectMap) {
-    let result = {};
-    for (let portName in app.portBindings) {
-        result[portName] = app.portBindings[portName].hostPort;
-    }
-    app.portBindings = result;
-
-    app.iconUrl = getIconUrlSync(app);
-    app.fqdn = domains.fqdn(app.location, domainObjectMap[app.domain]);
-    app.alternateDomains.forEach(function (ad) { ad.fqdn = domains.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+    var iconPath = paths.APP_ICONS_DIR + '/' + app.id + '.png';
+    return fs.existsSync(iconPath) ? '/api/v1/apps/' + app.id + '/icon' : null;
 }

 function hasAccessTo(app, user, callback) {
@@ -437,49 +379,25 @@ function hasAccessTo(app, user, callback) {
    callback(null, false);
 }

-function getDomainObjectMap(callback) {
+function get(appId, callback) {
+    assert.strictEqual(typeof appId, 'string');
    assert.strictEqual(typeof callback, 'function');

    domaindb.getAll(function (error, domainObjects) {
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        let domainObjectMap = {};
-        for (let d of domainObjects) { domainObjectMap[d.domain] = d; }
-
-        callback(null, domainObjectMap);
-    });
-}
-
-function get(appId, callback) {
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getDomainObjectMap(function (error, domainObjectMap) {
-        if (error) return callback(error);
-
        appdb.get(appId, function (error, app) {
            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-            postProcess(app, domainObjectMap);
+            postProcess(app);

-            callback(null, app);
-        });
-    });
-}
+            let domainObjectMap = {};
+            for (let d of domainObjects) { domainObjectMap[d.domain] = d; }

-function getByContainerId(containerId, callback) {
-    assert.strictEqual(typeof containerId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getDomainObjectMap(function (error, domainObjectMap) {
-        if (error) return callback(error);
-
-        appdb.getByContainerId(containerId, function (error, app) {
-            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
-            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-
-            postProcess(app, domainObjectMap);
+            app.iconUrl = getIconUrlSync(app);
+            app.fqdn = domains.fqdn(app.location, domainObjectMap[app.domain]);
+            app.alternateDomains.forEach(function (ad) { ad.fqdn = domains.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });

            callback(null, app);
        });
@@ -490,39 +408,63 @@ function getByIpAddress(ip, callback) {
    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    docker.getContainerIdByIp(ip, function (error, containerId) {
+    domaindb.getAll(function (error, domainObjects) {
        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        getByContainerId(containerId, callback);
-    });
-}
+        let domainObjectMap = {};
+        for (let d of domainObjects) { domainObjectMap[d.domain] = d; }

-function getByFqdn(fqdn, callback) {
-    assert.strictEqual(typeof fqdn, 'string');
-    assert.strictEqual(typeof callback, 'function');
+        docker.getContainerIdByIp(ip, function (error, containerId) {
+            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-    getAll(function (error, result) {
-        if (error) return callback(error);
+            appdb.getByContainerId(containerId, function (error, app) {
+                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
+                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-        var app = result.find(function (a) { return a.fqdn === fqdn; });
-        if (!app) return callback(new AppsError(AppsError.NOT_FOUND, 'No such app'));
+                postProcess(app);

-        callback(null, app);
+                domaindb.getAll(function (error, domainObjects) {
+                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+                    let domainObjectMap = {};
+                    for (let d of domainObjects) { domainObjectMap[d.domain] = d; }
+
+                    app.iconUrl = getIconUrlSync(app);
+                    app.fqdn = domains.fqdn(app.location, domainObjectMap[app.domain]);
+                    app.alternateDomains.forEach(function (ad) { ad.fqdn = domains.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+
+                    callback(null, app);
+                });
+            });
+        });
    });
 }

 function getAll(callback) {
    assert.strictEqual(typeof callback, 'function');

-    getDomainObjectMap(function (error, domainObjectMap) {
-        if (error) return callback(error);
+    domaindb.getAll(function (error, domainObjects) {
+        if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));
+
+        let domainObjectMap = {};
+        for (let d of domainObjects) { domainObjectMap[d.domain] = d; }

        appdb.getAll(function (error, apps) {
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-            apps.forEach((app) => postProcess(app, domainObjectMap));
+            apps.forEach(postProcess);

-            callback(null, apps);
+            async.eachSeries(apps, function (app, iteratorDone) {
+                app.iconUrl = getIconUrlSync(app);
+                app.fqdn = domains.fqdn(app.location, domainObjectMap[app.domain]);
+                app.alternateDomains.forEach(function (ad) { ad.fqdn = domains.fqdn(ad.subdomain, domainObjectMap[ad.domain]); });
+
+                iteratorDone(null, app);
+            }, function (error) {
+                if (error) return callback(error);
+
+                callback(null, apps);
+            });
        });
    });
 }
@@ -578,6 +520,7 @@ function install(data, user, auditSource, callback) {
        cert = data.cert || null,
        key = data.key || null,
        memoryLimit = data.memoryLimit || 0,
+        xFrameOptions = data.xFrameOptions || 'SAMEORIGIN',
        sso = 'sso' in data ? data.sso : null,
        debugMode = data.debugMode || null,
        robotsTxt = data.robotsTxt || null,
@@ -588,9 +531,7 @@ function install(data, user, auditSource, callback) {
        ownerId = data.ownerId,
        alternateDomains = data.alternateDomains || [],
        env = data.env || {},
-        mailboxName = data.mailboxName || '',
-        label = data.label || null,
-        tags = data.tags || [];
+        mailboxName = data.mailboxName || '';

    assert(data.appStoreId || data.manifest); // atleast one of them is required

@@ -612,6 +553,9 @@ function install(data, user, auditSource, callback) {
        error = validateMemoryLimit(manifest, memoryLimit);
        if (error) return callback(error);

+        error = validateXFrameOptions(xFrameOptions);
+        if (error) return callback(error);
+
        error = validateDebugMode(debugMode);
        if (error) return callback(error);

@@ -621,12 +565,6 @@ function install(data, user, auditSource, callback) {
        error = validateBackupFormat(backupFormat);
        if (error) return callback(error);

-        error = validateLabel(label);
-        if (error) return callback(error);
-
-        error = validateTags(tags);
-        if (error) return callback(error);
-
        if ('sso' in data && !('optionalSso' in manifest)) return callback(new AppsError(AppsError.BAD_FIELD, 'sso can only be specified for apps with optionalSso'));
        // if sso was unspecified, enable it by default if possible
        if (sso === null) sso = !!manifest.addons['ldap'] || !!manifest.addons['oauth'];
@@ -646,7 +584,7 @@ function install(data, user, auditSource, callback) {
        if (icon) {
            if (!validator.isBase64(icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64'));

-            if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.png'), Buffer.from(icon, 'base64'))) {
+            if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.png'), new Buffer(icon, 'base64'))) {
                return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
            }
        }
@@ -655,6 +593,9 @@ function install(data, user, auditSource, callback) {
            if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));

+            location = addSpacesSuffix(location, user);
+            alternateDomains.forEach(function (ad) { ad.subdomain = addSpacesSuffix(ad.subdomain, user); }); // TODO: validate these
+
            error = domains.validateHostname(location, domainObject);
            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message));

@@ -668,6 +609,7 @@ function install(data, user, auditSource, callback) {
            var data = {
                accessRestriction: accessRestriction,
                memoryLimit: memoryLimit,
+                xFrameOptions: xFrameOptions,
                sso: sso,
                debugMode: debugMode,
                mailboxName: mailboxName,
@@ -680,12 +622,25 @@ function install(data, user, auditSource, callback) {
            };

            appdb.add(appId, appStoreId, manifest, location, domain, ownerId, translatePortBindings(portBindings, manifest), data, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error, location, domainObject, portBindings, data.alternateDomains));
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, error.message));
                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                purchaseApp({ appId: appId, appstoreId: appStoreId, manifestId: manifest.id }, function (error) {
-                    if (error) return callback(error);
+                appstore.purchase(appId, { appstoreId: appStoreId, manifestId: manifest.id }, function (appstoreError) {
+                    // if purchase failed, rollback the appdb record
+                    if (appstoreError) {
+                        appdb.del(appId, function (error) {
+                            if (error) debug('install: Failed to rollback app installation.', error);
+
+                            if (appstoreError.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, appstoreError.message));
+                            if (appstoreError && appstoreError.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, appstoreError.message));
+                            if (appstoreError && appstoreError.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, appstoreError.message));
+
+                            callback(new AppsError(AppsError.INTERNAL_ERROR, appstoreError));
+                        });
+
+                        return;
+                    }

                    // save cert to boxdata/certs
                    if (cert && key) {
@@ -749,6 +704,12 @@ function configure(appId, data, user, auditSource, callback) {
            if (error) return callback(error);
        }

+        if ('xFrameOptions' in data) {
+            values.xFrameOptions = data.xFrameOptions;
+            error = validateXFrameOptions(values.xFrameOptions);
+            if (error) return callback(error);
+        }
+
        if ('debugMode' in data) {
            values.debugMode = data.debugMode;
            error = validateDebugMode(values.debugMode);
@@ -776,6 +737,7 @@ function configure(appId, data, user, auditSource, callback) {
        if ('alternateDomains' in data) {
            // TODO validate all subdomains [{ domain: '', subdomain: ''}]
            values.alternateDomains = data.alternateDomains;
+            values.alternateDomains.forEach(function (ad) { ad.subdomain = addSpacesSuffix(ad.subdomain, user); }); // TODO: validate these
        }

        if ('env' in data) {
@@ -784,40 +746,12 @@ function configure(appId, data, user, auditSource, callback) {
            if (error) return callback(error);
        }

-        if ('dataDir' in data && data.dataDir !== app.dataDir) {
-            error = validateDataDir(data.dataDir);
-            if (error) return callback(error);
-            values.dataDir = data.dataDir;
-        }
-
-        if ('label' in data) {
-            error = validateLabel(data.label);
-            if (error) return callback(error);
-            values.label = data.label;
-        }
-
-        if ('tags' in data) {
-            error = validateTags(data.tags);
-            if (error) return callback(error);
-            values.tags = data.tags;
-        }
-
-        if ('icon' in data) {
-            if (data.icon) {
-                if (!validator.isBase64(data.icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64'));
-
-                if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'), Buffer.from(data.icon, 'base64'))) {
-                    return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
-                }
-            } else {
-                safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'));
-            }
-        }
-
        domains.get(domain, function (error, domainObject) {
            if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, 'No such domain'));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));

+            location = addSpacesSuffix(location, user);
+
            error = domains.validateHostname(location, domainObject);
            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message));

@@ -837,10 +771,10 @@ function configure(appId, data, user, auditSource, callback) {

            values.oldConfig = getAppConfig(app);

-            debug(`configure: id:${appId}`);
+            debug('Will configure app with id:%s values:%j', appId, values);

            appdb.setInstallationCommand(appId, appdb.ISTATE_PENDING_CONFIGURE, values, function (error) {
-                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error, location, domainObject, portBindings, data.alternateDomains));
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new AppsError(AppsError.BAD_STATE));
                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

@@ -865,24 +799,36 @@ function update(appId, data, auditSource, callback) {
    assert.strictEqual(typeof auditSource, 'object');
    assert.strictEqual(typeof callback, 'function');

-    debug(`update: id:${appId}`);
+    debug('Will update app with id:%s', appId);

-    get(appId, function (error, app) {
+    downloadManifest(data.appStoreId, data.manifest, function (error, appStoreId, manifest) {
        if (error) return callback(error);

-        downloadManifest(data.appStoreId, data.manifest, function (error, appStoreId, manifest) {
+        var updateConfig = { };
+
+        error = manifestFormat.parse(manifest);
+        if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Manifest error:' + error.message));
+
+        error = checkManifestConstraints(manifest);
+        if (error) return callback(error);
+
+        updateConfig.manifest = manifest;
+
+        if ('icon' in data) {
+            if (data.icon) {
+                if (!validator.isBase64(data.icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64'));
+
+                if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.png'), new Buffer(data.icon, 'base64'))) {
+                    return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
+                }
+            } else {
+                safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, appId + '.png'));
+            }
+        }
+
+        get(appId, function (error, app) {
            if (error) return callback(error);

-            var updateConfig = { };
-
-            error = manifestFormat.parse(manifest);
-            if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Manifest error:' + error.message));
-
-            error = checkManifestConstraints(manifest);
-            if (error) return callback(error);
-
-            updateConfig.manifest = manifest;
-
            // prevent user from installing a app with different manifest id over an existing app
            // this allows cloudron install -f --app <appid> for an app installed from the appStore
            if (app.manifest.id !== updateConfig.manifest.id) {
@@ -891,25 +837,6 @@ function update(appId, data, auditSource, callback) {
                updateConfig.appStoreId = '';
            }

-            // suffix '0' if prerelease is missing for semver.lte to work as expected
-            const currentVersion = semver.prerelease(app.manifest.version) ? app.manifest.version : `${app.manifest.version}-0`;
-            const updateVersion = semver.prerelease(updateConfig.manifest.version) ? updateConfig.manifest.version : `${updateConfig.manifest.version}-0`;
-            if (app.appStoreId !== '' && semver.lte(updateVersion, currentVersion)) {
-                if (!data.force) return callback(new AppsError(AppsError.BAD_FIELD, 'Downgrades are not permitted for apps installed from AppStore. force to override'));
-            }
-
-            if ('icon' in data) {
-                if (data.icon) {
-                    if (!validator.isBase64(data.icon)) return callback(new AppsError(AppsError.BAD_FIELD, 'icon is not base64'));
-
-                    if (!safe.fs.writeFileSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'), Buffer.from(data.icon, 'base64'))) {
-                        return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Error saving icon:' + safe.error.message));
-                    }
-                } else {
-                    safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, appId + '.user.png'));
-                }
-            }
-
            // do not update apps in debug mode
            if (app.debugMode && !data.force) return callback(new AppsError(AppsError.BAD_STATE, 'debug mode enabled. force to override'));

@@ -941,19 +868,16 @@ function getLogs(appId, options, callback) {
    assert(options && typeof options === 'object');
    assert.strictEqual(typeof callback, 'function');

-    assert.strictEqual(typeof options.lines, 'number');
-    assert.strictEqual(typeof options.format, 'string');
-    assert.strictEqual(typeof options.follow, 'boolean');
-
    debug('Getting logs for %s', appId);

    get(appId, function (error, app) {
        if (error) return callback(error);

-        var lines = options.lines === -1 ? '+1' : options.lines,
+        var lines = options.lines || 100,
            format = options.format || 'json',
-            follow = options.follow;
+            follow = !!options.follow;

+        assert.strictEqual(typeof lines, 'number');
        assert.strictEqual(typeof format, 'string');

        var args = [ '--lines=' + lines ];
@@ -1028,7 +952,7 @@ function restore(appId, data, auditSource, callback) {

                taskmanager.restartAppTask(appId);

-                eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { app: app, backupId: backupInfo.id, fromManifest: app.manifest, toManifest: backupInfo.manifest });
+                eventlog.add(eventlog.ACTION_APP_RESTORE, auditSource, { appId: appId, app: app });

                callback(null);
            });
@@ -1036,29 +960,6 @@ function restore(appId, data, auditSource, callback) {
    });
 }

-function purchaseApp(data, callback) {
-    assert.strictEqual(typeof data, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    appstore.purchaseApp(data, function (error) {
-        if (!error) return callback();
-
-        // if purchase failed, rollback the appdb record
-        appdb.del(data.appId, function (delError) {
-            if (delError) debug('install: Failed to rollback app installation.', delError);
-
-            if (error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, error.message));
-            if (error && error.reason === AppstoreError.PLAN_LIMIT) return callback(new AppsError(AppsError.PLAN_LIMIT, error.message));
-            if (error && error.reason === AppstoreError.INVALID_TOKEN) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error && error.reason === AppstoreError.LICENSE_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error && error.reason === AppstoreError.NOT_REGISTERED) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-
-            callback(new AppsError(AppsError.INTERNAL_ERROR, error));
-        });
-    });
-}
-
 function clone(appId, data, user, auditSource, callback) {
    assert.strictEqual(typeof appId, 'string');
    assert.strictEqual(typeof data, 'object');
@@ -1111,6 +1012,7 @@ function clone(appId, data, user, auditSource, callback) {
                if (error && error.reason === DomainsError.NOT_FOUND) return callback(new AppsError(AppsError.EXTERNAL_ERROR, 'No such domain'));
                if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, 'Could not get domain info:' + error.message));

+                location = addSpacesSuffix(location, user);
                error = domains.validateHostname(location, domainObject);
                if (error) return callback(new AppsError(AppsError.BAD_FIELD, 'Bad location: ' + error.message));

@@ -1120,6 +1022,7 @@ function clone(appId, data, user, auditSource, callback) {
                    installationState: appdb.ISTATE_PENDING_CLONE,
                    memoryLimit: app.memoryLimit,
                    accessRestriction: app.accessRestriction,
+                    xFrameOptions: app.xFrameOptions,
                    restoreConfig: { backupId: backupId, backupFormat: backupInfo.format },
                    sso: !!app.sso,
                    mailboxName: mailboxName,
@@ -1129,11 +1032,24 @@ function clone(appId, data, user, auditSource, callback) {
                };

                appdb.add(newAppId, app.appStoreId, manifest, location, domain, ownerId, translatePortBindings(portBindings, manifest), data, function (error) {
-                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(error, location, domainObject, portBindings, []));
+                    if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(getDuplicateErrorDetails(location, portBindings, error));
                    if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

-                    purchaseApp({ appId: newAppId, appstoreId: app.appStoreId, manifestId: manifest.id }, function (error) {
-                        if (error) return callback(error);
+                    appstore.purchase(newAppId, { appstoreId: app.appStoreId, manifestId: manifest.id }, function (appstoreError) {
+                        // if purchase failed, rollback the appdb record
+                        if (appstoreError) {
+                            appdb.del(newAppId, function (error) {
+                                if (error) debug('install: Failed to rollback app installation.', error);
+
+                                if (appstoreError.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND, appstoreError.message));
+                                if (appstoreError && appstoreError.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, appstoreError.message));
+                                if (appstoreError && appstoreError.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, appstoreError.message));
+
+                                callback(new AppsError(AppsError.INTERNAL_ERROR, appstoreError));
+                            });
+
+                            return;
+                        }

                        taskmanager.restartAppTask(newAppId);

@@ -1162,10 +1078,9 @@ function uninstall(appId, auditSource, callback) {
    get(appId, function (error, app) {
        if (error) return callback(error);

-        appstore.unpurchaseApp(appId, { appstoreId: app.appStoreId, manifestId: app.manifest.id }, function (error) {
+        appstore.unpurchase(appId, { appstoreId: app.appStoreId, manifestId: app.manifest.id }, function (error) {
            if (error && error.reason === AppstoreError.NOT_FOUND) return callback(new AppsError(AppsError.NOT_FOUND));
-            if (error && error.reason === AppstoreError.INVALID_TOKEN) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
-            if (error && error.reason === AppstoreError.LICENSE_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
+            if (error && error.reason === AppstoreError.BILLING_REQUIRED) return callback(new AppsError(AppsError.BILLING_REQUIRED, error.message));
            if (error && error.reason === AppstoreError.EXTERNAL_ERROR) return callback(new AppsError(AppsError.EXTERNAL_ERROR, error.message));
            if (error) return callback(new AppsError(AppsError.INTERNAL_ERROR, error));

@@ -1218,8 +1133,6 @@ function stop(appId, callback) {
 function checkManifestConstraints(manifest) {
    assert(manifest && typeof manifest === 'object');

-    if (manifest.manifestVersion > 2) return new AppsError(AppsError.BAD_FIELD, 'Manifest version must be <= 2');
-
    if (!manifest.dockerImage) return new AppsError(AppsError.BAD_FIELD, 'Missing dockerImage'); // dockerImage is optional in manifest

    if (semver.valid(manifest.maxBoxVersion) && semver.gt(config.version(), manifest.maxBoxVersion)) {
@@ -1297,27 +1210,27 @@ function exec(appId, options, callback) {
    });
 }

-function canAutoupdateApp(app, newManifest) {
-    if (!app.enableAutomaticUpdate) return new Error('Automatic update disabled');
-    if ((semver.major(app.manifest.version) !== 0) && (semver.major(app.manifest.version) !== semver.major(newManifest.version))) return new Error('Major version change'); // major changes are blocking
-
-    const newTcpPorts = newManifest.tcpPorts || { };
-    const newUdpPorts = newManifest.udpPorts || { };
-    const portBindings = app.portBindings; // this is never null
-
-    for (let portName in portBindings) {
-        if (!(portName in newTcpPorts) && !(portName in newUdpPorts)) return new Error(`${portName} was in use but new update removes it`);
-    }
-
-    // it's fine if one or more (unused) keys got removed
-    return null;
-}
-
 function autoupdateApps(updateInfo, auditSource, callback) { // updateInfo is { appId -> { manifest } }
    assert.strictEqual(typeof updateInfo, 'object');
    assert.strictEqual(typeof auditSource, 'object');
    assert.strictEqual(typeof callback, 'function');

+    function canAutoupdateApp(app, newManifest) {
+        if (!app.enableAutomaticUpdate) return new Error('Automatic update disabled');
+        if ((semver.major(app.manifest.version) !== 0) && (semver.major(app.manifest.version) !== semver.major(newManifest.version))) return new Error('Major version change'); // major changes are blocking
+
+        const newTcpPorts = newManifest.tcpPorts || { };
+        const newUdpPorts = newManifest.udpPorts || { };
+        const portBindings = app.portBindings; // this is never null
+
+        for (let portName in portBindings) {
+            if (!(portName in newTcpPorts) && !(portName in newUdpPorts)) return new Error(`${portName} was in use but new update removes it`);
+        }
+
+        // it's fine if one or more (unused) keys got removed
+        return null;
+    }
+
    if (!updateInfo) return callback(null);

    async.eachSeries(Object.keys(updateInfo), function iterator(appId, iteratorDone) {
@@ -1431,7 +1344,6 @@ function downloadFile(appId, filePath, callback) {
    assert.strictEqual(typeof filePath, 'string');
    assert.strictEqual(typeof callback, 'function');

-    debug(`downloadFile: ${filePath}`); // no need to escape filePath because we don't rely on bash
    exec(appId, { cmd: [ 'stat', '--printf=%F-%s', filePath ], tty: true }, function (error, stream) {
        if (error) return callback(error);

@@ -1464,7 +1376,7 @@ function downloadFile(appId, filePath, callback) {
                    transform: function (chunk, ignoredEncoding, callback) {
                        this._buffer = this._buffer ? Buffer.concat([this._buffer, chunk]) : chunk;

-                        for (;;) {
+                        while (true) {
                            if (this._buffer.length < 8) break; // header is 8 bytes

                            var type = this._buffer.readUInt8(0);
@@ -1497,26 +1409,15 @@ function uploadFile(appId, sourceFilePath, destFilePath, callback) {
    assert.strictEqual(typeof destFilePath, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const done = once(function (error) {
-        safe.fs.unlinkSync(sourceFilePath); // remove file in /tmp
-        callback(error);
-    });
-
-    // the built-in bash printf understands "%q" but not /usr/bin/printf.
-    // ' gets replaced with '\'' . the first closes the quote and last one starts a new one
-    const escapedDestFilePath = safe.child_process.execSync(`printf %q '${destFilePath.replace(/'/g, '\'\\\'\'')}'`, { shell: '/bin/bash', encoding: 'utf8' });
-    debug(`uploadFile: ${sourceFilePath} -> ${escapedDestFilePath}`);
-
-    exec(appId, { cmd: [ 'bash', '-c', `cat - > ${escapedDestFilePath}` ], tty: false }, function (error, stream) {
-        if (error) return done(error);
+    exec(appId, { cmd: [ 'bash', '-c', 'cat - > ' + destFilePath ], tty: false }, function (error, stream) {
+        if (error) return callback(error);

        var readFile = fs.createReadStream(sourceFilePath);
-        readFile.on('error', done);
-
-        stream.on('error', done);
-        stream.on('finish', done);
+        readFile.on('error', callback);

        readFile.pipe(stream);
+
+        callback(null);
    });
 }

@@ -1,15 +1,8 @@
 'use strict';

 exports = module.exports = {
-    getApps: getApps,
-    getApp: getApp,
-    getAppVersion: getAppVersion,
-
-    registerWithLoginCredentials: registerWithLoginCredentials,
-    registerWithLicense: registerWithLicense,
-
-    purchaseApp: purchaseApp,
-    unpurchaseApp: unpurchaseApp,
+    purchase: purchase,
+    unpurchase: unpurchase,

    getSubscription: getSubscription,
    isFreePlan: isFreePlan,
@@ -19,7 +12,9 @@ exports = module.exports = {
    getAppUpdate: getAppUpdate,
    getBoxUpdate: getBoxUpdate,

-    createTicket: createTicket,
+    getAccount: getAccount,
+
+    sendFeedback: sendFeedback,

    AppstoreError: AppstoreError
 };
@@ -28,7 +23,6 @@ var apps = require('./apps.js'),
    assert = require('assert'),
    async = require('async'),
    config = require('./config.js'),
-    custom = require('./custom.js'),
    debug = require('debug')('box:appstore'),
    domains = require('./domains.js'),
    eventlog = require('./eventlog.js'),
@@ -61,85 +55,37 @@ function AppstoreError(reason, errorOrMessage) {
 util.inherits(AppstoreError, Error);
 AppstoreError.INTERNAL_ERROR = 'Internal Error';
 AppstoreError.EXTERNAL_ERROR = 'External Error';
-AppstoreError.ALREADY_EXISTS = 'Already Exists';
-AppstoreError.ACCESS_DENIED = 'Access Denied';
-AppstoreError.NOT_FOUND = 'Not Found';
-AppstoreError.PLAN_LIMIT = 'Plan limit reached'; // upstream 402 (subsciption_expired and subscription_required)
-AppstoreError.LICENSE_ERROR = 'License Error'; // upstream 422 (no license, invalid license)
-AppstoreError.INVALID_TOKEN = 'Invalid token'; // upstream 401 (invalid token)
-AppstoreError.NOT_REGISTERED = 'Not registered'; // upstream 412 (no token, not set yet)
-AppstoreError.ALREADY_REGISTERED = 'Already registered';
+AppstoreError.NOT_FOUND = 'Internal Error';
+AppstoreError.BILLING_REQUIRED = 'Billing Required';

 var NOOP_CALLBACK = function (error) { if (error) debug(error); };

-function getCloudronToken(callback) {
+function getAppstoreConfig(callback) {
    assert.strictEqual(typeof callback, 'function');

-    settings.getCloudronToken(function (error, token) {
+    settings.getAppstoreConfig(function (error, result) {
        if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-        if (!token) return callback(new AppstoreError(AppstoreError.NOT_REGISTERED));
+        if (!result.token) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));

-        callback(null, token);
-    });
-}
-
-function login(email, password, totpToken, callback) {
-    assert.strictEqual(typeof email, 'string');
-    assert.strictEqual(typeof password, 'string');
-    assert.strictEqual(typeof totpToken, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var data = {
-        email: email,
-        password: password,
-        totpToken: totpToken
-    };
-
-    const url = config.apiServerOrigin() + '/api/v1/login';
-    superagent.post(url).send(data).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-        if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.ACCESS_DENIED));
-        if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, `login status code: ${result.statusCode}`));
-
-        callback(null, result.body); // { userId, accessToken }
-    });
-}
-
-function registerUser(email, password, callback) {
-    assert.strictEqual(typeof email, 'string');
-    assert.strictEqual(typeof password, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var data = {
-        email: email,
-        password: password,
-    };
-
-    const url = config.apiServerOrigin() + '/api/v1/register_user';
-    superagent.post(url).send(data).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-        if (result.statusCode === 409) return callback(new AppstoreError(AppstoreError.ALREADY_EXISTS));
-        if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, `register status code: ${result.statusCode}`));
-
-        callback(null);
+        callback(null, result);
    });
 }

 function getSubscription(callback) {
    assert.strictEqual(typeof callback, 'function');

-    getCloudronToken(function (error, token) {
+    getAppstoreConfig(function (error, appstoreConfig) {
        if (error) return callback(error);

-        const url = config.apiServerOrigin() + '/api/v1/subscription';
-        superagent.get(url).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
+        const url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/subscription';
+        superagent.get(url).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-            if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-            if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR));
-            if (result.statusCode === 502) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, `Stripe error: ${error.message}`));
-            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, `Unknown error: ${error.message}`));
+            if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'invalid appstore token'));
+            if (result.statusCode === 403) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'wrong user'));
+            if (result.statusCode === 502) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'stripe error'));
+            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'unknown error'));

-            callback(null, result.body); // { email, subscription }
+            callback(null, result.body.subscription);
        });
    });
 }
@@ -149,24 +95,22 @@ function isFreePlan(subscription) {
 }

 // See app.js install it will create a db record first but remove it again if appstore purchase fails
-function purchaseApp(data, callback) {
-    assert.strictEqual(typeof data, 'object'); // { appstoreId, manifestId, appId }
+function purchase(appId, data, callback) {
+    assert.strictEqual(typeof appId, 'string');
+    assert.strictEqual(typeof data, 'object');
    assert(data.appstoreId || data.manifestId);
-    assert.strictEqual(typeof data.appId, 'string');
    assert.strictEqual(typeof callback, 'function');

-    getCloudronToken(function (error, token) {
+    getAppstoreConfig(function (error, appstoreConfig) {
        if (error) return callback(error);

-        const url = `${config.apiServerOrigin()}/api/v1/cloudronapps`;
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/apps/' + appId;

-        superagent.post(url).send(data).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
+        superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-            if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND)); // appstoreId does not exist
-            if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-            if (result.statusCode === 402) return callback(new AppstoreError(AppstoreError.PLAN_LIMIT, result.body.message));
-            if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
-            // 200 if already purchased, 201 is newly purchased
+            if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
+            if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
+            if (result.statusCode === 402) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED, result.body.message));
            if (result.statusCode !== 201 && result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App purchase failed. %s %j', result.status, result.body)));

            callback(null);
@@ -174,27 +118,26 @@ function purchaseApp(data, callback) {
    });
 }

-function unpurchaseApp(appId, data, callback) {
+function unpurchase(appId, data, callback) {
    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof data, 'object'); // { appstoreId, manifestId }
+    assert.strictEqual(typeof data, 'object');
    assert(data.appstoreId || data.manifestId);
    assert.strictEqual(typeof callback, 'function');

-    getCloudronToken(function (error, token) {
+    getAppstoreConfig(function (error, appstoreConfig) {
        if (error) return callback(error);

-        const url = `${config.apiServerOrigin()}/api/v1/cloudronapps/${appId}`;
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/apps/' + appId;

-        superagent.get(url).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
-            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
+        superagent.get(url).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
+            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+            if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
            if (result.statusCode === 404) return callback(null);   // was never purchased
-            if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-            if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
            if (result.statusCode !== 201 && result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App unpurchase failed. %s %j', result.status, result.body)));

-            superagent.del(url).send(data).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
+            superagent.del(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
-                if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.BILLING_REQUIRED));
                if (result.statusCode !== 204) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App unpurchase failed. %s %j', result.status, result.body)));

                callback(null);
@@ -274,15 +217,13 @@ function sendAliveStatus(callback) {
            }
        };

-        getCloudronToken(function (error, token) {
+        getAppstoreConfig(function (error, appstoreConfig) {
            if (error) return callback(error);

-            const url = `${config.apiServerOrigin()}/api/v1/alive`;
-            superagent.post(url).send(data).query({ accessToken: token }).timeout(30 * 1000).end(function (error, result) {
+            var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/alive';
+            superagent.post(url).send(data).query({ accessToken: appstoreConfig.token }).timeout(30 * 1000).end(function (error, result) {
                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
                if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
-                if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-                if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
                if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Sending alive status failed. %s %j', result.status, result.body)));

                callback(null);
@@ -294,15 +235,13 @@ function sendAliveStatus(callback) {
 function getBoxUpdate(callback) {
    assert.strictEqual(typeof callback, 'function');

-    getCloudronToken(function (error, token) {
+    getAppstoreConfig(function (error, appstoreConfig) {
        if (error) return callback(error);

-        const url = `${config.apiServerOrigin()}/api/v1/boxupdate`;
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/boxupdate';

-        superagent.get(url).query({ accessToken: token, boxVersion: config.version() }).timeout(10 * 1000).end(function (error, result) {
+        superagent.get(url).query({ accessToken: appstoreConfig.token, boxVersion: config.version() }).timeout(10 * 1000).end(function (error, result) {
            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-            if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-            if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
            if (result.statusCode === 204) return callback(null); // no update
            if (result.statusCode !== 200 || !result.body) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));

@@ -312,14 +251,7 @@ function getBoxUpdate(callback) {
                return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Invalid update version: %s %s', result.statusCode, result.text)));
            }

-            // updateInfo: { version, changelog, sourceTarballUrl, sourceTarballSigUrl, boxVersionsUrl, boxVersionsSigUrl }
-            if (!updateInfo.version || typeof updateInfo.version !== 'string') return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response (bad version): %s %s', result.statusCode, result.text)));
-            if (!updateInfo.changelog || !Array.isArray(updateInfo.changelog)) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response (bad version): %s %s', result.statusCode, result.text)));
-            if (!updateInfo.sourceTarballUrl || typeof updateInfo.sourceTarballUrl !== 'string') return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response (bad sourceTarballUrl): %s %s', result.statusCode, result.text)));
-            if (!updateInfo.sourceTarballSigUrl || typeof updateInfo.sourceTarballSigUrl !== 'string') return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response (bad sourceTarballSigUrl): %s %s', result.statusCode, result.text)));
-            if (!updateInfo.boxVersionsUrl || typeof updateInfo.boxVersionsUrl !== 'string') return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response (bad boxVersionsUrl): %s %s', result.statusCode, result.text)));
-            if (!updateInfo.boxVersionsSigUrl || typeof updateInfo.boxVersionsSigUrl !== 'string') return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response (bad boxVersionsSigUrl): %s %s', result.statusCode, result.text)));
-
+            // updateInfo: { version, changelog, upgrade, sourceTarballUrl, sourceTarballSigUrl, boxVersionsUrl, boxVersionsSigUrl }
            callback(null, updateInfo);
        });
    });
@@ -329,15 +261,13 @@ function getAppUpdate(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');

-    getCloudronToken(function (error, token) {
+    getAppstoreConfig(function (error, appstoreConfig) {
        if (error) return callback(error);

-        const url = `${config.apiServerOrigin()}/api/v1/appupdate`;
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/appupdate';

-        superagent.get(url).query({ accessToken: token, boxVersion: config.version(), appId: app.appStoreId, appVersion: app.manifest.version }).timeout(10 * 1000).end(function (error, result) {
+        superagent.get(url).query({ accessToken: appstoreConfig.token, boxVersion: config.version(), appId: app.appStoreId, appVersion: app.manifest.version }).timeout(10 * 1000).end(function (error, result) {
            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
-            if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-            if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
            if (result.statusCode === 204) return callback(null); // no update
            if (result.statusCode !== 200 || !result.body) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));

@@ -358,73 +288,25 @@ function getAppUpdate(app, callback) {
    });
 }

-function registerCloudron(data, callback) {
-    assert.strictEqual(typeof data, 'object');
+function getAccount(callback) {
    assert.strictEqual(typeof callback, 'function');

-    const url = `${config.apiServerOrigin()}/api/v1/register_cloudron`;
+    getAppstoreConfig(function (error, appstoreConfig) {
+        if (error) return callback(error);

-    superagent.post(url).send(data).timeout(30 * 1000).end(function (error, result) {
-        if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-        if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, `Unable to register cloudron: ${error.message}`));
+        var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId;

-        // cloudronId, token, licenseKey
-        if (!result.body.cloudronId) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'Invalid response - no cloudron id'));
-        if (!result.body.cloudronToken) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'Invalid response - no token'));
-        if (!result.body.licenseKey) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, 'Invalid response - no license'));
+        superagent.get(url).query({ accessToken: appstoreConfig.token }).timeout(10 * 1000).end(function (error, result) {
+            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
+            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));

-        async.series([
-            settings.setCloudronId.bind(null, result.body.cloudronId),
-            settings.setCloudronToken.bind(null, result.body.cloudronToken),
-            settings.setLicenseKey.bind(null, result.body.licenseKey),
-        ], function (error) {
-            if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-
-            debug(`registerCloudron: Cloudron registered with id ${result.body.cloudronId}`);
-
-            callback();
+            // { profile: { id, email, groupId, billing, firstName, lastName, company, street, city, zip, state, country } }
+            callback(null, result.body.profile);
        });
    });
 }

-function registerWithLicense(license, domain, callback) {
-    assert.strictEqual(typeof license, 'string');
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getCloudronToken(function (error, token) {
-        if (token) return callback(new AppstoreError(AppstoreError.ALREADY_REGISTERED));
-
-        registerCloudron({ license, domain }, callback);
-    });
-}
-
-function registerWithLoginCredentials(options, callback) {
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    function maybeSignup(done) {
-        if (!options.signup) return done();
-
-        registerUser(options.email, options.password, done);
-    }
-
-    getCloudronToken(function (error, token) {
-        if (token) return callback(new AppstoreError(AppstoreError.ALREADY_REGISTERED));
-
-        maybeSignup(function (error) {
-            if (error) return callback(error);
-
-            login(options.email, options.password, options.totpToken || '', function (error, result) {
-                if (error) return callback(error);
-
-                registerCloudron({ domain: config.adminDomain(), accessToken: result.accessToken }, callback);
-            });
-        });
-    });
-}
-
-function createTicket(info, callback) {
+function sendFeedback(info, callback) {
    assert.strictEqual(typeof info, 'object');
    assert.strictEqual(typeof info.email, 'string');
    assert.strictEqual(typeof info.displayName, 'string');
@@ -438,21 +320,17 @@ function createTicket(info, callback) {
        apps.get(info.appId, callback);
    }

-    getCloudronToken(function (error, token) {
+    getAppstoreConfig(function (error, appstoreConfig) {
        if (error) return callback(error);

        collectAppInfoIfNeeded(function (error, result) {
            if (error) console.error('Unable to get app info', error);
            if (result) info.app = result;

-            let url = config.apiServerOrigin() + '/api/v1/ticket';
+            var url = config.apiServerOrigin() + '/api/v1/users/' + appstoreConfig.userId + '/cloudrons/' + appstoreConfig.cloudronId + '/feedback';

-            info.supportEmail = custom.spec().support.email; // destination address for tickets
-
-            superagent.post(url).query({ accessToken: token }).send(info).timeout(10 * 1000).end(function (error, result) {
-                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-                if (result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-                if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
+            superagent.post(url).query({ accessToken: appstoreConfig.token }).send(info).timeout(10 * 1000).end(function (error, result) {
+                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error));
                if (result.statusCode !== 201) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));

                callback(null);
@@ -460,55 +338,3 @@ function createTicket(info, callback) {
        });
    });
 }
-
-function getApps(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    getCloudronToken(function (error, token) {
-        if (error) return callback(error);
-
-        settings.getUnstableAppsConfig(function (error, unstable) {
-            if (error) return callback(new AppstoreError(AppstoreError.INTERNAL_ERROR, error));
-            const url = `${config.apiServerOrigin()}/api/v1/apps`;
-            superagent.get(url).query({ accessToken: token, boxVersion: config.version(), unstable: unstable }).timeout(10 * 1000).end(function (error, result) {
-                if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-                if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-                if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
-                if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App listing failed. %s %j', result.status, result.body)));
-                if (!result.body.apps) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('Bad response: %s %s', result.statusCode, result.text)));
-
-                callback(null, result.body.apps);
-            });
-        });
-    });
-}
-
-function getAppVersion(appId, version, callback) {
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof version, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getCloudronToken(function (error, token) {
-        if (error) return callback(error);
-
-        let url = `${config.apiServerOrigin()}/api/v1/apps/${appId}`;
-        if (version !== 'latest') url += `/versions/${version}`;
-
-        superagent.get(url).query({ accessToken: token }).timeout(10 * 1000).end(function (error, result) {
-            if (error && !error.response) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, error.message));
-            if (result.statusCode === 403 || result.statusCode === 401) return callback(new AppstoreError(AppstoreError.INVALID_TOKEN));
-            if (result.statusCode === 404) return callback(new AppstoreError(AppstoreError.NOT_FOUND));
-            if (result.statusCode === 422) return callback(new AppstoreError(AppstoreError.LICENSE_ERROR, result.body.message));
-            if (result.statusCode !== 200) return callback(new AppstoreError(AppstoreError.EXTERNAL_ERROR, util.format('App fetch failed. %s %j', result.status, result.body)));
-
-            callback(null, result.body);
-        });
-    });
-}
-
-function getApp(appId, callback) {
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getAppVersion(appId, 'latest', callback);
-}
@@ -25,7 +25,6 @@ var addons = require('./addons.js'),
    apps = require('./apps.js'),
    assert = require('assert'),
    async = require('async'),
-    auditsource = require('./auditsource.js'),
    backups = require('./backups.js'),
    config = require('./config.js'),
    database = require('./database.js'),
@@ -35,7 +34,6 @@ var addons = require('./addons.js'),
    domains = require('./domains.js'),
    DomainsError = domains.DomainsError,
    ejs = require('ejs'),
-    eventlog = require('./eventlog.js'),
    fs = require('fs'),
    manifestFormat = require('cloudron-manifestformat'),
    mkdirp = require('mkdirp'),
@@ -54,7 +52,6 @@ var addons = require('./addons.js'),

 var COLLECTD_CONFIG_EJS = fs.readFileSync(__dirname + '/collectd.config.ejs', { encoding: 'utf8' }),
    CONFIGURE_COLLECTD_CMD = path.join(__dirname, 'scripts/configurecollectd.sh'),
-    MV_VOLUME_CMD = path.join(__dirname, 'scripts/mvvolume.sh'),
    LOGROTATE_CONFIG_EJS = fs.readFileSync(__dirname + '/logrotate.ejs', { encoding: 'utf8' }),
    CONFIGURE_LOGROTATE_CMD = path.join(__dirname, 'scripts/configurelogrotate.sh');

@@ -138,14 +135,27 @@ function createContainer(app, callback) {
    });
 }

-function deleteContainers(app, options, callback) {
+// Only delete the main container of the app, not destroy any docker addon created ones
+function deleteMainContainer(app, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    debugApp(app, 'deleting main app container');
+
+    docker.deleteContainer(app.containerId, function (error) {
+        if (error) return callback(new Error('Error deleting container: ' + error));
+
+        updateApp(app, { containerId: null }, callback);
+    });
+}
+
+function deleteContainers(app, callback) {
    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof callback, 'function');

    debugApp(app, 'deleting app containers (app, scheduler)');

-    docker.deleteContainers(app.id, options, function (error) {
+    docker.deleteContainers(app.id, function (error) {
        if (error) return callback(new Error('Error deleting container: ' + error));

        updateApp(app, { containerId: null }, callback);
@@ -177,7 +187,6 @@ function deleteAppDir(app, options, callback) {
        if (!entries) return callback(`Error listing ${resolvedAppDataDir}: ${safe.error.message}`);

        // remove only files. directories inside app dir are currently volumes managed by the addons
-        // we cannot delete those dirs anyway because of perms
        entries.forEach(function (entry) {
            let stat = safe.fs.statSync(path.join(resolvedAppDataDir, entry));
            if (stat && !stat.isDirectory()) safe.fs.unlinkSync(path.join(resolvedAppDataDir, entry));
@@ -297,8 +306,7 @@ function registerSubdomain(app, overwrite, callback) {

            // get the current record before updating it
            domains.getDnsRecords(app.location, app.domain, 'A', function (error, values) {
-                if (error && error.reason === DomainsError.EXTERNAL_ERROR) return retryCallback(error); // try again
-                if (error) return retryCallback(null, error); // give up for access and other errors
+                if (error) return retryCallback(error);

                // refuse to update any existing DNS record for custom domains that we did not create
                if (values.length !== 0 && !overwrite) return retryCallback(null, new Error('DNS Record already exists'));
@@ -420,15 +428,10 @@ function removeIcon(app, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof callback, 'function');

-    if (!safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, app.id + '.png'))) {
-        if (safe.error.code !== 'ENOENT') debugApp(app, 'cannot remove icon : %s', safe.error);
-    }
-
-    if (!safe.fs.unlinkSync(path.join(paths.APP_ICONS_DIR, app.id + '.user.png'))) {
-        if (safe.error.code !== 'ENOENT') debugApp(app, 'cannot remove user icon : %s', safe.error);
-    }
-
-    callback(null);
+    fs.unlink(path.join(paths.APP_ICONS_DIR, app.id + '.png'), function (error) {
+        if (error && error.code !== 'ENOENT') debugApp(app, 'cannot remove icon : %s', error);
+        callback(null);
+    });
 }

 function cleanupLogs(app, callback) {
@@ -466,19 +469,6 @@ function waitForDnsPropagation(app, callback) {
    });
 }

-function migrateDataDir(app, sourceDir, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof sourceDir, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    let resolvedSourceDir = apps.getDataDir(app, sourceDir);
-    let resolvedTargetDir = apps.getDataDir(app, app.dataDir);
-
-    debug(`migrateDataDir: migrating data from ${resolvedSourceDir} to ${resolvedTargetDir}`);
-
-    shell.sudo('migrateDataDir', [ MV_VOLUME_CMD, resolvedSourceDir, resolvedTargetDir ], {}, callback);
-}
-
 // Ordering is based on the following rationale:
 //   - configure nginx, icon, oauth
 //   - register subdomain.
@@ -507,14 +497,14 @@ function install(app, callback) {
        removeCollectdProfile.bind(null, app),
        removeLogrotateConfig.bind(null, app),
        stopApp.bind(null, app),
-        deleteContainers.bind(null, app, { managedOnly: true }),
+        deleteMainContainer.bind(null, app),
        function teardownAddons(next) {
            // when restoring, app does not require these addons anymore. remove carefully to preserve the db passwords
            var addonsToRemove = !isRestoring ? app.manifest.addons : _.omit(app.oldConfig.manifest.addons, Object.keys(app.manifest.addons));

            addons.teardownAddons(app, addonsToRemove, next);
        },
-        deleteAppDir.bind(null, app, { removeDirectory: false }), // do not remove any symlinked appdata dir
+        deleteAppDir.bind(null, app, { removeDirectory: false }), // do not remove any symlinked volume

        // for restore case
        function deleteImageIfChanged(done) {
@@ -537,7 +527,7 @@ function install(app, callback) {
        updateApp.bind(null, app, { installationProgress: '40, Downloading image' }),
        docker.downloadImage.bind(null, app.manifest),

-        updateApp.bind(null, app, { installationProgress: '50, Creating app data directory' }),
+        updateApp.bind(null, app, { installationProgress: '50, Creating volume' }),
        createAppDir.bind(null, app),

        function restoreFromBackup(next) {
@@ -548,10 +538,10 @@ function install(app, callback) {
                ], next);
            } else {
                async.series([
-                    updateApp.bind(null, app, { installationProgress: '65, Download backup and restoring addons' }),
+                    updateApp.bind(null, app, { installationProgress: '60, Download backup and restoring addons' }),
                    addons.setupAddons.bind(null, app, app.manifest.addons),
                    addons.clearAddons.bind(null, app, app.manifest.addons),
-                    backups.restoreApp.bind(null, app, app.manifest.addons, restoreConfig, (progress) => updateApp(app, { installationProgress: `65, Restore - ${progress.message}` }, NOOP_CALLBACK))
+                    backups.restoreApp.bind(null, app, app.manifest.addons, restoreConfig, (progress) => updateApp(app, { installationProgress: progress.message }, NOOP_CALLBACK))
                ], next);
            }
        },
@@ -593,7 +583,7 @@ function backup(app, callback) {

    async.series([
        updateApp.bind(null, app, { installationProgress: '10, Backing up' }),
-        backups.backupApp.bind(null, app, { /* options */ }, (progress) => updateApp(app, { installationProgress: `30, ${progress.message}` }, NOOP_CALLBACK)),
+        backups.backupApp.bind(null, app, (progress) => updateApp(app, { installationProgress: progress.message }, NOOP_CALLBACK)),

        // done!
        function (callback) {
@@ -615,8 +605,7 @@ function configure(app, callback) {
    assert.strictEqual(typeof callback, 'function');

    // oldConfig can be null during an infra update
-    const locationChanged = app.oldConfig && (app.oldConfig.fqdn !== app.fqdn);
-    const dataDirChanged = app.oldConfig && (app.oldConfig.dataDir !== app.dataDir);
+    var locationChanged = app.oldConfig && (app.oldConfig.fqdn !== app.fqdn);

    async.series([
        updateApp.bind(null, app, { installationProgress: '10, Cleaning up old install' }),
@@ -624,7 +613,7 @@ function configure(app, callback) {
        removeCollectdProfile.bind(null, app),
        removeLogrotateConfig.bind(null, app),
        stopApp.bind(null, app),
-        deleteContainers.bind(null, app, { managedOnly: true }),
+        deleteMainContainer.bind(null, app),
        unregisterAlternateDomains.bind(null, app, false /* all */),
        function (next) {
            if (!locationChanged) return next();
@@ -632,6 +621,7 @@ function configure(app, callback) {
            unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain, next);
        },

+
        reserveHttpPort.bind(null, app),

        updateApp.bind(null, app, { installationProgress: '20, Downloading icon' }),
@@ -646,20 +636,13 @@ function configure(app, callback) {
        updateApp.bind(null, app, { installationProgress: '40, Downloading image' }),
        docker.downloadImage.bind(null, app.manifest),

-        updateApp.bind(null, app, { installationProgress: '45, Ensuring app data directory' }),
+        updateApp.bind(null, app, { installationProgress: '45, Ensuring volume' }),
        createAppDir.bind(null, app),

        // re-setup addons since they rely on the app's fqdn (e.g oauth)
        updateApp.bind(null, app, { installationProgress: '50, Setting up addons' }),
        addons.setupAddons.bind(null, app, app.manifest.addons),

-        // migrate dataDir
-        function (next) {
-            if (!dataDirChanged) return next();
-
-            migrateDataDir(app, app.oldConfig.dataDir, next);
-        },
-
        updateApp.bind(null, app, { installationProgress: '60, Creating container' }),
        createContainer.bind(null, app),

@@ -702,8 +685,6 @@ function update(app, callback) {
    // FIXME: this does not handle option changes (like multipleDatabases)
    var unusedAddons = _.omit(app.manifest.addons, Object.keys(app.updateConfig.manifest.addons));

-    const FORCED_UPDATE = (app.installationState === appdb.ISTATE_PENDING_FORCE_UPDATE);
-
    async.series([
        // this protects against the theoretical possibility of an app being marked for update from
        // a previous version of box code
@@ -711,12 +692,11 @@ function update(app, callback) {
        verifyManifest.bind(null, app.updateConfig.manifest),

        function (next) {
-            if (FORCED_UPDATE) return next(null);
+            if (app.installationState === appdb.ISTATE_PENDING_FORCE_UPDATE) return next(null);

            async.series([
                updateApp.bind(null, app, { installationProgress: '15, Backing up app' }),
-                // preserve update backups for 3 weeks
-                backups.backupApp.bind(null, app, { preserveSecs: 3*7*24*60*60 }, (progress) => updateApp(app, { installationProgress: `15, Backup - ${progress.message}` }, NOOP_CALLBACK))
+                backups.backupApp.bind(null, app, (progress) => updateApp(app, { installationProgress: progress.message }, NOOP_CALLBACK))
            ], function (error) {
                if (error) error.backupError = true;
                next(error);
@@ -734,7 +714,7 @@ function update(app, callback) {
        removeCollectdProfile.bind(null, app),
        removeLogrotateConfig.bind(null, app),
        stopApp.bind(null, app),
-        deleteContainers.bind(null, app, { managedOnly: true }),
+        deleteMainContainer.bind(null, app),
        function deleteImageIfChanged(done) {
            if (app.manifest.dockerImage === app.updateConfig.manifest.dockerImage) return done();

@@ -798,10 +778,7 @@ function update(app, callback) {
            debugApp(app, 'Error updating app: %s', error);
            updateApp(app, { installationState: appdb.ISTATE_ERROR, installationProgress: error.message, updateTime: new Date() }, callback.bind(null, error));
        } else {
-            // do not spam the notifcation view
-            if (FORCED_UPDATE) return callback();
-
-            eventlog.add(eventlog.ACTION_APP_UPDATE_FINISH, auditsource.APP_TASK, { app: app, success: true }, callback);
+            callback(null);
        }
    });
 }
@@ -823,12 +800,12 @@ function uninstall(app, callback) {
        stopApp.bind(null, app),

        updateApp.bind(null, app, { installationProgress: '20, Deleting container' }),
-        deleteContainers.bind(null, app, {}),
+        deleteContainers.bind(null, app),

        updateApp.bind(null, app, { installationProgress: '30, Teardown addons' }),
        addons.teardownAddons.bind(null, app, app.manifest.addons),

-        updateApp.bind(null, app, { installationProgress: '40, Deleting app data directory' }),
+        updateApp.bind(null, app, { installationProgress: '40, Deleting volume' }),
        deleteAppDir.bind(null, app, { removeDirectory: true }),

        updateApp.bind(null, app, { installationProgress: '50, Deleting image' }),
@@ -1,16 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    CRON:  { userId: null, username: 'cron' },
-    HEALTH_MONITOR: { userId: null, username: 'healthmonitor' },
-    SYSADMIN: { userId: null, username: 'sysadmin' },
-    TASK_MANAGER: { userId: null, username: 'taskmanager' },
-    APP_TASK: { userId: null, username: 'apptask' },
-
-    fromRequest: fromRequest
-};
-
-function fromRequest(req) {
-    var ip = req.headers['x-forwarded-for'] || req.connection.remoteAddress || null;
-    return { ip: ip, username: req.user ? req.user.username : null, userId: req.user ? req.user.id : null };
-}
@@ -6,7 +6,7 @@ var assert = require('assert'),
    safe = require('safetydance'),
    util = require('util');

-var BACKUPS_FIELDS = [ 'id', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'manifestJson', 'format', 'preserveSecs' ];
+var BACKUPS_FIELDS = [ 'id', 'creationTime', 'version', 'type', 'dependsOn', 'state', 'manifestJson', 'format' ];

 exports = module.exports = {
    add: add,
@@ -103,21 +103,21 @@ function get(id, callback) {
        });
 }

-function add(id, data, callback) {
-    assert(data && typeof data === 'object');
-    assert.strictEqual(typeof id, 'string');
-    assert.strictEqual(typeof data.version, 'string');
-    assert(data.type === exports.BACKUP_TYPE_APP || data.type === exports.BACKUP_TYPE_BOX);
-    assert(util.isArray(data.dependsOn));
-    assert.strictEqual(typeof data.manifest, 'object');
-    assert.strictEqual(typeof data.format, 'string');
+function add(backup, callback) {
+    assert(backup && typeof backup === 'object');
+    assert.strictEqual(typeof backup.id, 'string');
+    assert.strictEqual(typeof backup.version, 'string');
+    assert(backup.type === exports.BACKUP_TYPE_APP || backup.type === exports.BACKUP_TYPE_BOX);
+    assert(util.isArray(backup.dependsOn));
+    assert.strictEqual(typeof backup.manifest, 'object');
+    assert.strictEqual(typeof backup.format, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var creationTime = data.creationTime || new Date(); // allow tests to set the time
-    var manifestJson = JSON.stringify(data.manifest);
+    var creationTime = backup.creationTime || new Date(); // allow tests to set the time
+    var manifestJson = JSON.stringify(backup.manifest);

    database.query('INSERT INTO backups (id, version, type, creationTime, state, dependsOn, manifestJson, format) VALUES (?, ?, ?, ?, ?, ?, ?, ?)',
-        [ id, data.version, data.type, creationTime, exports.BACKUP_STATE_NORMAL, data.dependsOn.join(','), manifestJson, data.format ],
+        [ backup.id, backup.version, backup.type, creationTime, exports.BACKUP_STATE_NORMAL, backup.dependsOn.join(','), manifestJson, backup.format ],
        function (error) {
            if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS));
            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
@@ -22,19 +22,13 @@ exports = module.exports = {

    upload: upload,

-    startCleanupTask: startCleanupTask,
    cleanup: cleanup,
    cleanupCacheFilesSync: cleanupCacheFilesSync,

-    injectPrivateFields: injectPrivateFields,
-    removePrivateFields: removePrivateFields,
-
-    checkConfiguration: checkConfiguration,
-
-    SECRET_PLACEHOLDER: String.fromCharCode(0x25CF).repeat(8),
-
    // for testing
    _getBackupFilePath: getBackupFilePath,
+    _createTarPackStream: createTarPackStream,
+    _tarExtract: tarExtract,
    _restoreFsMetadata: restoreFsMetadata,
    _saveFsMetadata: saveFsMetadata
 };
@@ -50,11 +44,11 @@ var addons = require('./addons.js'),
    crypto = require('crypto'),
    database = require('./database.js'),
    DatabaseError = require('./databaseerror.js'),
-    DataLayout = require('./datalayout.js'),
    debug = require('debug')('box:backups'),
    eventlog = require('./eventlog.js'),
    fs = require('fs'),
    locker = require('./locker.js'),
+    mailer = require('./mailer.js'),
    mkdirp = require('mkdirp'),
    once = require('once'),
    path = require('path'),
@@ -63,12 +57,14 @@ var addons = require('./addons.js'),
    safe = require('safetydance'),
    shell = require('./shell.js'),
    settings = require('./settings.js'),
+    superagent = require('superagent'),
    syncer = require('./syncer.js'),
    tar = require('tar-fs'),
    tasks = require('./tasks.js'),
    util = require('util'),
    zlib = require('zlib');

+const NOOP_CALLBACK = function (error) { if (error) debug(error); };
 const BACKUP_UPLOAD_CMD = path.join(__dirname, 'scripts/backupupload.js');

 function debugApp(app) {
@@ -105,6 +101,7 @@ BackupsError.NOT_FOUND = 'not found';
 // choose which storage backend we use for test purpose we use s3
 function api(provider) {
    switch (provider) {
+    case 'caas': return require('./storage/s3.js');
    case 's3': return require('./storage/s3.js');
    case 'gcs': return require('./storage/gcs.js');
    case 'filesystem': return require('./storage/filesystem.js');
@@ -112,23 +109,11 @@ function api(provider) {
    case 's3-v4-compat': return require('./storage/s3.js');
    case 'digitalocean-spaces': return require('./storage/s3.js');
    case 'exoscale-sos': return require('./storage/s3.js');
-    case 'scaleway-objectstorage': return require('./storage/s3.js');
    case 'noop': return require('./storage/noop.js');
    default: return null;
    }
 }

-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.key === exports.SECRET_PLACEHOLDER) newConfig.key = currentConfig.key;
-    if (newConfig.provider === currentConfig.provider) api(newConfig.provider).injectPrivateFields(newConfig, currentConfig);
-}
-
-function removePrivateFields(backupConfig) {
-    assert.strictEqual(typeof backupConfig, 'object');
-    if (backupConfig.key) backupConfig.key = exports.SECRET_PLACEHOLDER;
-    return api(backupConfig.provider).removePrivateFields(backupConfig);
-}
-
 function testConfig(backupConfig, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof callback, 'function');
@@ -243,7 +228,7 @@ function createReadStream(sourceFile, key) {
    var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds

    stream.on('error', function (error) {
-        debug('createReadStream: read stream error.', error);
+        debug('createReadStream: tar stream error.', error);
        ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
    });

@@ -277,20 +262,15 @@ function createWriteStream(destFile, key) {
    }
 }

-function tarPack(dataLayout, key, callback) {
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+function createTarPackStream(sourceDir, key) {
+    assert.strictEqual(typeof sourceDir, 'string');
    assert(key === null || typeof key === 'string');
-    assert.strictEqual(typeof callback, 'function');

    var pack = tar.pack('/', {
        dereference: false, // pack the symlink and not what it points to
-        entries: dataLayout.localPaths(),
-        ignoreStatError: (path, err) => {
-            debug(`tarPack: error stat'ing ${path} - ${err.code}`);
-            return err.code === 'ENOENT'; // ignore if file or dir got removed (probably some temporary file)
-        },
+        entries: [ sourceDir ],
        map: function(header) {
-            header.name = dataLayout.toRemotePath(header.name);
+            header.name = header.name.replace(new RegExp('^' + sourceDir + '(/?)'), '.$1'); // make paths relative
            return header;
        },
        strict: false // do not error for unknown types (skip fifo, char/block devices)
@@ -300,40 +280,35 @@ function tarPack(dataLayout, key, callback) {
    var ps = progressStream({ time: 10000 }); // emit 'pgoress' every 10 seconds

    pack.on('error', function (error) {
-        debug('tarPack: tar stream error.', error);
+        debug('createTarPackStream: tar stream error.', error);
        ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
    });

    gzip.on('error', function (error) {
-        debug('tarPack: gzip stream error.', error);
+        debug('createTarPackStream: gzip stream error.', error);
        ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
    });

    if (key !== null) {
        var encrypt = crypto.createCipher('aes-256-cbc', key);
        encrypt.on('error', function (error) {
-            debug('tarPack: encrypt stream error.', error);
+            debug('createTarPackStream: encrypt stream error.', error);
            ps.emit('error', new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
        });
-        pack.pipe(gzip).pipe(encrypt).pipe(ps);
+        return pack.pipe(gzip).pipe(encrypt).pipe(ps);
    } else {
-        pack.pipe(gzip).pipe(ps);
+        return pack.pipe(gzip).pipe(ps);
    }
-
-    callback(null, ps);
 }

-function sync(backupConfig, backupId, dataLayout, progressCallback, callback) {
+function sync(backupConfig, backupId, dataDir, progressCallback, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof backupId, 'string');
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+    assert.strictEqual(typeof dataDir, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    // the number here has to take into account the s3.upload partSize (which is 10MB). So 20=200MB
-    const concurrency = backupConfig.syncConcurrency || (backupConfig.provider === 's3' ? 20 : 10);
-
-    syncer.sync(dataLayout, function processTask(task, iteratorCallback) {
+    syncer.sync(dataDir, function processTask(task, iteratorCallback) {
        debug('sync: processing task: %j', task);
        // the empty task.path is special to signify the directory
        const destPath = task.path && backupConfig.key ? encryptFilePath(task.path, backupConfig.key) : task.path;
@@ -354,18 +329,16 @@ function sync(backupConfig, backupId, dataLayout, progressCallback, callback) {
            retryCallback = once(retryCallback); // protect again upload() erroring much later after read stream error

            ++retryCount;
+            progressCallback({ message: `${task.operation} ${task.path} try ${retryCount}` });
            if (task.operation === 'add') {
-                progressCallback({ message: `Adding ${task.path}` + (retryCount > 1 ?  ` (Try ${retryCount})` : '') });
                debug(`Adding ${task.path} position ${task.position} try ${retryCount}`);
-                var stream = createReadStream(dataLayout.toLocalPath('./' + task.path), backupConfig.key || null);
+                var stream = createReadStream(path.join(dataDir, task.path), backupConfig.key || null);
                stream.on('error', function (error) {
                    debug(`read stream error for ${task.path}: ${error.message}`);
                    retryCallback();
                }); // ignore error if file disappears
                stream.on('progress', function(progress) {
-                    const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
-                    if (!transferred && !speed) return progressCallback({ message: `Uploading ${task.path}` }); // 0M@0Mbps looks wrong
-                    progressCallback({ message: `Uploading ${task.path}: ${transferred}M@${speed}Mbps` }); // 0M@0Mbps looks wrong
+                    progressCallback({ message: `Uploading ${task.path}: ${Math.round(progress.transferred/1024/1024)}M@${Math.round(progress.speed/1024/1024)}` });
                });
                api(backupConfig.provider).upload(backupConfig, backupFilePath, stream, function (error) {
                    debug(error ? `Error uploading ${task.path} try ${retryCount}: ${error.message}` : `Uploaded ${task.path}`);
@@ -373,52 +346,42 @@ function sync(backupConfig, backupId, dataLayout, progressCallback, callback) {
                });
            }
        }, iteratorCallback);
-    }, concurrency, function (error) {
+    }, backupConfig.syncConcurrency || 10 /* concurrency */, function (error) {
        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));

        callback();
    });
 }

-// this is not part of 'snapshotting' because we need root access to traverse
-function saveFsMetadata(dataLayout, metadataFile, callback) {
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof metadataFile, 'string');
+function saveFsMetadata(appDataDir, callback) {
+    assert.strictEqual(typeof appDataDir, 'string');
    assert.strictEqual(typeof callback, 'function');

-    // contains paths prefixed with './'
-    let metadata = {
-        emptyDirs: [],
-        execFiles: []
+    var emptyDirs = safe.child_process.execSync('find . -type d -empty', { cwd: `${appDataDir}`, encoding: 'utf8' });
+    if (emptyDirs === null) return callback(safe.error);
+
+    var execFiles = safe.child_process.execSync('find . -type f -executable', { cwd: `${appDataDir}`, encoding: 'utf8' });
+    if (execFiles === null) return callback(safe.error);
+
+    var metadata = {
+        emptyDirs: emptyDirs.length === 0 ? [ ] : emptyDirs.trim().split('\n'),
+        execFiles: execFiles.length === 0 ? [ ] : execFiles.trim().split('\n')
    };

-    for (let lp of dataLayout.localPaths()) {
-        var emptyDirs = safe.child_process.execSync(`find ${lp} -type d -empty\n`, { encoding: 'utf8' });
-        if (emptyDirs === null) return callback(safe.error);
-        if (emptyDirs.length) metadata.emptyDirs = metadata.emptyDirs.concat(emptyDirs.trim().split('\n').map((ed) => dataLayout.toRemotePath(ed)));
-
-        var execFiles = safe.child_process.execSync(`find ${lp} -type f -executable\n`, { encoding: 'utf8' });
-        if (execFiles === null) return callback(safe.error);
-
-        if (execFiles.length) metadata.execFiles = metadata.execFiles.concat(execFiles.trim().split('\n').map((ef) => dataLayout.toRemotePath(ef)));
-    }
-
-    if (!safe.fs.writeFileSync(metadataFile, JSON.stringify(metadata, null, 4))) return callback(safe.error);
+    if (!safe.fs.writeFileSync(`${appDataDir}/fsmetadata.json`, JSON.stringify(metadata, null, 4))) return callback(safe.error);

    callback();
 }

 // this function is called via backupupload (since it needs root to traverse app's directory)
-function upload(backupId, format, dataLayoutString, progressCallback, callback) {
+function upload(backupId, format, dataDir, progressCallback, callback) {
    assert.strictEqual(typeof backupId, 'string');
    assert.strictEqual(typeof format, 'string');
-    assert.strictEqual(typeof dataLayoutString, 'string');
+    assert.strictEqual(typeof dataDir, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    debug(`upload: id ${backupId} format ${format} dataLayout ${dataLayoutString}`);
-
-    const dataLayout = DataLayout.fromString(dataLayoutString);
+    debug(`upload: id ${backupId} format ${format} dataDir ${dataDir}`);

    settings.getBackupConfig(function (error, backupConfig) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
@@ -427,99 +390,87 @@ function upload(backupId, format, dataLayoutString, progressCallback, callback)
            async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
                retryCallback = once(retryCallback); // protect again upload() erroring much later after tar stream error

-                tarPack(dataLayout, backupConfig.key || null, function (error, tarStream) {
-                    if (error) return retryCallback(error);
-
-                    tarStream.on('progress', function(progress) {
-                        const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
-                        if (!transferred && !speed) return progressCallback({ message: 'Uploading backup' }); // 0M@0Mbps looks wrong
-                        progressCallback({ message: `Uploading backup ${transferred}M@${speed}Mbps` });
-                    });
-                    tarStream.on('error', retryCallback); // already returns BackupsError
-
-                    api(backupConfig.provider).upload(backupConfig, getBackupFilePath(backupConfig, backupId, format), tarStream, retryCallback);
+                var tarStream = createTarPackStream(dataDir, backupConfig.key || null);
+                tarStream.on('progress', function(progress) {
+                    progressCallback({ message: `Uploading ${Math.round(progress.transferred/1024/1024)}M@${Math.round(progress.speed/1024/1024)}Mbps` });
                });
+                tarStream.on('error', retryCallback); // already returns BackupsError
+
+                api(backupConfig.provider).upload(backupConfig, getBackupFilePath(backupConfig, backupId, format), tarStream, retryCallback);
            }, callback);
        } else {
            async.series([
-                saveFsMetadata.bind(null, dataLayout, `${dataLayout.localRoot()}/fsmetadata.json`),
-                sync.bind(null, backupConfig, backupId, dataLayout, progressCallback)
+                saveFsMetadata.bind(null, dataDir),
+                sync.bind(null, backupConfig, backupId, dataDir, progressCallback)
            ], callback);
        }
    });
 }

-function tarExtract(inStream, dataLayout, key, callback) {
+function tarExtract(inStream, destination, key, callback) {
    assert.strictEqual(typeof inStream, 'object');
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+    assert.strictEqual(typeof destination, 'string');
    assert(key === null || typeof key === 'string');
    assert.strictEqual(typeof callback, 'function');

+    callback = once(callback);
+
    var gunzip = zlib.createGunzip({});
    var ps = progressStream({ time: 10000 }); // display a progress every 10 seconds
-    var extract = tar.extract('/', {
-        map: function (header) {
-            header.name = dataLayout.toLocalPath(header.name);
-            return header;
-        }
-    });
-
-    const emitError = once((error) => ps.emit('error', error));
+    var extract = tar.extract(destination);

    inStream.on('error', function (error) {
        debug('tarExtract: input stream error.', error);
-        emitError(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
    });

    gunzip.on('error', function (error) {
        debug('tarExtract: gunzip stream error.', error);
-        emitError(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
    });

    extract.on('error', function (error) {
        debug('tarExtract: extract stream error.', error);
-        emitError(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
+        callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));
    });

    extract.on('finish', function () {
        debug('tarExtract: done.');
-        // we use a separate event because ps is a through2 stream which emits 'finish' event indicating end of inStream and not extract
-        ps.emit('done');
+        callback(null);
    });

    if (key !== null) {
        var decrypt = crypto.createDecipher('aes-256-cbc', key);
        decrypt.on('error', function (error) {
            debug('tarExtract: decrypt stream error.', error);
-            emitError(new BackupsError(BackupsError.EXTERNAL_ERROR, `Failed to decrypt: ${error.message}`));
+            callback(new BackupsError(BackupsError.EXTERNAL_ERROR, `Failed to decrypt: ${error.message}`));
        });
        inStream.pipe(ps).pipe(decrypt).pipe(gunzip).pipe(extract);
    } else {
        inStream.pipe(ps).pipe(gunzip).pipe(extract);
    }

-    callback(null, ps);
+    return ps;
 }

-function restoreFsMetadata(dataLayout, metadataFile, callback) {
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
-    assert.strictEqual(typeof metadataFile, 'string');
+function restoreFsMetadata(appDataDir, callback) {
+    assert.strictEqual(typeof appDataDir, 'string');
    assert.strictEqual(typeof callback, 'function');

-    debug(`Recreating empty directories in ${dataLayout.toString()}`);
+    debug(`Recreating empty directories in ${appDataDir}`);

-    var metadataJson = safe.fs.readFileSync(metadataFile, 'utf8');
-    if (metadataJson === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error loading fsmetadata.json:' + safe.error.message));
+    var metadataJson = safe.fs.readFileSync(path.join(appDataDir, 'fsmetadata.json'), 'utf8');
+    if (metadataJson === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error loading fsmetadata.txt:' + safe.error.message));
    var metadata = safe.JSON.parse(metadataJson);
-    if (metadata === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error parsing fsmetadata.json:' + safe.error.message));
+    if (metadata === null) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error parsing fsmetadata.txt:' + safe.error.message));

    async.eachSeries(metadata.emptyDirs, function createPath(emptyDir, iteratorDone) {
-        mkdirp(dataLayout.toLocalPath(emptyDir), iteratorDone);
+        mkdirp(path.join(appDataDir, emptyDir), iteratorDone);
    }, function (error) {
        if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, `unable to create path: ${error.message}`));

        async.eachSeries(metadata.execFiles, function createPath(execFile, iteratorDone) {
-            fs.chmod(dataLayout.toLocalPath(execFile), parseInt('0755', 8), iteratorDone);
+            fs.chmod(path.join(appDataDir, execFile), parseInt('0755', 8), iteratorDone);
        }, function (error) {
            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, `unable to chmod: ${error.message}`));

@@ -528,14 +479,14 @@ function restoreFsMetadata(dataLayout, metadataFile, callback) {
    });
 }

-function downloadDir(backupConfig, backupFilePath, dataLayout, progressCallback, callback) {
+function downloadDir(backupConfig, backupFilePath, destDir, progressCallback, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof backupFilePath, 'string');
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+    assert.strictEqual(typeof destDir, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    debug(`downloadDir: ${backupFilePath} to ${dataLayout.toString()}`);
+    debug(`downloadDir: ${backupFilePath} to ${destDir}`);

    function downloadFile(entry, callback) {
        let relativePath = path.relative(backupFilePath, entry.fullPath);
@@ -543,79 +494,55 @@ function downloadDir(backupConfig, backupFilePath, dataLayout, progressCallback,
            relativePath = decryptFilePath(relativePath, backupConfig.key);
            if (!relativePath) return callback(new BackupsError(BackupsError.BAD_STATE, 'Unable to decrypt file'));
        }
-        const destFilePath = dataLayout.toLocalPath('./' + relativePath);
+        const destFilePath = path.join(destDir, relativePath);

        mkdirp(path.dirname(destFilePath), function (error) {
            if (error) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error.message));

-            async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
+            api(backupConfig.provider).download(backupConfig, entry.fullPath, function (error, sourceStream) {
+                if (error) return callback(error);
+
+                sourceStream.on('error', callback);
+
                let destStream = createWriteStream(destFilePath, backupConfig.key || null);
+                destStream.on('error', callback);

-                // protect against multiple errors. must destroy the write stream so that a previous retry does not write
-                let closeAndRetry = once((error) => {
-                    if (error) progressCallback({ message: `Download ${entry.fullPath} errored: ${error.message}` });
-                    else progressCallback({ message: `Download ${entry.fullPath} finished` });
-                    destStream.destroy();
-                    retryCallback(error);
-                });
+                progressCallback({ message: `Downloading ${entry.fullPath} to ${destFilePath}` });

-                api(backupConfig.provider).download(backupConfig, entry.fullPath, function (error, sourceStream) {
-                    if (error) return closeAndRetry(error);
-
-                    sourceStream.on('error', closeAndRetry);
-                    destStream.on('error', closeAndRetry);
-
-                    progressCallback({ message: `Downloading ${entry.fullPath} to ${destFilePath}` });
-
-                    sourceStream.pipe(destStream, { end: true }).on('finish', closeAndRetry);
-                });
-            }, callback);
+                sourceStream.pipe(destStream, { end: true }).on('finish', callback);
+            });
        });
    }

    api(backupConfig.provider).listDir(backupConfig, backupFilePath, 1000, function (entries, done) {
-        // https://www.digitalocean.com/community/questions/rate-limiting-on-spaces?answer=40441
-        const concurrency = backupConfig.downloadConcurrency || (backupConfig.provider === 's3' ? 30 : 10);
-
-        async.eachLimit(entries, concurrency, downloadFile, done);
+        async.each(entries, downloadFile, done);
    }, callback);
 }

-function download(backupConfig, backupId, format, dataLayout, progressCallback, callback) {
+function download(backupConfig, backupId, format, dataDir, progressCallback, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof backupId, 'string');
    assert.strictEqual(typeof format, 'string');
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+    assert.strictEqual(typeof dataDir, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    debug(`download - Downloading ${backupId} of format ${format} to ${dataLayout.toString()}`);
-
-    const backupFilePath = getBackupFilePath(backupConfig, backupId, format);
+    debug(`download - Downloading ${backupId} of format ${format} to ${dataDir}`);

    if (format === 'tgz') {
-        async.retry({ times: 5, interval: 20000 }, function (retryCallback) {
-            api(backupConfig.provider).download(backupConfig, backupFilePath, function (error, sourceStream) {
-                if (error) return retryCallback(error);
-
-                tarExtract(sourceStream, dataLayout, backupConfig.key || null, function (error, ps) {
-                    if (error) return retryCallback(error);
-
-                    ps.on('progress', function (progress) {
-                        const transferred = Math.round(progress.transferred/1024/1024), speed = Math.round(progress.speed/1024/1024);
-                        if (!transferred && !speed) return progressCallback({ message: 'Downloading' }); // 0M@0Mbps looks wrong
-                        progressCallback({ message: `Downloading ${transferred}M@${speed}Mbps` });
-                    });
-                    ps.on('error', retryCallback);
-                    ps.on('done', retryCallback);
-                });
-            });
-        }, callback);
-    } else {
-        downloadDir(backupConfig, backupFilePath, dataLayout, progressCallback, function (error) {
+        api(backupConfig.provider).download(backupConfig, getBackupFilePath(backupConfig, backupId, format), function (error, sourceStream) {
            if (error) return callback(error);

-            restoreFsMetadata(dataLayout, `${dataLayout.localRoot()}/fsmetadata.json`, callback);
+            let ps = tarExtract(sourceStream, dataDir, backupConfig.key || null, callback);
+            ps.on('progress', function (progress) {
+                progressCallback({ message: `Downloading ${Math.round(progress.transferred/1024/1024)}M@${Math.round(progress.speed/1024/1024)}Mbps` });
+            });
+        });
+    } else {
+        downloadDir(backupConfig, getBackupFilePath(backupConfig, backupId, format), dataDir, progressCallback, function (error) {
+            if (error) return callback(error);
+
+            restoreFsMetadata(dataDir, callback);
        });
    }
 }
@@ -626,14 +553,12 @@ function restore(backupConfig, backupId, progressCallback, callback) {
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    const dataLayout = new DataLayout(paths.BOX_DATA_DIR, []);
-
-    download(backupConfig, backupId, backupConfig.format, dataLayout, progressCallback, function (error) {
+    download(backupConfig, backupId, backupConfig.format, paths.BOX_DATA_DIR, progressCallback, function (error) {
        if (error) return callback(error);

        debug('restore: download completed, importing database');

-        database.importFromFile(`${dataLayout.localRoot()}/box.mysqldump`, function (error) {
+        database.importFromFile(`${paths.BOX_DATA_DIR}/box.mysqldump`, function (error) {
            if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

            debug('restore: database imported');
@@ -650,9 +575,7 @@ function restoreApp(app, addonsToRestore, restoreConfig, progressCallback, callb
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    const appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
-    if (!appDataDir) return callback(safe.error);
-    const dataLayout = new DataLayout(appDataDir, app.dataDir ? [{ localDir: app.dataDir, remoteDir: 'data' }] : []);
+    var appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));

    var startTime = new Date();

@@ -660,7 +583,7 @@ function restoreApp(app, addonsToRestore, restoreConfig, progressCallback, callb
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        async.series([
-            download.bind(null, backupConfig, restoreConfig.backupId, restoreConfig.backupFormat, dataLayout, progressCallback),
+            download.bind(null, backupConfig, restoreConfig.backupId, restoreConfig.backupFormat, appDataDir, progressCallback),
            addons.restoreAddons.bind(null, app, addonsToRestore)
        ], function (error) {
            debug('restoreApp: time: %s', (new Date() - startTime)/1000);
@@ -670,16 +593,16 @@ function restoreApp(app, addonsToRestore, restoreConfig, progressCallback, callb
    });
 }

-function runBackupUpload(backupId, format, dataLayout, progressCallback, callback) {
+function runBackupUpload(backupId, format, dataDir, progressCallback, callback) {
    assert.strictEqual(typeof backupId, 'string');
    assert.strictEqual(typeof format, 'string');
-    assert(dataLayout instanceof DataLayout, 'dataLayout must be a DataLayout');
+    assert.strictEqual(typeof dataDir, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

    let result = '';

-    shell.sudo(`backup-${backupId}`, [ BACKUP_UPLOAD_CMD, backupId, format, dataLayout.toString() ], { preserveEnv: true, ipc: true }, function (error) {
+    shell.sudo(`backup-${backupId}`, [ BACKUP_UPLOAD_CMD, backupId, format, dataDir ], { preserveEnv: true, ipc: true }, function (error) {
        if (error && (error.code === null /* signal */ || (error.code !== 0 && error.code !== 50))) { // backuptask crashed
            return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Backuptask crashed'));
        } else if (error && error.code === 50) { // exited with error
@@ -739,11 +662,7 @@ function uploadBoxSnapshot(backupConfig, progressCallback, callback) {
    snapshotBox(progressCallback, function (error) {
        if (error) return callback(error);

-        const boxDataDir = safe.fs.realpathSync(paths.BOX_DATA_DIR);
-        if (!boxDataDir) return callback(safe.error);
-
-        const dataLayout = new DataLayout(boxDataDir, []);
-        runBackupUpload('snapshot/box', backupConfig.format, dataLayout, progressCallback, function (error) {
+        runBackupUpload('snapshot/box', backupConfig.format, paths.BOX_DATA_DIR, progressCallback, function (error) {
            if (error) return callback(error);

            debug('uploadBoxSnapshot: time: %s secs', (new Date() - startTime)/1000);
@@ -753,9 +672,37 @@ function uploadBoxSnapshot(backupConfig, progressCallback, callback) {
    });
 }

-function rotateBoxBackup(backupConfig, tag, appBackupIds, progressCallback, callback) {
+
+function backupDone(apiConfig, backupId, appBackupIds, callback) {
+    assert.strictEqual(typeof apiConfig, 'object');
+    assert.strictEqual(typeof backupId, 'string');
+    assert(Array.isArray(appBackupIds));
+    assert.strictEqual(typeof callback, 'function');
+
+    if (apiConfig.provider !== 'caas') return callback();
+
+    debug('[%s] backupDone: %s apps %j', backupId, backupId, appBackupIds);
+
+    var url = config.apiServerOrigin() + '/api/v1/boxes/' + apiConfig.fqdn + '/backupDone';
+    var data = {
+        boxVersion: config.version(),
+        backupId: backupId,
+        appId: null,        // now unused
+        appVersion: null,   // now unused
+        appBackupIds: appBackupIds
+    };
+
+    superagent.post(url).send(data).query({ token: apiConfig.token }).timeout(30 * 1000).end(function (error, result) {
+        if (error && !error.response) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, error));
+        if (result.statusCode !== 200) return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, result.text));
+
+        return callback(null);
+    });
+}
+
+function rotateBoxBackup(backupConfig, timestamp, appBackupIds, progressCallback, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
-    assert.strictEqual(typeof tag, 'string');
+    assert.strictEqual(typeof timestamp, 'string');
    assert(Array.isArray(appBackupIds));
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');
@@ -763,13 +710,13 @@ function rotateBoxBackup(backupConfig, tag, appBackupIds, progressCallback, call
    var snapshotInfo = getSnapshotInfo('box');
    if (!snapshotInfo) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Snapshot info missing or corrupt'));

-    const snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,''); // add this to filename to make it unique, so it's easy to download them
-    const backupId = util.format('%s/box_%s_v%s', tag, snapshotTime, config.version());
+    var snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+    var backupId = util.format('%s/box_%s_v%s', timestamp, snapshotTime, config.version());
    const format = backupConfig.format;

    debug(`Rotating box backup to id ${backupId}`);

-    backupdb.add(backupId, { version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
+    backupdb.add({ id: backupId, version: config.version(), type: backupdb.BACKUP_TYPE_BOX, dependsOn: appBackupIds, manifest: null, format: format }, function (error) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, 'snapshot/box', format), getBackupFilePath(backupConfig, backupId, format));
@@ -783,15 +730,19 @@ function rotateBoxBackup(backupConfig, tag, appBackupIds, progressCallback, call

                debug(`Rotated box backup successfully as id ${backupId}`);

-                callback(null, backupId);
+                backupDone(backupConfig, backupId, appBackupIds, function (error) {
+                    if (error) return callback(error);
+
+                    callback(null, backupId);
+                });
            });
        });
    });
 }

-function backupBoxWithAppBackupIds(appBackupIds, tag, progressCallback, callback) {
+function backupBoxWithAppBackupIds(appBackupIds, timestamp, progressCallback, callback) {
    assert(Array.isArray(appBackupIds));
-    assert.strictEqual(typeof tag, 'string');
+    assert.strictEqual(typeof timestamp, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

@@ -801,7 +752,7 @@ function backupBoxWithAppBackupIds(appBackupIds, tag, progressCallback, callback
        uploadBoxSnapshot(backupConfig, progressCallback, function (error) {
            if (error) return callback(error);

-            rotateBoxBackup(backupConfig, tag, appBackupIds, progressCallback, callback);
+            rotateBoxBackup(backupConfig, timestamp, appBackupIds, progressCallback, callback);
        });
    });
 }
@@ -820,7 +771,7 @@ function snapshotApp(app, progressCallback, callback) {
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    progressCallback({ message: `Snapshotting app ${app.fqdn}` });
+    progressCallback({ message: `Snapshotting app ${app.id}` });

    if (!safe.fs.writeFileSync(path.join(paths.APPS_DATA_DIR, app.id + '/config.json'), JSON.stringify(apps.getAppConfig(app)))) {
        return callback(new BackupsError(BackupsError.EXTERNAL_ERROR, 'Error creating config.json: ' + safe.error.message));
@@ -833,25 +784,24 @@ function snapshotApp(app, progressCallback, callback) {
    });
 }

-function rotateAppBackup(backupConfig, app, tag, options, progressCallback, callback) {
+function rotateAppBackup(backupConfig, app, timestamp, progressCallback, callback) {
    assert.strictEqual(typeof backupConfig, 'object');
    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof tag, 'string');
-    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof timestamp, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

    var snapshotInfo = getSnapshotInfo(app.id);
    if (!snapshotInfo) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, 'Snapshot info missing or corrupt'));

+    var snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,'');
    var manifest = snapshotInfo.restoreConfig ? snapshotInfo.restoreConfig.manifest : snapshotInfo.manifest; // compat
-    const snapshotTime = snapshotInfo.timestamp.replace(/[T.]/g, '-').replace(/[:Z]/g,''); // add this for unique filename which helps when downloading them
-    const backupId = util.format('%s/app_%s_%s_v%s', tag, app.id, snapshotTime, manifest.version);
+    var backupId = util.format('%s/app_%s_%s_v%s', timestamp, app.id, snapshotTime, manifest.version);
    const format = backupConfig.format;

    debug(`Rotating app backup of ${app.id} to id ${backupId}`);

-    backupdb.add(backupId, { version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], manifest: manifest, format: format }, function (error) {
+    backupdb.add({ id: backupId, version: manifest.version, type: backupdb.BACKUP_TYPE_APP, dependsOn: [ ], manifest: manifest, format: format }, function (error) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

        var copy = api(backupConfig.provider).copy(backupConfig, getBackupFilePath(backupConfig, `snapshot/app_${app.id}`, format), getBackupFilePath(backupConfig, backupId, format));
@@ -859,7 +809,7 @@ function rotateAppBackup(backupConfig, app, tag, options, progressCallback, call
        copy.on('done', function (copyBackupError) {
            const state = copyBackupError ? backupdb.BACKUP_STATE_ERROR : backupdb.BACKUP_STATE_NORMAL;

-            backupdb.update(backupId, { preserveSecs: options.preserveSecs || 0, state: state }, function (error) {
+            backupdb.update(backupId, { state: state }, function (error) {
                if (copyBackupError) return callback(copyBackupError);
                if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

@@ -884,13 +834,9 @@ function uploadAppSnapshot(backupConfig, app, progressCallback, callback) {
    snapshotApp(app, progressCallback, function (error) {
        if (error) return callback(error);

-        const backupId = util.format('snapshot/app_%s', app.id);
-        const appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
-        if (!appDataDir) return callback(safe.error);
-
-        const dataLayout = new DataLayout(appDataDir, app.dataDir ? [{ localDir: app.dataDir, remoteDir: 'data' }] : []);
-
-        runBackupUpload(backupId, backupConfig.format, dataLayout, progressCallback, function (error) {
+        var backupId = util.format('snapshot/app_%s', app.id);
+        var appDataDir = safe.fs.realpathSync(path.join(paths.APPS_DATA_DIR, app.id));
+        runBackupUpload(backupId, backupConfig.format, appDataDir, progressCallback, function (error) {
            if (error) return callback(error);

            debugApp(app, 'uploadAppSnapshot: %s done time: %s secs', backupId, (new Date() - startTime)/1000);
@@ -900,10 +846,9 @@ function uploadAppSnapshot(backupConfig, app, progressCallback, callback) {
    });
 }

-function backupAppWithTag(app, tag, options, progressCallback, callback) {
+function backupAppWithTimestamp(app, timestamp, progressCallback, callback) {
    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof tag, 'string');
-    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof timestamp, 'string');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

@@ -915,22 +860,21 @@ function backupAppWithTag(app, tag, options, progressCallback, callback) {
        uploadAppSnapshot(backupConfig, app, progressCallback, function (error) {
            if (error) return callback(error);

-            rotateAppBackup(backupConfig, app, tag, options, progressCallback, callback);
+            rotateAppBackup(backupConfig, app, timestamp, progressCallback, callback);
        });
    });
 }

-function backupApp(app, options, progressCallback, callback) {
+function backupApp(app, progressCallback, callback) {
    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    const tag = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+    const timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');

-    debug(`backupApp - Backing up ${app.fqdn} with tag ${tag}`);
+    debug(`backupApp - Backing up ${app.fqdn} with timestamp ${timestamp}`);

-    backupAppWithTag(app, tag, options, progressCallback, callback);
+    backupAppWithTimestamp(app, timestamp, progressCallback, callback);
 }

 // this function expects you to have a lock. Unlike other progressCallback this also has a progress field
@@ -938,7 +882,7 @@ function backupBoxAndApps(progressCallback, callback) {
    assert.strictEqual(typeof progressCallback, 'function');
    assert.strictEqual(typeof callback, 'function');

-    const tag = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');
+    var timestamp = (new Date()).toISOString().replace(/[T.]/g, '-').replace(/[:Z]/g,'');

    apps.getAll(function (error, allApps) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));
@@ -955,7 +899,7 @@ function backupBoxAndApps(progressCallback, callback) {
                return iteratorCallback(null, null); // nothing to backup
            }

-            backupAppWithTag(app, tag, { /* options */ }, (progress) => progressCallback({ percent: percent, message: progress.message }), function (error, backupId) {
+            backupAppWithTimestamp(app, timestamp, (progress) => progressCallback({ percent: percent, message: progress.message }), function (error, backupId) {
                if (error && error.reason !== BackupsError.BAD_STATE) {
                    debugApp(app, 'Unable to backup', error);
                    return iteratorCallback(error);
@@ -973,16 +917,16 @@ function backupBoxAndApps(progressCallback, callback) {
            progressCallback({ percent: percent, message: 'Backing up system data' });
            percent += step;

-            backupBoxWithAppBackupIds(backupIds, tag, (progress) => progressCallback({ percent: percent, message: progress.message }), callback);
+            backupBoxWithAppBackupIds(backupIds, timestamp, (progress) => progressCallback({ percent: percent, message: progress.message }), callback);
        });
    });
 }

 function startBackupTask(auditSource, callback) {
    let error = locker.lock(locker.OP_FULL_BACKUP);
-    if (error) return callback(new BackupsError(BackupsError.BAD_STATE, `Cannot backup now: ${error.message}`));
+    if (error) return callback(error);

-    let task = tasks.startTask(tasks.TASK_BACKUP, []);
+    let task = tasks.startTask(tasks.TASK_BACKUP, [], auditSource);
    task.on('error', (error) => callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)));
    task.on('start', (taskId) => {
        eventlog.add(eventlog.ACTION_BACKUP_START, auditSource, { taskId });
@@ -991,9 +935,9 @@ function startBackupTask(auditSource, callback) {
    task.on('finish', (error, result) => {
        locker.unlock(locker.OP_FULL_BACKUP);

-        const errorMessage = error ? error.message : '';
+        if (error) mailer.backupFailed(error);

-        eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { taskId: task.id, errorMessage: errorMessage, backupId: result });
+        eventlog.add(eventlog.ACTION_BACKUP_FINISH, auditSource, { errorMessage: error ? error.message : null, backupId: result });
    });
 }

@@ -1062,25 +1006,22 @@ function cleanupAppBackups(backupConfig, referencedAppBackups, callback) {
    assert.strictEqual(typeof callback, 'function');

    const now = new Date();
-    let removedAppBackups = [];

    // we clean app backups of any state because the ones to keep are determined by the box cleanup code
    backupdb.getByTypePaged(backupdb.BACKUP_TYPE_APP, 1, 1000, function (error, appBackups) {
        if (error) return callback(new BackupsError(BackupsError.INTERNAL_ERROR, error));

-        async.eachSeries(appBackups, function iterator(appBackup, iteratorDone) {
-            if (referencedAppBackups.indexOf(appBackup.id) !== -1) return iteratorDone();
-            if ((now - appBackup.creationTime) < (appBackup.preserveSecs * 1000)) return iteratorDone();
-            if ((now - appBackup.creationTime) < (backupConfig.retentionSecs * 1000)) return iteratorDone();
+        async.eachSeries(appBackups, function iterator(backup, iteratorDone) {
+            if (referencedAppBackups.indexOf(backup.id) !== -1) return iteratorDone();
+            if ((now - backup.creationTime) < (backupConfig.retentionSecs * 1000)) return iteratorDone();

-            debug('cleanupAppBackups: removing %s', appBackup.id);
+            debug('cleanupAppBackups: removing %s', backup.id);

-            removedAppBackups.push(appBackup.id);
-            cleanupBackup(backupConfig, appBackup, iteratorDone);
+            cleanupBackup(backupConfig, backup, iteratorDone);
        }, function () {
            debug('cleanupAppBackups: done');

-            callback(null, removedAppBackups);
+            callback();
        });
    });
 }
@@ -1091,12 +1032,12 @@ function cleanupBoxBackups(backupConfig, auditSource, callback) {
    assert.strictEqual(typeof callback, 'function');

    const now = new Date();
-    let referencedAppBackups = [], removedBoxBackups = [];
+    var referencedAppBackups = [];

    backupdb.getByTypePaged(backupdb.BACKUP_TYPE_BOX, 1, 1000, function (error, boxBackups) {
        if (error) return callback(error);

-        if (boxBackups.length === 0) return callback(null, { removedBoxBackups, referencedAppBackups });
+        if (boxBackups.length === 0) return callback(null, []);

        // search for the first valid backup
        var i;
@@ -1113,22 +1054,21 @@ function cleanupBoxBackups(backupConfig, auditSource, callback) {
            debug('cleanupBoxBackups: no box backup to preserve');
        }

-        async.eachSeries(boxBackups, function iterator(boxBackup, iteratorNext) {
+        async.eachSeries(boxBackups, function iterator(backup, nextBackup) {
            // TODO: errored backups should probably be cleaned up before retention time, but we will
            // have to be careful not to remove any backup currently being created
-            if ((now - boxBackup.creationTime) < (backupConfig.retentionSecs * 1000)) {
-                referencedAppBackups = referencedAppBackups.concat(boxBackup.dependsOn);
-                return iteratorNext();
+            if ((now - backup.creationTime) < (backupConfig.retentionSecs * 1000)) {
+                referencedAppBackups = referencedAppBackups.concat(backup.dependsOn);
+                return nextBackup();
            }

-            debug('cleanupBoxBackups: removing %s', boxBackup.id);
+            debug('cleanupBoxBackups: removing %s', backup.id);

-            removedBoxBackups.push(boxBackup.id);
-            cleanupBackup(backupConfig, boxBackup, iteratorNext);
+            cleanupBackup(backupConfig, backup, nextBackup);
        }, function () {
            debug('cleanupBoxBackups: done');

-            callback(null, { removedBoxBackups, referencedAppBackups });
+            return callback(null, referencedAppBackups);
        });
    });
 }
@@ -1182,70 +1122,29 @@ function cleanupSnapshots(backupConfig, callback) {
    });
 }

-function cleanup(auditSource, progressCallback, callback) {
+function cleanup(auditSource, callback) {
    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof progressCallback, 'function');
-    assert.strictEqual(typeof callback, 'function');
+    assert(!callback || typeof callback === 'function'); // callback is null when called from cronjob
+
+    callback = callback || NOOP_CALLBACK;

    settings.getBackupConfig(function (error, backupConfig) {
        if (error) return callback(error);

        if (backupConfig.retentionSecs < 0) {
            debug('cleanup: keeping all backups');
-            return callback(null, {});
+            return callback();
        }

-        progressCallback({ percent: 10, message: 'Cleaning box backups' });
-
-        cleanupBoxBackups(backupConfig, auditSource, function (error, result) {
+        cleanupBoxBackups(backupConfig, auditSource, function (error, referencedAppBackups) {
            if (error) return callback(error);

-            progressCallback({ percent: 40, message: 'Cleaning app backups' });
-
-            cleanupAppBackups(backupConfig, result.referencedAppBackups, function (error, removedAppBackups) {
+            cleanupAppBackups(backupConfig, referencedAppBackups, function (error) {
                if (error) return callback(error);

-                progressCallback({ percent: 90, message: 'Cleaning snapshots' });
-
-                cleanupSnapshots(backupConfig, function (error) {
-                    if (error) return callback(error);
-
-                    callback(null, { removedBoxBackups: result.removedBoxBackups, removedAppBackups: removedAppBackups });
-                });
+                cleanupSnapshots(backupConfig, callback);
            });
        });
    });
 }

-function startCleanupTask(auditSource, callback) {
-    let task = tasks.startTask(tasks.TASK_CLEAN_BACKUPS, [ auditSource ]);
-    task.on('error', (error) => callback(new BackupsError(BackupsError.INTERNAL_ERROR, error)));
-    task.on('start', (taskId) => {
-        eventlog.add(eventlog.ACTION_BACKUP_CLEANUP_START, auditSource, { taskId });
-        callback(null, taskId);
-    });
-    task.on('finish', (error, result) => { // result is { removedBoxBackups, removedAppBackups }
-        eventlog.add(eventlog.ACTION_BACKUP_CLEANUP_FINISH, auditSource, {
-            errorMessage: error ? error.message : null,
-            removedBoxBackups: result ? result.removedBoxBackups : [],
-            removedAppBackups: result ? result.removedAppBackups : []
-        });
-    });
-}
-
-function checkConfiguration(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    settings.getBackupConfig(function (error, backupConfig) {
-        if (error) return callback(error);
-
-        let message = '';
-        if (backupConfig.provider === 'noop') {
-            message = 'Cloudron backups are disabled. Please ensure this server is backed up using alternate means. See https://cloudron.io/documentation/backups/#storage-providers for more information.';
-        } else if (backupConfig.provider === 'filesystem' && !backupConfig.externalDisk) {
-            message = 'Cloudron backups are currently on the same disk as the Cloudron server instance. This is dangerous and can lead to complete data loss if the disk fails. See https://cloudron.io/documentation/backups/#storage-providers for storing backups in an external location.';
-        }
-
-        callback(null, message);
-    });
-}
@@ -0,0 +1,130 @@
+'use strict';
+
+exports = module.exports = {
+    verifySetupToken: verifySetupToken,
+    setupDone: setupDone,
+
+    sendHeartbeat: sendHeartbeat,
+    setPtrRecord: setPtrRecord,
+
+    CaasError: CaasError
+};
+
+var assert = require('assert'),
+    config = require('./config.js'),
+    debug = require('debug')('box:caas'),
+    settings = require('./settings.js'),
+    superagent = require('superagent'),
+    util = require('util');
+
+function CaasError(reason, errorOrMessage) {
+    assert.strictEqual(typeof reason, 'string');
+    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
+
+    Error.call(this);
+    Error.captureStackTrace(this, this.constructor);
+
+    this.name = this.constructor.name;
+    this.reason = reason;
+    if (typeof errorOrMessage === 'undefined') {
+        this.message = reason;
+    } else if (typeof errorOrMessage === 'string') {
+        this.message = errorOrMessage;
+    } else {
+        this.message = 'Internal error';
+        this.nestedError = errorOrMessage;
+    }
+}
+util.inherits(CaasError, Error);
+CaasError.BAD_FIELD = 'Field error';
+CaasError.BAD_STATE = 'Bad state';
+CaasError.INVALID_TOKEN = 'Invalid Token';
+CaasError.INTERNAL_ERROR = 'Internal Error';
+CaasError.EXTERNAL_ERROR = 'External Error';
+
+function getCaasConfig(callback) {
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getCaasConfig(function (error, result) {
+        if (error) return callback(new CaasError(CaasError.INTERNAL_ERROR, error));
+
+        callback(null, result);
+    });
+}
+
+function verifySetupToken(setupToken, callback) {
+    assert.strictEqual(typeof setupToken, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getCaasConfig(function (error, caasConfig) {
+        if (error) return callback(new CaasError(CaasError.INTERNAL_ERROR, error));
+
+        superagent.get(config.apiServerOrigin() + '/api/v1/boxes/' + caasConfig.boxId + '/setup/verify').query({ setupToken: setupToken })
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+                if (result.statusCode === 403) return callback(new CaasError(CaasError.INVALID_TOKEN));
+                if (result.statusCode === 409) return callback(new CaasError(CaasError.BAD_STATE, 'Already setup'));
+                if (result.statusCode !== 200) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+
+                callback(null);
+            });
+    });
+}
+
+function setupDone(setupToken, callback) {
+    assert.strictEqual(typeof setupToken, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    settings.getCaasConfig(function (error, caasConfig) {
+        if (error) return callback(new CaasError(CaasError.INTERNAL_ERROR, error));
+
+        // Now let the api server know we got activated
+        superagent.post(config.apiServerOrigin() + '/api/v1/boxes/' + caasConfig.boxId + '/setup/done').query({ setupToken: setupToken })
+            .timeout(30 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+                if (result.statusCode === 403) return callback(new CaasError(CaasError.INVALID_TOKEN));
+                if (result.statusCode === 409) return callback(new CaasError(CaasError.BAD_STATE, 'Already setup'));
+                if (result.statusCode !== 201) return callback(new CaasError(CaasError.EXTERNAL_ERROR, error));
+
+                callback(null);
+            });
+    });
+}
+
+function sendHeartbeat() {
+    assert(config.provider() === 'caas', 'Heartbeat is only sent for managed cloudrons');
+
+    getCaasConfig(function (error, result) {
+        if (error) return debug('Caas config missing', error);
+
+        var url = config.apiServerOrigin() + '/api/v1/boxes/' + result.boxId + '/heartbeat';
+        superagent.post(url).query({ token: result.token, version: config.version() }).timeout(30 * 1000).end(function (error, result) {
+            if (error && !error.response) debug('Network error sending heartbeat.', error);
+            else if (result.statusCode !== 200) debug('Server responded to heartbeat with %s %s', result.statusCode, result.text);
+            else debug('Heartbeat sent to %s', url);
+        });
+    });
+}
+
+function setPtrRecord(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    getCaasConfig(function (error, result) {
+        if (error) return callback(error);
+
+        superagent
+            .post(config.apiServerOrigin() + '/api/v1/boxes/' + result.boxId + '/ptr')
+            .query({ token: result.token })
+            .send({ domain: domain })
+            .timeout(5 * 1000)
+            .end(function (error, result) {
+                if (error && !error.response) return callback(new CaasError(CaasError.EXTERNAL_ERROR, 'Cannot reach appstore'));
+                if (result.statusCode !== 202) return callback(new CaasError(CaasError.EXTERNAL_ERROR, util.format('%s %j', result.statusCode, result.body)));
+
+                return callback(null);
+            });
+    });
+}
@@ -80,7 +80,7 @@ function urlBase64Encode(string) {
 }

 function b64(str) {
-    var buf = util.isBuffer(str) ? str : Buffer.from(str);
+    var buf = util.isBuffer(str) ? str : new Buffer(str);
    return urlBase64Encode(buf.toString('base64'));
 }

@@ -226,7 +226,7 @@ Acme2.prototype.waitForOrder = function (orderUrl, callback) {

    debug(`waitForOrder: ${orderUrl}`);

-    async.retry({ times: 15, interval: 20000 }, function (retryCallback) {
+    async.retry({ times: 10, interval: 5000 }, function (retryCallback) {
        debug('waitForOrder: getting status');

        superagent.get(orderUrl).timeout(30 * 1000).end(function (error, result) {
@@ -290,7 +290,7 @@ Acme2.prototype.waitForChallenge = function (challenge, callback) {

    debug('waitingForChallenge: %j', challenge);

-    async.retry({ times: 15, interval: 20000 }, function (retryCallback) {
+    async.retry({ times: 10, interval: 5000 }, function (retryCallback) {
        debug('waitingForChallenge: getting status');

        superagent.get(challenge.url).timeout(30 * 1000).end(function (error, result) {
@@ -18,8 +18,6 @@ exports = module.exports = {

    addDefaultClients: addDefaultClients,

-    removeTokenPrivateFields: removeTokenPrivateFields,
-
    // client type enums
    TYPE_EXTERNAL: 'external',
    TYPE_BUILT_IN: 'built-in',
@@ -41,8 +39,7 @@ var apps = require('./apps.js'),
    users = require('./users.js'),
    UsersError = users.UsersError,
    util = require('util'),
-    uuid = require('uuid'),
-    _ = require('underscore');
+    uuid = require('uuid');

 function ClientsError(reason, errorOrMessage) {
    assert.strictEqual(typeof reason, 'string');
@@ -276,24 +273,16 @@ function addTokenByUserId(clientId, userId, expiresAt, options, callback) {
            accesscontrol.scopesForUser(user, function (error, userScopes) {
                if (error) return callback(new ClientsError(ClientsError.INTERNAL_ERROR, error));

-                const scope = accesscontrol.canonicalScopeString(result.scope);
-                const authorizedScopes = accesscontrol.intersectScopes(userScopes, scope.split(','));
+                var scope = accesscontrol.canonicalScopeString(result.scope);
+                var authorizedScopes = accesscontrol.intersectScopes(userScopes, scope.split(','));

-                const token = {
-                    id: 'tid-' + uuid.v4(),
-                    accessToken: hat(8 * 32),
-                    identifier: userId,
-                    clientId: result.id,
-                    expires: expiresAt,
-                    scope: authorizedScopes.join(','),
-                    name: name
-                };
+                var token = tokendb.generateToken();

-                tokendb.add(token, function (error) {
+                tokendb.add(token, userId, result.id, expiresAt, authorizedScopes.join(','), name, function (error) {
                    if (error) return callback(new ClientsError(ClientsError.INTERNAL_ERROR, error));

                    callback(null, {
-                        accessToken: token.accessToken,
+                        accessToken: token,
                        tokenScopes: authorizedScopes,
                        identifier: userId,
                        clientId: result.id,
@@ -353,7 +342,3 @@ function addDefaultClients(origin, callback) {
        clientdb.upsert.bind(null, 'cid-cli', 'Cloudron Tool', 'built-in', 'secret-cli', origin, '*')
    ], callback);
 }
-
-function removeTokenPrivateFields(token) {
-    return _.pick(token, 'id', 'identifier', 'clientId', 'scope', 'expires', 'name');
-}
@@ -8,40 +8,33 @@ exports = module.exports = {
    getConfig: getConfig,
    getDisks: getDisks,
    getLogs: getLogs,
+    getStatus: getStatus,

    reboot: reboot,
    isRebootRequired: isRebootRequired,

    onActivated: onActivated,

-    prepareDashboardDomain: prepareDashboardDomain,
    setDashboardDomain: setDashboardDomain,
-    setDashboardAndMailDomain: setDashboardAndMailDomain,
    renewCerts: renewCerts,

-    runSystemChecks: runSystemChecks,
+    checkDiskSpace: checkDiskSpace,

-    // exposed for testing
-    _checkDiskSpace: checkDiskSpace
+    configureWebadmin: configureWebadmin,
+    getWebadminStatus: getWebadminStatus
 };

-var apps = require('./apps.js'),
-    assert = require('assert'),
+var assert = require('assert'),
    async = require('async'),
-    backups = require('./backups.js'),
    clients = require('./clients.js'),
    config = require('./config.js'),
-    constants = require('./constants.js'),
    cron = require('./cron.js'),
    debug = require('debug')('box:cloudron'),
    domains = require('./domains.js'),
    DomainsError = require('./domains.js').DomainsError,
    df = require('@sindresorhus/df'),
-    eventlog = require('./eventlog.js'),
-    custom = require('./custom.js'),
    fs = require('fs'),
-    mail = require('./mail.js'),
-    notifications = require('./notifications.js'),
+    mailer = require('./mailer.js'),
    os = require('os'),
    path = require('path'),
    paths = require('./paths.js'),
@@ -51,6 +44,7 @@ var apps = require('./apps.js'),
    shell = require('./shell.js'),
    spawn = require('child_process').spawn,
    split = require('split'),
+    sysinfo = require('./sysinfo.js'),
    tasks = require('./tasks.js'),
    users = require('./users.js'),
    util = require('util');
@@ -59,6 +53,16 @@ var REBOOT_CMD = path.join(__dirname, 'scripts/reboot.sh');

 var NOOP_CALLBACK = function (error) { if (error) debug(error); };

+let gWebadminStatus = {
+    dns: false,
+    tls: false,
+    configuring: false,
+    restore: {
+        active: false,
+        error: null
+    }
+};
+
 function CloudronError(reason, errorOrMessage) {
    assert.strictEqual(typeof reason, 'string');
    assert(errorOrMessage instanceof Error || typeof errorOrMessage === 'string' || typeof errorOrMessage === 'undefined');
@@ -87,9 +91,9 @@ CloudronError.ALREADY_UPTODATE = 'No Update Available';
 function initialize(callback) {
    assert.strictEqual(typeof callback, 'function');

-    runStartupTasks();
+    cron.startPreActivationJobs(callback);

-    callback();
+    runStartupTasks();
 }

 function uninitialize(callback) {
@@ -109,7 +113,7 @@ function onActivated(callback) {
    // 2. the restore code path can run without sudo (since mail/ is non-root)
    async.series([
        platform.start,
-        cron.startJobs
+        cron.startPostActivationJobs
    ], callback);
 }

@@ -119,7 +123,7 @@ function runStartupTasks() {
    reverseProxy.configureDefaultServer(NOOP_CALLBACK);

    // always generate webadmin config since we have no versioning mechanism for the ejs
-    if (config.adminDomain()) reverseProxy.writeAdminConfig(config.adminDomain(), NOOP_CALLBACK);
+    configureWebadmin(NOOP_CALLBACK);

    // check activation state and start the platform
    users.isActivated(function (error, activated) {
@@ -171,10 +175,10 @@ function getConfig(callback) {
            mailFqdn: config.mailFqdn(),
            version: config.version(),
            isDemo: config.isDemo(),
+            edition: config.edition(),
            memory: os.totalmem(),
            provider: config.provider(),
-            cloudronName: allSettings[settings.CLOUDRON_NAME_KEY],
-            uiSpec: custom.uiSpec()
+            cloudronName: allSettings[settings.CLOUDRON_NAME_KEY]
        });
    });
 }
@@ -190,32 +194,8 @@ function isRebootRequired(callback) {
    callback(null, fs.existsSync('/var/run/reboot-required'));
 }

-// called from cron.js
-function runSystemChecks() {
-    async.parallel([
-        checkBackupConfiguration,
-        checkDiskSpace,
-        checkMailStatus,
-        checkRebootRequired
-    ], function (error) {
-        debug('runSystemChecks: done', error);
-    });
-}
-
-function checkBackupConfiguration(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('Checking backup configuration');
-
-    backups.checkConfiguration(function (error, message) {
-        if (error) return callback(error);
-
-        notifications.alert(notifications.ALERT_BACKUP_CONFIG, 'Backup configuration is unsafe', message, callback);
-    });
-}
-
 function checkDiskSpace(callback) {
-    assert.strictEqual(typeof callback, 'function');
+    callback = callback || NOOP_CALLBACK;

    debug('Checking disk space');

@@ -245,50 +225,31 @@ function checkDiskSpace(callback) {

            debug('Disk space checked. ok: %s', !oos);

-            notifications.alert(notifications.ALERT_DISK_SPACE, 'Server is running out of disk space', oos ? JSON.stringify(entries, null, 4) : '', callback);
-        }).catch(function (error) {
-            if (error) console.error(error);
+            if (oos) mailer.outOfDiskSpace(JSON.stringify(entries, null, 4));
+
            callback();
+        }).catch(function (error) {
+            debug('df error %s', error.message);
+            mailer.outOfDiskSpace(error.message);
+            return callback();
        });
    });
 }

-function checkMailStatus(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('checking mail status');
-
-    mail.checkConfiguration(function (error, message) {
-        if (error) return callback(error);
-
-        notifications.alert(notifications.ALERT_MAIL_STATUS, 'Email is not configured properly', message, callback);
-    });
-}
-
-function checkRebootRequired(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('checking if reboot required');
-
-    isRebootRequired(function (error, rebootRequired) {
-        if (error) return callback(error);
-
-        notifications.alert(notifications.ALERT_REBOOT, 'Reboot Required', rebootRequired ? 'To finish security updates, a [reboot](/#/system) is necessary.' : '', callback);
-    });
-}
-
 function getLogs(unit, options, callback) {
    assert.strictEqual(typeof unit, 'string');
    assert(options && typeof options === 'object');
    assert.strictEqual(typeof callback, 'function');

-    assert.strictEqual(typeof options.lines, 'number');
-    assert.strictEqual(typeof options.format, 'string');
-    assert.strictEqual(typeof options.follow, 'boolean');
-
-    var lines = options.lines === -1 ? '+1' : options.lines,
+    var lines = options.lines || 100,
        format = options.format || 'json',
-        follow = options.follow;
+        follow = !!options.follow;
+
+    assert.strictEqual(typeof lines, 'number');
+    assert.strictEqual(typeof format, 'string');
+
+    assert.strictEqual(typeof lines, 'number');
+    assert.strictEqual(typeof format, 'string');

    debug('Getting logs for %s as %s', unit, format);

@@ -297,8 +258,7 @@ function getLogs(unit, options, callback) {

    // need to handle box.log without subdir
    if (unit === 'box') args.push(path.join(paths.LOG_DIR, 'box.log'));
-    else if (unit.startsWith('crash-')) args.push(path.join(paths.CRASH_LOG_DIR, unit.slice(6) + '.log'));
-    else return callback(new CloudronError(CloudronError.BAD_FIELD, 'No such unit'));
+    else args.push(path.join(paths.LOG_DIR, unit, 'app.log'));

    var cp = spawn('/usr/bin/tail', args);

@@ -323,77 +283,98 @@ function getLogs(unit, options, callback) {
    return callback(null, transformStream);
 }

-function prepareDashboardDomain(domain, auditSource, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof auditSource, 'object');
+function configureWebadmin(callback) {
    assert.strictEqual(typeof callback, 'function');

-    debug(`prepareDashboardDomain: ${domain}`);
+    debug('configureWebadmin: adminDomain:%s status:%j', config.adminDomain(), gWebadminStatus);

-    domains.get(domain, function (error, domainObject) {
-        if (error && error.reason === DomainsError.NOT_FOUND) return callback(new CloudronError(CloudronError.BAD_FIELD, 'No such domain'));
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+    if (process.env.BOX_ENV === 'test' || !config.adminDomain() || gWebadminStatus.configuring) return callback();

-        const fqdn = domains.fqdn(constants.ADMIN_LOCATION, domainObject);
+    gWebadminStatus.configuring = true; // re-entracy guard

-        apps.getAll(function (error, result) {
-            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+    function configureReverseProxy(error) {
+        debug('configureReverseProxy: error %j', error || null);

-            const conflict = result.filter(app => app.fqdn === fqdn);
-            if (conflict.length) return callback(new CloudronError(CloudronError.BAD_STATE, 'Dashboard location conflicts with an existing app'));
+        reverseProxy.configureAdmin({ userId: null, username: 'setup' }, function (error) {
+            debug('configureWebadmin: done error: %j', error || {});
+            gWebadminStatus.configuring = false;

-            let task = tasks.startTask(tasks.TASK_PREPARE_DASHBOARD_DOMAIN, [ domain, auditSource ]);
-            task.on('error', (error) => callback(new CloudronError(CloudronError.INTERNAL_ERROR, error)));
-            task.on('start', (taskId) => callback(null, taskId));
+            if (error) return callback(error);
+
+            gWebadminStatus.tls = true;
+
+            callback();
        });
-    });
-}
+    }

-// call this only pre activation since it won't start mail server
-function setDashboardDomain(domain, auditSource, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
+    // update the DNS. configure nginx regardless of whether it succeeded so that
+    // box is accessible even if dns creds are invalid
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return configureReverseProxy(error);

-    debug(`setDashboardDomain: ${domain}`);
+        domains.upsertDnsRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) {
+            debug('addWebadminDnsRecord: updated records with error:', error);
+            if (error) return configureReverseProxy(error);

-    domains.get(domain, function (error, domainObject) {
-        if (error && error.reason === DomainsError.NOT_FOUND) return callback(new CloudronError(CloudronError.BAD_FIELD, 'No such domain'));
-        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+            domains.waitForDnsRecord(config.adminLocation(), config.adminDomain(), 'A', ip, { interval: 30000, times: 50000 }, function (error) {
+                if (error) return configureReverseProxy(error);

-        reverseProxy.writeAdminConfig(domain, function (error) {
-            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+                gWebadminStatus.dns = true;

-            const fqdn = domains.fqdn(constants.ADMIN_LOCATION, domainObject);
-
-            config.setAdminDomain(domain);
-            config.setAdminFqdn(fqdn);
-
-            clients.addDefaultClients(config.adminOrigin(), function (error) {
-                if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
-
-                eventlog.add(eventlog.ACTION_DASHBOARD_DOMAIN_UPDATE, auditSource, { domain: domain, fqdn: fqdn });
-
-                callback(null);
+                configureReverseProxy();
            });
        });
    });
 }

-// call this only post activation because it will restart mail server
-function setDashboardAndMailDomain(domain, auditSource, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof auditSource, 'object');
+function getWebadminStatus() {
+    return gWebadminStatus;
+}
+
+function getStatus(callback) {
    assert.strictEqual(typeof callback, 'function');

-    debug(`setDashboardAndMailDomain: ${domain}`);
+    users.isActivated(function (error, activated) {
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));

-    setDashboardDomain(domain, auditSource, function (error) {
-        if (error) return callback(error);
+        settings.getCloudronName(function (error, cloudronName) {
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));

-        mail.onMailFqdnChanged(NOOP_CALLBACK); // this will update dns and re-configure mail server
+            callback(null, {
+                version: config.version(),
+                apiServerOrigin: config.apiServerOrigin(), // used by CaaS tool
+                provider: config.provider(),
+                cloudronName: cloudronName,
+                adminFqdn: config.adminDomain() ? config.adminFqdn() : null,
+                activated: activated,
+                edition: config.edition(),
+                webadminStatus: gWebadminStatus // only valid when !activated
+            });
+        });
+    });
+}

-        callback(null);
+function setDashboardDomain(domain, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    debug(`setDashboardDomain: ${domain}`);
+
+    domains.get(domain, function (error, result) {
+        if (error && error.reason === DomainsError.NOT_FOUND) return callback(new CloudronError(CloudronError.BAD_FIELD, 'No such domain'));
+        if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+        config.setAdminDomain(result.domain);
+        config.setAdminLocation('my');
+        config.setAdminFqdn('my' + (result.config.hyphenatedSubdomains ? '-' : '.') + result.domain);
+
+        clients.addDefaultClients(config.adminOrigin(), function (error) {
+            if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error));
+
+            callback(null);
+
+            configureWebadmin(NOOP_CALLBACK); // ## trigger as task
+        });
    });
 }

@@ -20,19 +20,28 @@ exports = module.exports = {
    setFqdn: setAdminDomain,
    setAdminDomain: setAdminDomain,
    setAdminFqdn: setAdminFqdn,
+    setAdminLocation: setAdminLocation,
    version: version,
    database: database,
+    edition: edition,

    // these values are derived
    adminOrigin: adminOrigin,
    internalAdminOrigin: internalAdminOrigin,
-    sysadminOrigin: sysadminOrigin, // localhost routes
+    sysadminOrigin: sysadminOrigin, // caas routes
+    adminLocation: adminLocation,
    adminFqdn: adminFqdn,
+    mailLocation: mailLocation,
    mailFqdn: mailFqdn,
    hasIPv6: hasIPv6,
+    dkimSelector: dkimSelector,

+    isManaged: isManaged,
    isDemo: isDemo,

+    // feature flags based on editions (these have a separate license from standard edition)
+    isSpacesEnabled: isSpacesEnabled,
+
    // for testing resets to defaults
    _reset: _reset
 };
@@ -65,8 +74,10 @@ function saveSync() {
        webServerOrigin: data.webServerOrigin,
        adminDomain: data.adminDomain,
        adminFqdn: data.adminFqdn,
+        adminLocation: data.adminLocation,
        provider: data.provider,
-        isDemo: data.isDemo
+        isDemo: data.isDemo,
+        edition: data.edition
    };

    fs.writeFileSync(cloudronConfigFileName, JSON.stringify(conf, null, 4)); // functions are ignored by JSON.stringify
@@ -84,6 +95,7 @@ function initConfig() {
    // setup defaults
    data.adminFqdn = '';
    data.adminDomain = '';
+    data.adminLocation = 'my';
    data.port = 3000;
    data.apiServerOrigin = null;
    data.webServerOrigin = null;
@@ -92,6 +104,7 @@ function initConfig() {
    data.sysadminPort = 3001;
    data.ldapPort = 3002;
    data.dockerProxyPort = 3003;
+    data.edition = '';

    // keep in sync with start.sh
    data.database = {
@@ -106,9 +119,8 @@ function initConfig() {
    if (exports.TEST) {
        data.port = 5454;
        data.apiServerOrigin = 'http://localhost:6060'; // hock doesn't support https
-
-        // see setupTest script how the mysql-server is run
-        data.database.hostname = require('child_process').execSync('docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}" mysql-server').toString().trim();
+        data.database.password = '';
+        data.database.name = 'boxtest';
    }

    // overwrite defaults with saved config
@@ -155,6 +167,19 @@ function adminDomain() {
    return get('adminDomain');
 }

+function mailLocation() {
+    return get('adminLocation'); // not a typo! should be same as admin location until we figure out certificates
+}
+
+function setAdminLocation(location) {
+    set('adminLocation', location);
+}
+
+
+function adminLocation() {
+    return get('adminLocation');
+}
+
 function setAdminFqdn(adminFqdn) {
    set('adminFqdn', adminFqdn);
 }
@@ -192,12 +217,30 @@ function isDemo() {
    return get('isDemo') === true;
 }

+function isSpacesEnabled() {
+    return get('edition') === 'education';
+}
+
 function provider() {
    return get('provider');
 }

+function isManaged() {
+    return edition() === 'hostingprovider';
+}
+
 function hasIPv6() {
    const IPV6_PROC_FILE = '/proc/net/if_inet6';
-    // on contabo, /proc/net/if_inet6 is an empty file. so just exists is not enough
-    return fs.existsSync(IPV6_PROC_FILE) && fs.readFileSync(IPV6_PROC_FILE, 'utf8').trim().length !== 0;
+    return fs.existsSync(IPV6_PROC_FILE);
+}
+
+// it has to change with the adminLocation so that multiple cloudrons
+// can send out emails at the same time.
+function dkimSelector() {
+    var loc = adminLocation();
+    return loc === 'my' ? 'cloudron' : `cloudron-${loc.replace(/\./g, '')}`;
+}
+
+function edition() {
+    return get('edition');
 }
@@ -1,6 +1,7 @@
 'use strict';

 exports = module.exports = {
+    API_LOCATION: 'api', // this is unused but reserved for future use (#403)
    SMTP_LOCATION: 'smtp',
    IMAP_LOCATION: 'imap',

@@ -16,8 +17,9 @@ exports = module.exports = {
        'admins', 'users'         // ldap code uses 'users' pseudo group
    ],

-    ADMIN_LOCATION: 'my',
+    ADMIN_NAME: 'Settings',

+    NGINX_ADMIN_CONFIG_FILE_NAME: 'admin.conf',
    NGINX_DEFAULT_CONFIG_FILE_NAME: 'default.conf',

    GHOST_USER_FILE: '/tmp/cloudron_ghost.json',
@@ -28,8 +30,6 @@ exports = module.exports = {

    DEMO_USERNAME: 'cloudron',

-    AUTOUPDATE_PATTERN_NEVER: 'never',
-
-    SECRET_PLACEHOLDER: String.fromCharCode(0x25CF).repeat(8)
+    AUTOUPDATE_PATTERN_NEVER: 'never'
 };

@@ -1,60 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    sendFailureLogs: sendFailureLogs
-};
-
-var assert = require('assert'),
-    auditSource = require('./auditsource.js'),
-    eventlog = require('./eventlog.js'),
-    safe = require('safetydance'),
-    path = require('path'),
-    paths = require('./paths.js'),
-    util = require('util');
-
-const COLLECT_LOGS_CMD = path.join(__dirname, 'scripts/collectlogs.sh');
-
-const CRASH_LOG_TIMESTAMP_OFFSET = 1000 * 60 * 60; // 60 min
-const CRASH_LOG_TIMESTAMP_FILE = '/tmp/crashlog.timestamp';
-
-function collectLogs(unitName, callback) {
-    assert.strictEqual(typeof unitName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    var logs = safe.child_process.execSync('sudo ' + COLLECT_LOGS_CMD + ' ' + unitName, { encoding: 'utf8' });
-    if (!logs) return callback(safe.error);
-
-    callback(null, logs);
-}
-
-function sendFailureLogs(unitName, callback) {
-    assert.strictEqual(typeof unitName, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    // check if we already sent a mail in the last CRASH_LOG_TIME_OFFSET window
-    const timestamp = safe.fs.readFileSync(CRASH_LOG_TIMESTAMP_FILE, 'utf8');
-    if (timestamp && (parseInt(timestamp) + CRASH_LOG_TIMESTAMP_OFFSET) > Date.now()) {
-        console.log('Crash log already sent within window');
-        return callback();
-    }
-
-    collectLogs(unitName, function (error, logs) {
-        if (error) {
-            console.error('Failed to collect logs.', error);
-            logs = util.format('Failed to collect logs.', error);
-        }
-
-        const crashId = `${new Date().toISOString()}`;
-        console.log(`Creating crash log for ${unitName} with id ${crashId}`);
-
-        if (!safe.fs.writeFileSync(path.join(paths.CRASH_LOG_DIR, `${crashId}.log`), logs)) console.log(`Failed to stash logs to ${crashId}.log:`, safe.error);
-
-        eventlog.add(eventlog.ACTION_PROCESS_CRASH, auditSource.HEALTH_MONITOR, { processName: unitName, crashId: crashId }, function (error) {
-            if (error) console.log(`Error sending crashlog. Logs stashed at ${crashId}.log`);
-
-            safe.fs.writeFileSync(CRASH_LOG_TIMESTAMP_FILE, String(Date.now()));
-
-            callback();
-        });
-    });
-}
@@ -1,24 +1,24 @@
 'use strict';

 exports = module.exports = {
-    startJobs: startJobs,
+    startPostActivationJobs: startPostActivationJobs,
+    startPreActivationJobs: startPreActivationJobs,

-    stopJobs: stopJobs,
-
-    handleSettingsChanged: handleSettingsChanged
+    stopJobs: stopJobs
 };

 var appHealthMonitor = require('./apphealthmonitor.js'),
    apps = require('./apps.js'),
    appstore = require('./appstore.js'),
    assert = require('assert'),
-    auditSource = require('./auditsource.js'),
    backups = require('./backups.js'),
+    caas = require('./caas.js'),
    cloudron = require('./cloudron.js'),
    config = require('./config.js'),
    constants = require('./constants.js'),
    CronJob = require('cron').CronJob,
    debug = require('debug')('box:cron'),
+    digest = require('./digest.js'),
    dyndns = require('./dyndns.js'),
    eventlog = require('./eventlog.js'),
    janitor = require('./janitor.js'),
@@ -34,11 +34,13 @@ var gJobs = {
    appUpdateChecker: null,
    backup: null,
    boxUpdateChecker: null,
-    systemChecks: null,
+    caasHeartbeat: null,
+    checkDiskSpace: null,
    certificateRenew: null,
    cleanupBackups: null,
    cleanupEventlog: null,
    cleanupTokens: null,
+    digestEmail: null,
    dockerVolumeCleaner: null,
    dynamicDns: null,
    schedulerSync: null,
@@ -46,6 +48,7 @@ var gJobs = {
 };

 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+var AUDIT_SOURCE = { userId: null, username: 'cron' };

 // cron format
 // Seconds: 0-59
@@ -55,7 +58,24 @@ var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 // Months: 0-11
 // Day of Week: 0-6

-function startJobs(callback) {
+function startPreActivationJobs(callback) {
+    if (config.provider() === 'caas') {
+        // hack: send the first heartbeat only after we are running for 60 seconds
+        // required as we end up sending a heartbeat and then cloudron-setup reboots the server
+        var seconds = (new Date()).getSeconds() - 1;
+        if (seconds === -1) seconds = 59;
+
+        gJobs.caasHeartbeat = new CronJob({
+            cronTime: `${seconds} */1 * * * *`, // every minute
+            onTick: caas.sendHeartbeat,
+            start: true
+        });
+    }
+
+    callback();
+}
+
+function startPostActivationJobs(callback) {
    assert.strictEqual(typeof callback, 'function');

    var randomHourMinute = Math.floor(60*Math.random());
@@ -65,6 +85,11 @@ function startJobs(callback) {
        start: true
    });

+    settings.on(settings.TIME_ZONE_KEY, recreateJobs);
+    settings.on(settings.APP_AUTOUPDATE_PATTERN_KEY, appAutoupdatePatternChanged);
+    settings.on(settings.BOX_AUTOUPDATE_PATTERN_KEY, boxAutoupdatePatternChanged);
+    settings.on(settings.DYNAMIC_DNS_KEY, dynamicDnsChanged);
+
    settings.getAll(function (error, allSettings) {
        if (error) return callback(error);

@@ -77,19 +102,6 @@ function startJobs(callback) {
    });
 }

-function handleSettingsChanged(key, value) {
-    assert.strictEqual(typeof key, 'string');
-
-    // value is a variant
-    switch (key) {
-    case settings.TIME_ZONE_KEY: recreateJobs(value); break;
-    case settings.APP_AUTOUPDATE_PATTERN_KEY: appAutoupdatePatternChanged(value); break;
-    case settings.BOX_AUTOUPDATE_PATTERN_KEY: boxAutoupdatePatternChanged(value); break;
-    case settings.DYNAMIC_DNS_KEY: dynamicDnsChanged(value); break;
-    default: break;
-    }
-}
-
 function recreateJobs(tz) {
    assert.strictEqual(typeof tz, 'string');

@@ -98,17 +110,16 @@ function recreateJobs(tz) {
    if (gJobs.backup) gJobs.backup.stop();
    gJobs.backup = new CronJob({
        cronTime: '00 00 */6 * * *', // check every 6 hours
-        onTick: backups.ensureBackup.bind(null, auditSource.CRON, NOOP_CALLBACK),
+        onTick: backups.ensureBackup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
        start: true,
        timeZone: tz
    });

-    if (gJobs.systemChecks) gJobs.systemChecks.stop();
-    gJobs.systemChecks = new CronJob({
-        cronTime: '00 30 * * * *', // every 30 minutes. if you change this interval, change the notification messages with correct duration
-        onTick: cloudron.runSystemChecks,
+    if (gJobs.checkDiskSpace) gJobs.checkDiskSpace.stop();
+    gJobs.checkDiskSpace = new CronJob({
+        cronTime: '00 30 */4 * * *', // every 4 hours
+        onTick: cloudron.checkDiskSpace,
        start: true,
-        runOnInit: true, // run system check immediately
        timeZone: tz
    });

@@ -118,7 +129,7 @@ function recreateJobs(tz) {
    if (gJobs.boxUpdateCheckerJob) gJobs.boxUpdateCheckerJob.stop();
    gJobs.boxUpdateCheckerJob = new CronJob({
        cronTime: '00 ' + randomMinute + ' * * * *', // once an hour
-        onTick: () => updateChecker.checkBoxUpdates(NOOP_CALLBACK),
+        onTick: updateChecker.checkBoxUpdates,
        start: true,
        timeZone: tz
    });
@@ -126,7 +137,7 @@ function recreateJobs(tz) {
    if (gJobs.appUpdateChecker) gJobs.appUpdateChecker.stop();
    gJobs.appUpdateChecker = new CronJob({
        cronTime: '00 ' + randomMinute + ' * * * *', // once an hour
-        onTick: () => updateChecker.checkAppUpdates(NOOP_CALLBACK),
+        onTick: updateChecker.checkAppUpdates,
        start: true,
        timeZone: tz
    });
@@ -142,7 +153,7 @@ function recreateJobs(tz) {
    if (gJobs.cleanupBackups) gJobs.cleanupBackups.stop();
    gJobs.cleanupBackups = new CronJob({
        cronTime: '00 45 */6 * * *', // every 6 hours. try not to overlap with ensureBackup job
-        onTick: backups.startCleanupTask.bind(null, auditSource.CRON, NOOP_CALLBACK),
+        onTick: backups.cleanup.bind(null, AUDIT_SOURCE, NOOP_CALLBACK),
        start: true,
        timeZone: tz
    });
@@ -174,7 +185,15 @@ function recreateJobs(tz) {
    if (gJobs.certificateRenew) gJobs.certificateRenew.stop();
    gJobs.certificateRenew = new CronJob({
        cronTime: '00 00 */12 * * *', // every 12 hours
-        onTick: cloudron.renewCerts.bind(null, {}, auditSource.CRON, NOOP_CALLBACK),
+        onTick: cloudron.renewCerts.bind(null, {}, AUDIT_SOURCE, NOOP_CALLBACK),
+        start: true,
+        timeZone: tz
+    });
+
+    if (gJobs.digestEmail) gJobs.digestEmail.stop();
+    gJobs.digestEmail = new CronJob({
+        cronTime: '00 00 00 * * 3', // every wednesday
+        onTick: digest.maybeSend,
        start: true,
        timeZone: tz
    });
@@ -204,7 +223,7 @@ function boxAutoupdatePatternChanged(pattern) {
            var updateInfo = updateChecker.getUpdateInfo();
            if (updateInfo.box) {
                debug('Starting autoupdate to %j', updateInfo.box);
-                updater.updateToLatest({ skipBackup: false }, auditSource.CRON, NOOP_CALLBACK);
+                updater.updateToLatest(AUDIT_SOURCE, NOOP_CALLBACK);
            } else {
                debug('No box auto updates available');
            }
@@ -230,7 +249,7 @@ function appAutoupdatePatternChanged(pattern) {
            var updateInfo = updateChecker.getUpdateInfo();
            if (updateInfo.apps) {
                debug('Starting app update to %j', updateInfo.apps);
-                apps.autoupdateApps(updateInfo.apps, auditSource.CRON, NOOP_CALLBACK);
+                apps.autoupdateApps(updateInfo.apps, AUDIT_SOURCE, NOOP_CALLBACK);
            } else {
                debug('No app auto updates available');
            }
@@ -249,7 +268,7 @@ function dynamicDnsChanged(enabled) {
    if (enabled) {
        gJobs.dynamicDns = new CronJob({
            cronTime: '00 */10 * * * *',
-            onTick: dyndns.sync.bind(null, auditSource.CRON, NOOP_CALLBACK),
+            onTick: dyndns.sync,
            start: true,
            timeZone: gJobs.boxUpdateCheckerJob.cronTime.zone // hack
        });
@@ -262,6 +281,11 @@ function dynamicDnsChanged(enabled) {
 function stopJobs(callback) {
    assert.strictEqual(typeof callback, 'function');

+    settings.removeListener(settings.TIME_ZONE_KEY, recreateJobs);
+    settings.removeListener(settings.APP_AUTOUPDATE_PATTERN_KEY, appAutoupdatePatternChanged);
+    settings.removeListener(settings.BOX_AUTOUPDATE_PATTERN_KEY, boxAutoupdatePatternChanged);
+    settings.removeListener(settings.DYNAMIC_DNS_KEY, dynamicDnsChanged);
+
    for (var job in gJobs) {
        if (!gJobs[job]) continue;
        gJobs[job].stop();
@@ -1,67 +0,0 @@
-'use strict';
-
-let config = require('./config.js'),
-    debug = require('debug')('box:features'),
-    lodash = require('lodash'),
-    paths = require('./paths.js'),
-    safe = require('safetydance'),
-    yaml = require('js-yaml');
-
-exports = module.exports = {
-    uiSpec: uiSpec,
-    spec: spec
-};
-
-const DEFAULT_SPEC = {
-    appstore: {
-        blacklist: [],
-        whitelist: null // null imples, not set. this is an object and not an array
-    },
-    backups: {
-        configurable: true
-    },
-    domains: {
-        dynamicDns: true,
-        changeDashboardDomain: true
-    },
-    subscription: {
-        configurable: true
-    },
-    support: {
-        email: 'support@cloudron.io',
-        remoteSupport: true,
-        ticketFormBody:
-            'Use this form to open support tickets. You can also write directly to [support@cloudron.io](mailto:support@cloudron.io).\n\n'
-            + `* [Knowledge Base & App Docs](${config.webServerOrigin()}/documentation/apps/?support_view)\n`
-            + `* [Custom App Packaging & API](${config.webServerOrigin()}/developer/packaging/?support_view)\n`
-            + '* [Forum](https://forum.cloudron.io/)\n\n',
-        submitTickets: true
-    },
-    alerts: {
-        email: '',
-        notifyCloudronAdmins: false
-    },
-    footer: {
-        body: '&copy; 2019 [Cloudron](https://cloudron.io) [Forum <i class="fa fa-comments"></i>](https://forum.cloudron.io)'
-    }
-};
-
-const gSpec = (function () {
-    try {
-        if (!safe.fs.existsSync(paths.CUSTOM_FILE)) return DEFAULT_SPEC;
-        const c = yaml.safeLoad(safe.fs.readFileSync(paths.CUSTOM_FILE, 'utf8'));
-        return lodash.merge({}, DEFAULT_SPEC, c);
-    } catch (e) {
-        debug(`Error loading features file from ${paths.CUSTOM_FILE} : ${e.message}`);
-        return DEFAULT_SPEC;
-    }
-})();
-
-// flags sent to the UI. this is separate because we have values that are secret to the backend
-function uiSpec() {
-    return gSpec;
-}
-
-function spec() {
-    return gSpec;
-}
@@ -36,8 +36,7 @@ function initialize(callback) {
        port: config.database().port,
        database: config.database().name,
        multipleStatements: false,
-        ssl: false,
-        timezone: 'Z' // mysql follows the SYSTEM timezone. on Cloudron, this is UTC
+        ssl: false
    });

    gConnectionPool.on('connection', function (connection) {
@@ -86,7 +85,7 @@ function reconnect(callback) {
 function clear(callback) {
    assert.strictEqual(typeof callback, 'function');

-    var cmd = util.format('mysql --host="%s" --user="%s" --password="%s" -Nse "SHOW TABLES" %s | grep -v "^migrations$" | while read table; do mysql --host="%s" --user="%s" --password="%s" -e "SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE $table" %s; done',
+    var cmd = util.format('mysql --host=%s --user="%s" --password="%s" -Nse "SHOW TABLES" %s | grep -v "^migrations$" | while read table; do mysql --host=%s --user="%s" --password="%s" -e "SET FOREIGN_KEY_CHECKS = 0; TRUNCATE TABLE $table" %s; done',
        config.database().hostname, config.database().username, config.database().password, config.database().name,
        config.database().hostname, config.database().username, config.database().password, config.database().name);

@@ -178,7 +177,9 @@ function importFromFile(file, callback) {
    assert.strictEqual(typeof file, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var cmd = `/usr/bin/mysql -h "${config.database().hostname}" -u ${config.database().username} -p${config.database().password} ${config.database().name} < ${file}`;
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+
+    var cmd = `/usr/bin/mysql -u ${config.database().username} ${password} ${config.database().name} < ${file}`;

    async.series([
        query.bind(null, 'CREATE DATABASE IF NOT EXISTS box'),
@@ -190,7 +191,9 @@ function exportToFile(file, callback) {
    assert.strictEqual(typeof file, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var cmd = `/usr/bin/mysqldump -h "${config.database().hostname}" -u root -p${config.database().password} --single-transaction --routines --triggers ${config.database().name} > "${file}"`;
+    var password = config.database().password ? '-p' + config.database().password : '--skip-password';
+    var cmd = `/usr/bin/mysqldump -u root ${password} --single-transaction --routines \
+            --triggers ${config.database().name} > "${file}"`;

    child_process.exec(cmd, callback);
 }
@@ -1,55 +0,0 @@
-'use strict';
-
-let assert = require('assert'),
-    path = require('path');
-
-class DataLayout {
-    constructor(localRoot, dirMap) {
-        assert.strictEqual(typeof localRoot, 'string');
-        assert(Array.isArray(dirMap), 'Expecting layout to be an array');
-
-        this._localRoot = localRoot;
-        this._dirMap = dirMap;
-        this._remoteRegexps = dirMap.map((l) => new RegExp('^\\./' + l.remoteDir + '/?'));
-        this._localRegexps = dirMap.map((l) => new RegExp('^' + l.localDir + '/?'));
-    }
-    toLocalPath(remoteName) {
-        assert.strictEqual(typeof remoteName, 'string');
-
-        for (let i = 0; i < this._remoteRegexps.length; i++) {
-            if (!remoteName.match(this._remoteRegexps[i])) continue;
-            return remoteName.replace(this._remoteRegexps[i], this._dirMap[i].localDir + '/'); // make paths absolute
-        }
-        return remoteName.replace(new RegExp('^\\.'), this._localRoot);
-    }
-    toRemotePath(localName) {
-        assert.strictEqual(typeof localName, 'string');
-
-        for (let i = 0; i < this._localRegexps.length; i++) {
-            if (!localName.match(this._localRegexps[i])) continue;
-            return localName.replace(this._localRegexps[i], './' + this._dirMap[i].remoteDir + '/'); // make paths relative
-        }
-        return localName.replace(new RegExp('^' + this._localRoot + '/?'), './');
-    }
-    localRoot() {
-        return this._localRoot;
-    }
-    getBasename() { // used to generate cache file names
-        return path.basename(this._localRoot);
-    }
-    toString() {
-        return JSON.stringify({ localRoot: this._localRoot, layout: this._dirMap });
-    }
-    localPaths() {
-        return [ this._localRoot ].concat(this._dirMap.map((l) => l.localDir));
-    }
-    directoryMap() {
-        return this._dirMap;
-    }
-    static fromString(str) {
-        const obj = JSON.parse(str);
-        return new DataLayout(obj.localRoot, obj.layout);
-    }
-}
-
-exports = module.exports = DataLayout;
@@ -0,0 +1,63 @@
+'use strict';
+
+var appstore = require('./appstore.js'),
+    debug = require('debug')('box:digest'),
+    eventlog = require('./eventlog.js'),
+    updatechecker = require('./updatechecker.js'),
+    mailer = require('./mailer.js'),
+    settings = require('./settings.js');
+
+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
+exports = module.exports = {
+    maybeSend: maybeSend
+};
+
+function maybeSend(callback) {
+    callback = callback || NOOP_CALLBACK;
+
+    settings.getEmailDigest(function (error, enabled) {
+        if (error) return callback(error);
+
+        if (!enabled) {
+            debug('Email digest is disabled');
+            return callback();
+        }
+
+        var updateInfo = updatechecker.getUpdateInfo();
+        var pendingAppUpdates = updateInfo.apps || {};
+        pendingAppUpdates = Object.keys(pendingAppUpdates).map(function (key) { return pendingAppUpdates[key]; });
+
+        eventlog.getByCreationTime(new Date(new Date() - 7*86400000), function (error, events) {
+            if (error) return callback(error);
+
+            var appUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_APP_UPDATE; }).map(function (e) { return e.data; });
+            var boxUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_UPDATE; }).map(function (e) { return e.data; });
+            var certRenewals = events.filter(function (e) { return e.action === eventlog.ACTION_CERTIFICATE_RENEWAL; }).map(function (e) { return e.data; });
+            var usersAdded = events.filter(function (e) { return e.action === eventlog.ACTION_USER_ADD; }).map(function (e) { return e.data; });
+            var usersRemoved = events.filter(function (e) { return e.action === eventlog.ACTION_USER_REMOVE; }).map(function (e) { return e.data; });
+            var finishedBackups = events.filter(function (e) { return e.action === eventlog.ACTION_BACKUP_FINISH && !e.errorMessage; }).map(function (e) { return e.data; });
+
+            if (error) return callback(error);
+
+            var info = {
+                pendingAppUpdates: pendingAppUpdates,
+                pendingBoxUpdate: updateInfo.box || null,
+
+                finishedAppUpdates: appUpdates,
+                finishedBoxUpdates: boxUpdates,
+
+                certRenewals: certRenewals,
+                finishedBackups: finishedBackups, // only the successful backups
+                usersAdded: usersAdded,
+                usersRemoved: usersRemoved // unused because we don't have username to work with
+            };
+
+            // always send digest for backup failure notification
+            debug('maybeSend: sending digest email', info);
+            mailer.sendDigest(info);
+
+            callback();
+        });
+    });
+}
@@ -1,56 +1,38 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    config = require('../config.js'),
    debug = require('debug')('box:dns/caas'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    superagent = require('superagent'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    util = require('util');

-function getFqdn(location, domain) {
-    assert.strictEqual(typeof location, 'string');
+function getFqdn(subdomain, domain) {
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof domain, 'string');

-    return (location === '') ? domain : location + '-' + domain;
+    return (subdomain === '') ? domain : subdomain + '-' + domain;
 }

-function removePrivateFields(domainObject) {
-    domainObject.config.token = domains.SECRET_PLACEHOLDER;
-
-    // do not return the 'key'. in caas, this is private
-    delete domainObject.fallbackCertificate.key;
-
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function add(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config;
+    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + dnsConfig.fqdn : getFqdn(subdomain, dnsConfig.fqdn);

-    let fqdn = location !== '' && type === 'TXT' ? location + '.' + domainObject.domain : getFqdn(location, domainObject.domain);
-
-    debug('add: %s for zone %s of type %s with values %j', location, domainObject.domain, type, values);
+    debug('add: %s for zone %s of type %s with values %j', subdomain, dnsConfig.fqdn, type, values);

    var data = {
        type: type,
@@ -58,7 +40,7 @@ function upsert(domainObject, location, type, values, callback) {
    };

    superagent
-        .post(config.apiServerOrigin() + '/api/v1/caas/domains/' + fqdn)
+        .post(config.apiServerOrigin() + '/api/v1/domains/' + fqdn)
        .query({ token: dnsConfig.token })
        .send(data)
        .timeout(30 * 1000)
@@ -72,19 +54,19 @@ function upsert(domainObject, location, type, values, callback) {
        });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config;
-    const fqdn = location !== '' && type === 'TXT' ? location + '.' + domainObject.domain : getFqdn(location, domainObject.domain);
+    var fqdn = subdomain !== '' && type === 'TXT' ? subdomain + '.' + dnsConfig.fqdn : getFqdn(subdomain, dnsConfig.fqdn);

-    debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', domainObject.domain, location, type, fqdn);
+    debug('get: zoneName: %s subdomain: %s type: %s fqdn: %s', dnsConfig.fqdn, subdomain, type, fqdn);

    superagent
-        .get(config.apiServerOrigin() + '/api/v1/caas/domains/' + fqdn)
+        .get(config.apiServerOrigin() + '/api/v1/domains/' + fqdn)
        .query({ token: dnsConfig.token, type: type })
        .timeout(30 * 1000)
        .end(function (error, result) {
@@ -95,15 +77,26 @@ function get(domainObject, location, type, callback) {
        });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config;
-    debug('del: %s for zone %s of type %s with values %j', location, domainObject.domain, type, values);
+    add(dnsConfig, zoneName, subdomain, type, values, callback);
+}
+
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
+    assert.strictEqual(typeof callback, 'function');
+
+    debug('del: %s for zone %s of type %s with values %j', subdomain, dnsConfig.fqdn, type, values);

    var data = {
        type: type,
@@ -111,7 +104,7 @@ function del(domainObject, location, type, values, callback) {
    };

    superagent
-        .del(config.apiServerOrigin() + '/api/v1/caas/domains/' + getFqdn(location, domainObject.domain))
+        .del(config.apiServerOrigin() + '/api/v1/domains/' + getFqdn(subdomain, dnsConfig.fqdn))
        .query({ token: dnsConfig.token })
        .send(data)
        .timeout(30 * 1000)
@@ -126,42 +119,29 @@ function del(domainObject, location, type, values, callback) {
        });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config;
-
    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));

-    const ip = '127.0.0.1';
-
    var credentials = {
        token: dnsConfig.token,
+        fqdn: domain,
        hyphenatedSubdomains: true  // this will ensure we always use them, regardless of passed-in configs
    };

-    const location = 'cloudrontestdns';
+    const testSubdomain = 'cloudrontestdns';

-    upsert(domainObject, location, 'A', [ ip ], function (error) {
+    upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
        if (error) return callback(error);

-        debug('verifyDnsConfig: Test A record added');
+        debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-        del(domainObject, location, 'A', [ ip ], function (error) {
+        del(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error) {
            if (error) return callback(error);

            debug('verifyDnsConfig: Test A record removed again');
@@ -1,12 +1,10 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

@@ -14,25 +12,14 @@ var assert = require('assert'),
    async = require('async'),
    debug = require('debug')('box:dns/cloudflare'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    superagent = require('superagent'),
    util = require('util'),
-    waitForDns = require('./waitfordns.js'),
    _ = require('underscore');

 // we are using latest v4 stable API https://api.cloudflare.com/#getting-started-endpoints
 var CLOUDFLARE_ENDPOINT = 'https://api.cloudflare.com/client/v4';

-function removePrivateFields(domainObject) {
-    domainObject.config.token = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
-}
-
 function translateRequestError(result, callback) {
    assert.strictEqual(typeof result, 'object');
    assert.strictEqual(typeof callback, 'function');
@@ -66,14 +53,16 @@ function getZoneByName(dnsConfig, zoneName, callback) {
        });
 }

-// gets records filtered by zone, type and fqdn
-function getDnsRecords(dnsConfig, zoneId, fqdn, type, callback) {
+function getDnsRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, callback) {
    assert.strictEqual(typeof dnsConfig, 'object');
    assert.strictEqual(typeof zoneId, 'string');
-    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

+    var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;
+
    superagent.get(CLOUDFLARE_ENDPOINT + '/zones/' + zoneId + '/dns_records')
        .set('X-Auth-Key',dnsConfig.token)
        .set('X-Auth-Email',dnsConfig.email)
@@ -89,30 +78,32 @@ function getDnsRecords(dnsConfig, zoneId, fqdn, type, callback) {
        });
 }

-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
+    var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;

-    debug('upsert: %s for zone %s of type %s with values %j', fqdn, zoneName, type, values);
+    debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

-    getZoneByName(dnsConfig, zoneName, function(error, result) {
+    getZoneByName(dnsConfig, zoneName, function(error, result){
        if (error) return callback(error);

-        let zoneId = result.id;
+        var zoneId = result.id;

-        getDnsRecords(dnsConfig, zoneId, fqdn, type, function (error, dnsRecords) {
+        getDnsRecordsByZoneId(dnsConfig, zoneId, zoneName, subdomain, type, function (error, result) {
            if (error) return callback(error);

-            let i = 0; // // used to track available records to update instead of create
+            var dnsRecords = result;

-            async.eachSeries(values, function (value, iteratorCallback) {
+            // used to track available records to update instead of create
+            var i = 0;
+
+            async.eachSeries(values, function (value, callback) {
                var priority = null;

                if (type === 'MX') {
@@ -125,41 +116,35 @@ function upsert(domainObject, location, type, values, callback) {
                    name: fqdn,
                    content: value,
                    priority: priority,
-                    proxied: false,
                    ttl: 120  // 1 means "automatic" (meaning 300ms) and 120 is the lowest supported
                };

-                if (i >= dnsRecords.length) { // create a new record
-                    debug(`upsert: Adding new record fqdn: ${fqdn}, zoneName: ${zoneName} proxied: false`);
-
-                    superagent.post(CLOUDFLARE_ENDPOINT + '/zones/' + zoneId + '/dns_records')
-                        .set('X-Auth-Key', dnsConfig.token)
-                        .set('X-Auth-Email', dnsConfig.email)
+                if (i >= dnsRecords.length) {
+                    superagent.post(CLOUDFLARE_ENDPOINT + '/zones/'+ zoneId + '/dns_records')
+                        .set('X-Auth-Key',dnsConfig.token)
+                        .set('X-Auth-Email',dnsConfig.email)
                        .send(data)
                        .timeout(30 * 1000)
                        .end(function (error, result) {
-                            if (error && !error.response) return iteratorCallback(error);
-                            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, iteratorCallback);
+                            if (error && !error.response) return callback(error);
+                            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);

-                            iteratorCallback(null);
+                            callback(null);
                        });
-                } else { // replace existing record
-                    data.proxied = dnsRecords[i].proxied; // preserve proxied parameter
-
-                    debug(`upsert: Updating existing record fqdn: ${fqdn}, zoneName: ${zoneName} proxied: ${data.proxied}`);
-
-                    superagent.put(CLOUDFLARE_ENDPOINT + '/zones/' + zoneId + '/dns_records/' + dnsRecords[i].id)
-                        .set('X-Auth-Key', dnsConfig.token)
-                        .set('X-Auth-Email', dnsConfig.email)
+                } else {
+                    superagent.put(CLOUDFLARE_ENDPOINT + '/zones/'+ zoneId + '/dns_records/' + dnsRecords[i].id)
+                        .set('X-Auth-Key',dnsConfig.token)
+                        .set('X-Auth-Email',dnsConfig.email)
                        .send(data)
                        .timeout(30 * 1000)
                        .end(function (error, result) {
-                            ++i; // increment, as we have consumed the record
+                        // increment, as we have consumed the record
+                            ++i;

-                            if (error && !error.response) return iteratorCallback(error);
-                            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, iteratorCallback);
+                            if (error && !error.response) return callback(error);
+                            if (result.statusCode !== 200 || result.body.success !== true) return translateRequestError(result, callback);

-                            iteratorCallback(null);
+                            callback(null);
                        });
                }
            }, callback);
@@ -167,20 +152,17 @@ function upsert(domainObject, location, type, values, callback) {
    });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
-    getZoneByName(dnsConfig, zoneName, function(error, zone) {
+    getZoneByName(dnsConfig, zoneName, function(error, result){
        if (error) return callback(error);

-        getDnsRecords(dnsConfig, zone.id, fqdn, type, function (error, result) {
+        getDnsRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) {
            if (error) return callback(error);

            var tmp = result.map(function (record) { return record.content; });
@@ -191,21 +173,18 @@ function get(domainObject, location, type, callback) {
    });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
-    getZoneByName(dnsConfig, zoneName, function(error, zone) {
+    getZoneByName(dnsConfig, zoneName, function(error, result){
        if (error) return callback(error);

-        getDnsRecords(dnsConfig, zone.id, fqdn, type, function(error, result) {
+        getDnsRecordsByZoneId(dnsConfig, result.id, zoneName, subdomain, type, function(error, result) {
            if (error) return callback(error);
            if (result.length === 0) return callback(null);

@@ -218,8 +197,8 @@ function del(domainObject, location, type, values, callback) {

            async.eachSeries(tmp, function (record, callback) {
                superagent.del(CLOUDFLARE_ENDPOINT + '/zones/'+ zoneId + '/dns_records/' + record.id)
-                    .set('X-Auth-Key', dnsConfig.token)
-                    .set('X-Auth-Email', dnsConfig.email)
+                    .set('X-Auth-Key',dnsConfig.token)
+                    .set('X-Auth-Email',dnsConfig.email)
                    .timeout(30 * 1000)
                    .end(function (error, result) {
                        if (error && !error.response) return callback(error);
@@ -238,50 +217,16 @@ function del(domainObject, location, type, values, callback) {
    });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
-    debug('wait: %s for zone %s of type %s', fqdn, zoneName, type);
-
-    getZoneByName(dnsConfig, zoneName, function(error, result) {
-        if (error) return callback(error);
-
-        let zoneId = result.id;
-
-        getDnsRecords(dnsConfig, zoneId, fqdn, type, function (error, dnsRecords) {
-            if (error) return callback(error);
-            if (dnsRecords.length === 0) return callback(new DomainsError(DomainsError.NOT_FOUND, 'Domain not found'));
-
-            if (!dnsRecords[0].proxied) return waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-
-            debug('wait: skipping wait of proxied domain');
-
-            callback(null); // maybe we can check for dns to be cloudflare IPs? https://api.cloudflare.com/#cloudflare-ips-cloudflare-ip-details
-        });
-    });
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));
    if (!dnsConfig.email || typeof dnsConfig.email !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'email must be a non-empty string'));

-    const ip = '127.0.0.1';
-
    var credentials = {
        token: dnsConfig.token,
        email: dnsConfig.email
@@ -293,22 +238,22 @@ function verifyDnsConfig(domainObject, callback) {
        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));

-        getZoneByName(dnsConfig, zoneName, function(error, zone) {
+        getZoneByName(dnsConfig, zoneName, function(error, result) {
            if (error) return callback(error);

-            if (!_.isEqual(zone.name_servers.sort(), nameservers.sort())) {
-                debug('verifyDnsConfig: %j and %j do not match', nameservers, zone.name_servers);
+            if (!_.isEqual(result.name_servers.sort(), nameservers.sort())) {
+                debug('verifyDnsConfig: %j and %j do not match', nameservers, result.name_servers);
                return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Cloudflare'));
            }

-            const location = 'cloudrontestdns';
+            const testSubdomain = 'cloudrontestdns';

-            upsert(domainObject, location, 'A', [ ip ], function (error) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                if (error) return callback(error);

-                debug('verifyDnsConfig: Test A record added');
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-                del(domainObject, location, 'A', [ ip ], function (error) {
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                    if (error) return callback(error);

                    debug('verifyDnsConfig: Test A record removed again');
@@ -1,12 +1,10 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

@@ -14,12 +12,10 @@ var assert = require('assert'),
    async = require('async'),
    debug = require('debug')('box:dns/digitalocean'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    safe = require('safetydance'),
    superagent = require('superagent'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    util = require('util');

 var DIGITALOCEAN_ENDPOINT = 'https://api.digitalocean.com';

@@ -27,72 +23,57 @@ function formatError(response) {
    return util.format('DigitalOcean DNS error [%s] %j', response.statusCode, response.body);
 }

-function removePrivateFields(domainObject) {
-    domainObject.config.token = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
-}
-
-function getInternal(dnsConfig, zoneName, name, type, callback) {
+function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
    assert.strictEqual(typeof dnsConfig, 'object');
    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

    var nextPage = null, matchingRecords = [];

-    debug(`getInternal: getting dns records of ${zoneName} with ${name} and type ${type}`);
-
    async.doWhilst(function (iteratorDone) {
        var url = nextPage ? nextPage : DIGITALOCEAN_ENDPOINT + '/v2/domains/' + zoneName + '/records';

        superagent.get(url)
            .set('Authorization', 'Bearer ' + dnsConfig.token)
            .timeout(30 * 1000)
-            .retry(5)
            .end(function (error, result) {
-                if (error && !error.response) return iteratorDone(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
-                if (result.statusCode === 404) return iteratorDone(new DomainsError(DomainsError.NOT_FOUND, formatError(result)));
-                if (result.statusCode === 403 || result.statusCode === 401) return iteratorDone(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
-                if (result.statusCode !== 200) return iteratorDone(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));
+                if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
+                if (result.statusCode === 404) return callback(new DomainsError(DomainsError.NOT_FOUND, formatError(result)));
+                if (result.statusCode === 403 || result.statusCode === 401) return callback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
+                if (result.statusCode !== 200) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, formatError(result)));

                matchingRecords = matchingRecords.concat(result.body.domain_records.filter(function (record) {
-                    return (record.type === type && record.name === name);
+                    return (record.type === type && record.name === subdomain);
                }));

                nextPage = (result.body.links && result.body.links.pages) ? result.body.links.pages.next : null;

-                debug(`getInternal: next page - ${nextPage}`);
-
                iteratorDone();
            });
    }, function () { return !!nextPage; }, function (error) {
-        debug('getInternal:', error, matchingRecords);
-
        if (error) return callback(error);

+        debug('getInternal: %j', matchingRecords);
+
        return callback(null, matchingRecords);
    });
 }

-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug('upsert: %s for zone %s of type %s with values %j', name, zoneName, type, values);
+    debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

-    getInternal(dnsConfig, zoneName, name, type, function (error, result) {
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
        if (error) return callback(error);

        // used to track available records to update instead of create
@@ -108,10 +89,10 @@ function upsert(domainObject, location, type, values, callback) {

            var data = {
                type: type,
-                name: name,
+                name: subdomain,
                data: value,
                priority: priority,
-                ttl: 30 // Recent DO DNS API break means this value must atleast be 30
+                ttl: 1
            };

            if (i >= result.length) {
@@ -119,7 +100,6 @@ function upsert(domainObject, location, type, values, callback) {
                    .set('Authorization', 'Bearer ' + dnsConfig.token)
                    .send(data)
                    .timeout(30 * 1000)
-                    .retry(5)
                    .end(function (error, result) {
                        if (error && !error.response) return iteratorCallback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
                        if (result.statusCode === 403 || result.statusCode === 401) return iteratorCallback(new DomainsError(DomainsError.ACCESS_DENIED, formatError(result)));
@@ -135,7 +115,6 @@ function upsert(domainObject, location, type, values, callback) {
                    .set('Authorization', 'Bearer ' + dnsConfig.token)
                    .send(data)
                    .timeout(30 * 1000)
-                    .retry(5)
                    .end(function (error, result) {
                    // increment, as we have consumed the record
                        ++i;
@@ -150,27 +129,20 @@ function upsert(domainObject, location, type, values, callback) {
                        return iteratorCallback(null);
                    });
            }
-        }, function (error) {
-            if (error) return callback(error);
-
-            debug('upsert: completed with recordIds:%j', recordIds);
-
-            callback();
-        });
+        }, callback);
    });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    getInternal(dnsConfig, zoneName, name, type, function (error, result) {
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
        if (error) return callback(error);

        // We only return the value string
@@ -182,18 +154,17 @@ function get(domainObject, location, type, callback) {
    });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    getInternal(dnsConfig, zoneName, name, type, function (error, result) {
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
        if (error) return callback(error);

        if (result.length === 0) return callback(null);
@@ -209,7 +180,6 @@ function del(domainObject, location, type, values, callback) {
        superagent.del(DIGITALOCEAN_ENDPOINT + '/v2/domains/' + zoneName + '/records/' + tmp[0].id)
            .set('Authorization', 'Bearer ' + dnsConfig.token)
            .timeout(30 * 1000)
-            .retry(5)
            .end(function (error, result) {
                if (error && !error.response) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, util.format('Network error %s', error.message)));
                if (result.statusCode === 404) return callback(null);
@@ -223,30 +193,15 @@ function del(domainObject, location, type, values, callback) {
    });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));

-    const ip = '127.0.0.1';
-
    var credentials = {
        token: dnsConfig.token
    };
@@ -259,17 +214,17 @@ function verifyDnsConfig(domainObject, callback) {

        if (nameservers.map(function (n) { return n.toLowerCase(); }).indexOf('ns1.digitalocean.com') === -1) {
            debug('verifyDnsConfig: %j does not contains DO NS', nameservers);
-            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to DigitalOcean'));
+            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Digital Ocean'));
        }

-        const location = 'cloudrontestdns';
+        const testSubdomain = 'cloudrontestdns';

-        upsert(domainObject, location, 'A', [ ip ], function (error) {
+        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
            if (error) return callback(error);

-            debug('verifyDnsConfig: Test A record added');
+            debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-            del(domainObject, location, 'A', [ ip ], function (error) {
+            del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                if (error) return callback(error);

                debug('verifyDnsConfig: Test A record removed again');
@@ -1,23 +1,19 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    debug = require('debug')('box:dns/gandi'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    superagent = require('superagent'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    util = require('util');

 var GANDI_API = 'https://dns.api.gandi.net/api/v5';

@@ -25,34 +21,24 @@ function formatError(response) {
    return util.format(`Gandi DNS error [${response.statusCode}] ${response.body.message}`);
 }

-function removePrivateFields(domainObject) {
-    domainObject.config.token = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug(`upsert: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`upsert: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

    var data = {
        'rrset_ttl': 300, // this is the minimum allowed
        'rrset_values': values // for mx records, value is already of the '<priority> <server>' format
    };

-    superagent.put(`${GANDI_API}/domains/${zoneName}/records/${name}/${type}`)
+    superagent.put(`${GANDI_API}/domains/${zoneName}/records/${subdomain}/${type}`)
        .set('X-Api-Key', dnsConfig.token)
        .timeout(30 * 1000)
        .send(data)
@@ -66,19 +52,18 @@ function upsert(domainObject, location, type, values, callback) {
        });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug(`get: ${name} in zone ${zoneName} of type ${type}`);
+    debug(`get: ${subdomain} in zone ${zoneName} of type ${type}`);

-    superagent.get(`${GANDI_API}/domains/${zoneName}/records/${name}/${type}`)
+    superagent.get(`${GANDI_API}/domains/${zoneName}/records/${subdomain}/${type}`)
        .set('X-Api-Key', dnsConfig.token)
        .timeout(30 * 1000)
        .end(function (error, result) {
@@ -93,20 +78,19 @@ function get(domainObject, location, type, callback) {
        });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug(`del: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`del: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

-    superagent.del(`${GANDI_API}/domains/${zoneName}/records/${name}/${type}`)
+    superagent.del(`${GANDI_API}/domains/${zoneName}/records/${subdomain}/${type}`)
        .set('X-Api-Key', dnsConfig.token)
        .timeout(30 * 1000)
        .end(function (error, result) {
@@ -121,34 +105,19 @@ function del(domainObject, location, type, values, callback) {
        });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));

    var credentials = {
        token: dnsConfig.token
    };

-    const ip = '127.0.0.1';
-
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
@@ -160,14 +129,14 @@ function verifyDnsConfig(domainObject, callback) {
            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Gandi'));
        }

-        const location = 'cloudrontestdns';
+        const testSubdomain = 'cloudrontestdns';

-        upsert(domainObject, location, 'A', [ ip ], function (error) {
+        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
            if (error) return callback(error);

-            debug('verifyDnsConfig: Test A record added');
+            debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-            del(domainObject, location, 'A', [ ip ], function (error) {
+            del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                if (error) return callback(error);

                debug('verifyDnsConfig: Test A record removed again');
@@ -1,34 +1,21 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    debug = require('debug')('box:dns/gcdns'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
-    GCDNS = require('@google-cloud/dns').DNS,
+    GCDNS = require('@google-cloud/dns'),
    util = require('util'),
-    waitForDns = require('./waitfordns.js'),
    _ = require('underscore');

-function removePrivateFields(domainObject) {
-    domainObject.config.credentials.private_key = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.credentials.private_key === domains.SECRET_PLACEHOLDER && currentConfig.credentials) newConfig.credentials.private_key = currentConfig.credentials.private_key;
-}
-
 function getDnsCredentials(dnsConfig) {
    assert.strictEqual(typeof dnsConfig, 'object');

@@ -46,7 +33,7 @@ function getZoneByName(dnsConfig, zoneName, callback) {
    assert.strictEqual(typeof zoneName, 'string');
    assert.strictEqual(typeof callback, 'function');

-    var gcdns = new GCDNS(getDnsCredentials(dnsConfig));
+    var gcdns = GCDNS(getDnsCredentials(dnsConfig));

    gcdns.getZones(function (error, zones) {
        if (error && error.message === 'invalid_grant') return callback(new DomainsError(DomainsError.ACCESS_DENIED, 'The key was probably revoked'));
@@ -68,23 +55,22 @@ function getZoneByName(dnsConfig, zoneName, callback) {
    });
 }

-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
-    debug('add: %s for zone %s of type %s with values %j', fqdn, zoneName, type, values);
+    debug('add: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

    getZoneByName(getDnsCredentials(dnsConfig), zoneName, function (error, zone) {
        if (error) return callback(error);

-        zone.getRecords({ type: type, name: fqdn + '.' }, function (error, oldRecords) {
+        var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';
+
+        zone.getRecords({ type: type, name: domain }, function (error, oldRecords) {
            if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
            if (error) {
                debug('upsert->zone.getRecords', error);
@@ -92,12 +78,12 @@ function upsert(domainObject, location, type, values, callback) {
            }

            var newRecord = zone.record(type, {
-                name: fqdn + '.',
+                name: domain,
                data: values,
                ttl: 1
            });

-            zone.createChange({ delete: oldRecords, add: newRecord }, function(error /*, change */) {
+            zone.createChange({ delete: oldRecords, add: newRecord }, function(error, change) {
                if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
                if (error && error.code === 412) return callback(new DomainsError(DomainsError.STILL_BUSY, error.message));
                if (error) {
@@ -111,21 +97,18 @@ function upsert(domainObject, location, type, values, callback) {
    });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
    getZoneByName(getDnsCredentials(dnsConfig), zoneName, function (error, zone) {
        if (error) return callback(error);

        var params = {
-            name: fqdn + '.',
+            name: (subdomain ? subdomain + '.' : '') + zoneName + '.',
            type: type
        };

@@ -139,21 +122,20 @@ function get(domainObject, location, type, callback) {
    });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
    getZoneByName(getDnsCredentials(dnsConfig), zoneName, function (error, zone) {
        if (error) return callback(error);

-        zone.getRecords({ type: type, name: fqdn + '.' }, function(error, oldRecords) {
+        var domain = (subdomain ? subdomain + '.' : '') + zoneName + '.';
+
+        zone.getRecords({ type: type, name: domain }, function(error, oldRecords) {
            if (error && error.code === 403) return callback(new DomainsError(DomainsError.ACCESS_DENIED, error.message));
            if (error) {
                debug('del->zone.getRecords', error);
@@ -174,35 +156,19 @@ function del(domainObject, location, type, values, callback) {
    });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (typeof dnsConfig.projectId !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'projectId must be a string'));
    if (!dnsConfig.credentials || typeof dnsConfig.credentials !== 'object') return callback(new DomainsError(DomainsError.BAD_FIELD, 'credentials must be an object'));
    if (typeof dnsConfig.credentials.client_email !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'credentials.client_email must be a string'));
    if (typeof dnsConfig.credentials.private_key !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'credentials.private_key must be a string'));

    var credentials = getDnsCredentials(dnsConfig);
-
-    const ip = '127.0.0.1';
-
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
@@ -218,14 +184,14 @@ function verifyDnsConfig(domainObject, callback) {
                return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Google Cloud DNS'));
            }

-            const location = 'cloudrontestdns';
+            const testSubdomain = 'cloudrontestdns';

-            upsert(domainObject, location, 'A', [ ip ], function (error) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                if (error) return callback(error);

-                debug('verifyDnsConfig: Test A record added');
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-                del(domainObject, location, 'A', [ ip ], function (error) {
+                del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                    if (error) return callback(error);

                    debug('verifyDnsConfig: Test A record removed again');
@@ -1,23 +1,19 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    debug = require('debug')('box:dns/godaddy'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    superagent = require('superagent'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    util = require('util');

 // const GODADDY_API_OTE = 'https://api.ote-godaddy.com/v1/domains';
 const GODADDY_API = 'https://api.godaddy.com/v1/domains';
@@ -31,27 +27,17 @@ function formatError(response) {
    return util.format(`GoDaddy DNS error [${response.statusCode}] ${response.body.message}`);
 }

-function removePrivateFields(domainObject) {
-    domainObject.config.apiSecret = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.apiSecret === domains.SECRET_PLACEHOLDER) newConfig.apiSecret = currentConfig.apiSecret;
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug(`upsert: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`upsert: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

    var records = [ ];
    values.forEach(function (value) {
@@ -67,7 +53,7 @@ function upsert(domainObject, location, type, values, callback) {
        records.push(record);
    });

-    superagent.put(`${GODADDY_API}/${zoneName}/records/${type}/${name}`)
+    superagent.put(`${GODADDY_API}/${zoneName}/records/${type}/${subdomain}`)
        .set('Authorization', `sso-key ${dnsConfig.apiKey}:${dnsConfig.apiSecret}`)
        .timeout(30 * 1000)
        .send(records)
@@ -82,19 +68,18 @@ function upsert(domainObject, location, type, values, callback) {
        });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug(`get: ${name} in zone ${zoneName} of type ${type}`);
+    debug(`get: ${subdomain} in zone ${zoneName} of type ${type}`);

-    superagent.get(`${GODADDY_API}/${zoneName}/records/${type}/${name}`)
+    superagent.get(`${GODADDY_API}/${zoneName}/records/${type}/${subdomain}`)
        .set('Authorization', `sso-key ${dnsConfig.apiKey}:${dnsConfig.apiSecret}`)
        .timeout(30 * 1000)
        .end(function (error, result) {
@@ -113,23 +98,22 @@ function get(domainObject, location, type, callback) {
        });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '@';
+    subdomain = subdomain || '@';

-    debug(`get: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`get: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

    if (type !== 'A' && type !== 'TXT') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, new Error('Record deletion is not supported by GoDaddy API')));

    // check if the record exists at all so that we don't insert the "Dead" record for no reason
-    get(domainObject, location, type, function (error, values) {
+    get(dnsConfig, zoneName, subdomain, type, function (error, values) {
        if (error) return callback(error);
        if (values.length === 0) return callback();

@@ -139,7 +123,7 @@ function del(domainObject, location, type, values, callback) {
            data: type === 'A' ? GODADDY_INVALID_IP : GODADDY_INVALID_TXT
        }];

-        superagent.put(`${GODADDY_API}/${zoneName}/records/${type}/${name}`)
+        superagent.put(`${GODADDY_API}/${zoneName}/records/${type}/${subdomain}`)
            .set('Authorization', `sso-key ${dnsConfig.apiKey}:${dnsConfig.apiSecret}`)
            .send(records)
            .timeout(30 * 1000)
@@ -156,31 +140,16 @@ function del(domainObject, location, type, values, callback) {
    });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (!dnsConfig.apiKey || typeof dnsConfig.apiKey !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'apiKey must be a non-empty string'));
    if (!dnsConfig.apiSecret || typeof dnsConfig.apiSecret !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'apiSecret must be a non-empty string'));

-    const ip = '127.0.0.1';
-
    var credentials = {
        apiKey: dnsConfig.apiKey,
        apiSecret: dnsConfig.apiSecret
@@ -197,14 +166,14 @@ function verifyDnsConfig(domainObject, callback) {
            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to GoDaddy'));
        }

-        const location = 'cloudrontestdns';
+        const testSubdomain = 'cloudrontestdns';

-        upsert(domainObject, location, 'A', [ ip ], function (error) {
+        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
            if (error) return callback(error);

-            debug('verifyDnsConfig: Test A record added');
+            debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-            del(domainObject, location, 'A', [ ip ], function (error) {
+            del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                if (error) return callback(error);

                debug('verifyDnsConfig: Test A record removed again');
@@ -7,30 +7,21 @@
 // -------------------------------------------

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
+    DomainsError = require('../domains.js').DomainsError,
    util = require('util');

-function removePrivateFields(domainObject) {
-    // in-place removal of tokens and api keys with domains.SECRET_PLACEHOLDER
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    // in-place injection of tokens and api keys which came in with domains.SECRET_PLACEHOLDER
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');
@@ -40,9 +31,10 @@ function upsert(domainObject, location, type, values, callback) {
    callback(new Error('not implemented'));
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

@@ -51,9 +43,10 @@ function get(domainObject, location, type, callback) {
    callback(new Error('not implemented'));
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');
@@ -63,19 +56,11 @@ function del(domainObject, location, type, values, callback) {
    callback(new Error('not implemented'));
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
-    assert.strictEqual(typeof callback, 'function');
-
-    callback();
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
+function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

    // Result: dnsConfig object
@@ -1,55 +1,46 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    debug = require('debug')('box:dns/manual'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    util = require('util');

-function removePrivateFields(domainObject) {
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug('upsert: %s for zone %s of type %s with values %j', location, domainObject.zoneName, type, values);
+    debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

    return callback(null);
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

    callback(null, [ ]); // returning ip confuses apptask into thinking the entry already exists
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');
@@ -57,25 +48,13 @@ function del(domainObject, location, type, values, callback) {
    return callback();
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const zoneName = domainObject.zoneName;
-
    // Very basic check if the nameservers can be fetched
    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
@@ -1,322 +0,0 @@
-'use strict';
-
-exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
-    upsert: upsert,
-    get: get,
-    del: del,
-    verifyDnsConfig: verifyDnsConfig,
-    wait: wait
-};
-
-var assert = require('assert'),
-    debug = require('debug')('box:dns/namecheap'),
-    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
-    DomainsError = require('../domains.js').DomainsError,
-    safe = require('safetydance'),
-    superagent = require('superagent'),
-    sysinfo = require('../sysinfo.js'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js'),
-    xml2js = require('xml2js');
-
-const ENDPOINT = 'https://api.namecheap.com/xml.response';
-
-function removePrivateFields(domainObject) {
-    domainObject.config.token = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
-}
-
-function getQuery(dnsConfig, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    sysinfo.getPublicIp(function (error, ip) {
-        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
-
-        callback(null, {
-            ApiUser: dnsConfig.username,
-            ApiKey: dnsConfig.token,
-            UserName: dnsConfig.username,
-            ClientIp: ip
-        });
-    });
-}
-
-function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    getQuery(dnsConfig, function (error, query) {
-        if (error) return callback(error);
-
-        query.Command = 'namecheap.domains.dns.getHosts';
-        query.SLD = zoneName.split('.')[0];
-        query.TLD = zoneName.split('.')[1];
-
-        superagent.get(ENDPOINT).query(query).end(function (error, result) {
-            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
-
-            var parser = new xml2js.Parser();
-            parser.parseString(result.text, function (error, result) {
-                if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
-
-                var tmp = result.ApiResponse;
-                if (tmp['$'].Status !== 'OK') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, safe.query(tmp, 'Errors[0].Error[0]._', 'Invalid response')));
-                if (!tmp.CommandResponse[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
-                if (!tmp.CommandResponse[0].DomainDNSGetHostsResult[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
-
-                var hosts = result.ApiResponse.CommandResponse[0].DomainDNSGetHostsResult[0].host.map(function (h) {
-                    return h['$'];
-                });
-
-                callback(null, hosts);
-            });
-        });
-    });
-}
-
-function setInternal(dnsConfig, zoneName, hosts, callback) {
-    assert.strictEqual(typeof dnsConfig, 'object');
-    assert.strictEqual(typeof zoneName, 'string');
-    assert(Array.isArray(hosts));
-    assert.strictEqual(typeof callback, 'function');
-
-    getQuery(dnsConfig, function (error, query) {
-        if (error) return callback(error);
-
-        query.Command = 'namecheap.domains.dns.setHosts';
-        query.SLD = zoneName.split('.')[0];
-        query.TLD = zoneName.split('.')[1];
-
-        // Map to query params https://www.namecheap.com/support/api/methods/domains-dns/set-hosts.aspx
-        hosts.forEach(function (host, i) {
-            var n = i+1; // api starts with 1 not 0
-            query['TTL' + n] = '300'; // keep it low
-            query['HostName' + n] = host.HostName || host.Name;
-            query['RecordType' + n] = host.RecordType || host.Type;
-            query['Address' + n] = host.Address;
-
-            if (host.Type === 'MX') {
-                query['EmailType' + n] = 'MX';
-                if (host.MXPref) query['MXPref' + n] = host.MXPref;
-            }
-        });
-
-        superagent.post(ENDPOINT).query(query).end(function (error, result) {
-            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
-
-            var parser = new xml2js.Parser();
-            parser.parseString(result.text, function (error, result) {
-                if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error));
-
-                var tmp = result.ApiResponse;
-                if (tmp['$'].Status !== 'OK') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, safe.query(tmp, 'Errors[0].Error[0]._', 'Invalid response')));
-                if (!tmp.CommandResponse[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
-                if (!tmp.CommandResponse[0].DomainDNSSetHostsResult[0]) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
-                if (tmp.CommandResponse[0].DomainDNSSetHostsResult[0]['$'].IsSuccess !== 'true') return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, 'Invalid response'));
-
-                callback(null);
-            });
-        });
-    });
-}
-
-function upsert(domainObject, subdomain, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config;
-    const zoneName = domainObject.zoneName;
-
-    subdomain = domains.getName(domainObject, subdomain, type) || '@';
-
-    debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
-
-    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
-        if (error) return callback(error);
-
-        // Array to keep track of records that need to be inserted
-        let toInsert = [];
-
-        for (var i = 0; i < values.length; i++) {
-            let curValue = values[i];
-            let wasUpdate = false;
-
-            for (var j = 0; j < result.length; j++) {
-                let curHost = result[j];
-
-                if (curHost.Type === type && curHost.Name === subdomain) {
-                    // Updating an already existing host
-                    wasUpdate = true;
-                    if (type === 'MX') {
-                        curHost.MXPref = curValue.split(' ')[0];
-                        curHost.Address = curValue.split(' ')[1];
-                    } else {
-                        curHost.Address = curValue;
-                    }
-                }
-            }
-
-            // We don't have this host at all yet, let's push to toInsert array
-            if (!wasUpdate) {
-                let newRecord = {
-                    RecordType: type,
-                    HostName: subdomain,
-                    Address: curValue
-                };
-
-                // Special case for MX records
-                if (type === 'MX') {
-                    newRecord.MXPref = curValue.split(' ')[0];
-                    newRecord.Address = curValue.split(' ')[1];
-                }
-
-                toInsert.push(newRecord);
-
-            }
-        }
-
-        let toUpsert = result.concat(toInsert);
-
-        setInternal(dnsConfig, zoneName, toUpsert, callback);
-    });
-}
-
-function get(domainObject, subdomain, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config;
-    const zoneName = domainObject.zoneName;
-
-    subdomain = domains.getName(domainObject, subdomain, type) || '@';
-
-    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
-        if (error) return callback(error);
-
-        // We need to filter hosts to ones with this subdomain and type
-        let actualHosts = result.filter((host) => host.Type === type && host.Name === subdomain);
-
-        // We only return the value string
-        var tmp = actualHosts.map(function (record) { return record.Address; });
-
-        debug('get: %j', tmp);
-
-        return callback(null, tmp);
-    });
-}
-
-function del(domainObject, subdomain, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config;
-    const zoneName = domainObject.zoneName;
-
-    subdomain = domains.getName(domainObject, subdomain, type) || '@';
-
-    debug('del: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);
-
-    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
-        if (error) return callback(error);
-
-        if (result.length === 0) return callback();
-
-        let removed = false;
-
-        for (var i = 0; i < values.length; i++) {
-            let curValue = values[i];
-
-            for (var j = 0; j < result.length; j++) {
-                let curHost = result[i];
-
-                if (curHost.Type === type && curHost.Name === subdomain && curHost.Address === curValue) {
-                    removed = true;
-
-                    result.splice(i, 1); // Remove element from result array
-                }
-            }
-        }
-
-        // Only set hosts if we actually removed a host
-        if (removed) return setInternal(dnsConfig, zoneName, result, callback);
-
-        callback();
-    });
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config;
-    const zoneName = domainObject.zoneName;
-    const ip = '127.0.0.1';
-
-    if (!dnsConfig.username || typeof dnsConfig.username !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'username must be a non-empty string'));
-    if (!dnsConfig.token || typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a non-empty string'));
-
-    let credentials = {
-        username: dnsConfig.username,
-        token: dnsConfig.token
-    };
-
-    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here
-
-    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
-        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
-        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));
-
-        if (nameservers.some(function (n) { return n.toLowerCase().indexOf('.registrar-servers.com') === -1; })) {
-            debug('verifyDnsConfig: %j does not contains NC NS', nameservers);
-            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to NameCheap'));
-        }
-
-        const testSubdomain = 'cloudrontestdns';
-
-        upsert(domainObject, testSubdomain, 'A', [ip], function (error, changeId) {
-            if (error) return callback(error);
-
-            debug('verifyDnsConfig: Test A record added with change id %s', changeId);
-
-            del(domainObject, testSubdomain, 'A', [ip], function (error) {
-                if (error) return callback(error);
-
-                debug('verifyDnsConfig: Test A record removed again');
-
-                callback(null, credentials);
-            });
-        });
-    });
-}
-
-function wait(domainObject, subdomain, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof subdomain, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
-    assert.strictEqual(typeof callback, 'function');
-
-    const fqdn = domains.fqdn(subdomain, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
@@ -1,24 +1,19 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    debug = require('debug')('box:dns/namecom'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
-    DomainsError = require('../domains.js').DomainsError,
    safe = require('safetydance'),
-    superagent = require('superagent'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    DomainsError = require('../domains.js').DomainsError,
+    superagent = require('superagent');

 const NAMECOM_API = 'https://api.name.com/v4';

@@ -26,27 +21,18 @@ function formatError(response) {
    return `Name.com DNS error [${response.statusCode}] ${response.text}`;
 }

-function removePrivateFields(domainObject) {
-    domainObject.config.token = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.token === domains.SECRET_PLACEHOLDER) newConfig.token = currentConfig.token;
-}
-
-function addRecord(dnsConfig, zoneName, name, type, values, callback) {
+function addRecord(dnsConfig, zoneName, subdomain, type, values, callback) {
    assert.strictEqual(typeof dnsConfig, 'object');
    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(Array.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug(`add: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`add: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

    var data = {
-        host: name,
+        host: subdomain,
        type: type,
        ttl: 300    // 300 is the lowest
    };
@@ -71,19 +57,19 @@ function addRecord(dnsConfig, zoneName, name, type, values, callback) {
        });
 }

-function updateRecord(dnsConfig, zoneName, recordId, name, type, values, callback) {
+function updateRecord(dnsConfig, zoneName, recordId, subdomain, type, values, callback) {
    assert.strictEqual(typeof dnsConfig, 'object');
    assert.strictEqual(typeof zoneName, 'string');
    assert.strictEqual(typeof recordId, 'number');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(Array.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug(`update:${recordId} on ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`update:${recordId} on ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

    var data = {
-        host: name,
+        host: subdomain,
        type: type,
        ttl: 300    // 300 is the lowest
    };
@@ -108,14 +94,16 @@ function updateRecord(dnsConfig, zoneName, recordId, name, type, values, callbac
        });
 }

-function getInternal(dnsConfig, zoneName, name, type, callback) {
+function getInternal(dnsConfig, zoneName, subdomain, type, callback) {
    assert.strictEqual(typeof dnsConfig, 'object');
    assert.strictEqual(typeof zoneName, 'string');
-    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    debug(`getInternal: ${name} in zone ${zoneName} of type ${type}`);
+    subdomain = subdomain || '@';
+
+    debug(`getInternal: ${subdomain} in zone ${zoneName} of type ${type}`);

    superagent.get(`${NAMECOM_API}/domains/${zoneName}/records`)
        .auth(dnsConfig.username, dnsConfig.token)
@@ -131,11 +119,11 @@ function getInternal(dnsConfig, zoneName, name, type, callback) {

            result.body.records.forEach(function (r) {
                // name.com api simply strips empty properties
-                r.host = r.host || '';
+                r.host = r.host || '@';
            });

            var results = result.body.records.filter(function (r) {
-                return (r.host === name && r.type === type);
+                return (r.host === subdomain && r.type === type);
            });

            debug('getInternal: %j', results);
@@ -144,39 +132,35 @@ function getInternal(dnsConfig, zoneName, name, type, callback) {
        });
 }

-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
+    assert(Array.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '';
+    subdomain = subdomain || '@';

-    debug(`upsert: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`upsert: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

-    getInternal(dnsConfig, zoneName, name, type, function (error, result) {
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
        if (error) return callback(error);

-        if (result.length === 0) return addRecord(dnsConfig, zoneName, name, type, values, callback);
+        if (result.length === 0) return addRecord(dnsConfig, zoneName, subdomain, type, values, callback);

-        return updateRecord(dnsConfig, zoneName, result[0].id, name, type, values, callback);
+        return updateRecord(dnsConfig, zoneName, result[0].id, subdomain, type, values, callback);
    });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '';
-
-    getInternal(dnsConfig, zoneName, name, type, function (error, result) {
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
        if (error) return callback(error);

        var tmp = result.map(function (record) { return record.answer; });
@@ -187,20 +171,19 @@ function get(domainObject, location, type, callback) {
    });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
-    assert(util.isArray(values));
+    assert(Array.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        name = domains.getName(domainObject, location, type) || '';
+    subdomain = subdomain || '@';

-    debug(`del: ${name} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);
+    debug(`del: ${subdomain} in zone ${zoneName} of type ${type} with values ${JSON.stringify(values)}`);

-    getInternal(dnsConfig, zoneName, name, type, function (error, result) {
+    getInternal(dnsConfig, zoneName, subdomain, type, function (error, result) {
        if (error) return callback(error);

        if (result.length === 0) return callback();
@@ -218,26 +201,13 @@ function del(domainObject, location, type, values, callback) {
    });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (typeof dnsConfig.username !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'username must be a string'));
    if (typeof dnsConfig.token !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'token must be a string'));

@@ -246,8 +216,6 @@ function verifyDnsConfig(domainObject, callback) {
        token: dnsConfig.token
    };

-    const ip = '127.0.0.1';
-
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
@@ -259,14 +227,14 @@ function verifyDnsConfig(domainObject, callback) {
            return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Name.com'));
        }

-        const location = 'cloudrontestdns';
+        const testSubdomain = 'cloudrontestdns';

-        upsert(domainObject, location, 'A', [ ip ], function (error) {
+        upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
            if (error) return callback(error);

-            debug('verifyDnsConfig: Test A record added');
+            debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-            del(domainObject, location, 'A', [ ip ], function (error) {
+            del(dnsConfig, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                if (error) return callback(error);

                debug('verifyDnsConfig: Test A record removed again');
@@ -1,12 +1,10 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: waitForDns,
    verifyDnsConfig: verifyDnsConfig
 };

@@ -14,37 +12,33 @@ var assert = require('assert'),
    debug = require('debug')('box:dns/noop'),
    util = require('util');

-function removePrivateFields(domainObject) {
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug('upsert: %s for zone %s of type %s with values %j', location, domainObject.zoneName, type, values);
+    debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

    return callback(null);
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

    callback(null, [ ]); // returning ip confuses apptask into thinking the entry already exists
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');
@@ -52,9 +46,9 @@ function del(domainObject, location, type, values, callback) {
    return callback();
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function waitForDns(domain, zoneName, type, value, options, callback) {
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof value, 'string');
    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
@@ -63,8 +57,11 @@ function wait(domainObject, location, type, value, options, callback) {
    callback();
 }

-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
+function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

    return callback(null, { });
@@ -1,34 +1,24 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
-    verifyDnsConfig: verifyDnsConfig
+    waitForDns: require('./waitfordns.js'),
+    verifyDnsConfig: verifyDnsConfig,
+
+    // not part of "dns" interface
+    getHostedZone: getHostedZone
 };

 var assert = require('assert'),
    AWS = require('aws-sdk'),
    debug = require('debug')('box:dns/route53'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    util = require('util'),
-    waitForDns = require('./waitfordns.js'),
    _ = require('underscore');

-function removePrivateFields(domainObject) {
-    domainObject.config.secretAccessKey = domains.SECRET_PLACEHOLDER;
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-    if (newConfig.secretAccessKey === domains.SECRET_PLACEHOLDER) newConfig.secretAccessKey = currentConfig.secretAccessKey;
-}
-
 function getDnsCredentials(dnsConfig) {
    assert.strictEqual(typeof dnsConfig, 'object');

@@ -92,22 +82,20 @@ function getHostedZone(dnsConfig, zoneName, callback) {
    });
 }

-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function add(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
-    debug('add: %s for zone %s of type %s with values %j', fqdn, zoneName, type, values);
+    debug('add: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

    getZoneByName(dnsConfig, zoneName, function (error, zone) {
        if (error) return callback(error);

+        var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;
        var records = values.map(function (v) { return { Value: v }; });  // for mx records, value is already of the '<priority> <server>' format

        var params = {
@@ -138,15 +126,23 @@ function upsert(domainObject, location, type, values, callback) {
    });
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
+    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
+    add(dnsConfig, zoneName, subdomain, type, values, callback);
+}
+
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
+    assert.strictEqual(typeof type, 'string');
+    assert.strictEqual(typeof callback, 'function');

    getZoneByName(dnsConfig, zoneName, function (error, zone) {
        if (error) return callback(error);
@@ -154,7 +150,7 @@ function get(domainObject, location, type, callback) {
        var params = {
            HostedZoneId: zone.Id,
            MaxItems: '1',
-            StartRecordName: fqdn + '.',
+            StartRecordName: (subdomain ? subdomain + '.' : '') + zoneName + '.',
            StartRecordType: type
        };

@@ -173,20 +169,18 @@ function get(domainObject, location, type, callback) {
    });
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName,
-        fqdn = domains.fqdn(location, domainObject);
-
    getZoneByName(dnsConfig, zoneName, function (error, zone) {
        if (error) return callback(error);

+        var fqdn = subdomain === '' ? zoneName : subdomain + '.' + zoneName;
        var records = values.map(function (v) { return { Value: v }; });

        var resourceRecordSet = {
@@ -232,26 +226,13 @@ function del(domainObject, location, type, values, callback) {
    });
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, fqdn, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof fqdn, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const dnsConfig = domainObject.config,
-        zoneName = domainObject.zoneName;
-
    if (!dnsConfig.accessKeyId || typeof dnsConfig.accessKeyId !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'accessKeyId must be a non-empty string'));
    if (!dnsConfig.secretAccessKey || typeof dnsConfig.secretAccessKey !== 'string') return callback(new DomainsError(DomainsError.BAD_FIELD, 'secretAccessKey must be a non-empty string'));

@@ -263,8 +244,6 @@ function verifyDnsConfig(domainObject, callback) {
        listHostedZonesByName: true, // new/updated creds require this perm
    };

-    const ip = '127.0.0.1';
-
    if (process.env.BOX_ENV === 'test') return callback(null, credentials); // this shouldn't be here

    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
@@ -279,14 +258,14 @@ function verifyDnsConfig(domainObject, callback) {
                return callback(new DomainsError(DomainsError.BAD_FIELD, 'Domain nameservers are not set to Route53'));
            }

-            const location = 'cloudrontestdns';
+            const testSubdomain = 'cloudrontestdns';

-            upsert(domainObject, location, 'A', [ ip ], function (error) {
+            upsert(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error, changeId) {
                if (error) return callback(error);

-                debug('verifyDnsConfig: Test A record added');
+                debug('verifyDnsConfig: Test A record added with change id %s', changeId);

-                del(domainObject, location, 'A', [ ip ], function (error) {
+                del(credentials, zoneName, testSubdomain, 'A', [ ip ], function (error) {
                    if (error) return callback(error);

                    debug('verifyDnsConfig: Test A record removed again');
@@ -30,8 +30,8 @@ function resolveIp(hostname, options, callback) {
    });
 }

-function isChangeSynced(hostname, type, value, nameserver, callback) {
-    assert.strictEqual(typeof hostname, 'string');
+function isChangeSynced(domain, type, value, nameserver, callback) {
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof value, 'string');
    assert.strictEqual(typeof nameserver, 'string');
@@ -46,16 +46,16 @@ function isChangeSynced(hostname, type, value, nameserver, callback) {

        async.every(nsIps, function (nsIp, iteratorCallback) {
            const resolveOptions = { server: nsIp, timeout: 5000 };
-            const resolver = type === 'A' ? resolveIp.bind(null, hostname) : dns.resolve.bind(null, hostname, 'TXT');
+            const resolver = type === 'A' ? resolveIp.bind(null, domain) : dns.resolve.bind(null, domain, 'TXT');

            resolver(resolveOptions, function (error, answer) {
                if (error && error.code === 'TIMEOUT') {
-                    debug(`isChangeSynced: NS ${nameserver} (${nsIp}) timed out when resolving ${hostname} (${type})`);
+                    debug(`isChangeSynced: NS ${nameserver} (${nsIp}) timed out when resolving ${domain} (${type})`);
                    return iteratorCallback(null, true); // should be ok if dns server is down
                }

                if (error) {
-                    debug(`isChangeSynced: NS ${nameserver} (${nsIp}) errored when resolve ${hostname} (${type}): ${error}`);
+                    debug(`isChangeSynced: NS ${nameserver} (${nsIp}) errored when resolve ${domain} (${type}): ${error}`);
                    return iteratorCallback(null, false);
                }

@@ -66,7 +66,7 @@ function isChangeSynced(hostname, type, value, nameserver, callback) {
                    match = answer.some(function (a) { return value === a.join(''); });
                }

-                debug(`isChangeSynced: ${hostname} (${type}) was resolved to ${answer} at NS ${nameserver} (${nsIp}). Expecting ${value}. Match ${match}`);
+                debug(`isChangeSynced: ${domain} (${type}) was resolved to ${answer} at NS ${nameserver} (${nsIp}). Expecting ${value}. Match ${match}`);

                iteratorCallback(null, match);
            });
@@ -76,26 +76,26 @@ function isChangeSynced(hostname, type, value, nameserver, callback) {
 }

 // check if IP change has propagated to every nameserver
-function waitForDns(hostname, zoneName, type, value, options, callback) {
-    assert.strictEqual(typeof hostname, 'string');
+function waitForDns(domain, zoneName, type, value, options, callback) {
+    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof zoneName, 'string');
    assert(type === 'A' || type === 'TXT');
    assert.strictEqual(typeof value, 'string');
    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
    assert.strictEqual(typeof callback, 'function');

-    debug('waitForDns: hostname %s to be %s in zone %s.', hostname, value, zoneName);
+    debug('waitForDns: domain %s to be %s in zone %s.', domain, value, zoneName);

    var attempt = 0;
    async.retry(options, function (retryCallback) {
        ++attempt;
-        debug(`waitForDns (try ${attempt}): ${hostname} to be ${value} in zone ${zoneName}`);
+        debug(`waitForDns (try ${attempt}): ${domain} to be ${value} in zone ${zoneName}`);

        dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
            if (error || !nameservers) return retryCallback(error || new DomainsError(DomainsError.EXTERNAL_ERROR, 'Unable to get nameservers'));

-            async.every(nameservers, isChangeSynced.bind(null, hostname, type, value), function (error, synced) {
-                debug('waitForDns: %s %s ns: %j', hostname, synced ? 'done' : 'not done', nameservers);
+            async.every(nameservers, isChangeSynced.bind(null, domain, type, value), function (error, synced) {
+                debug('waitForDns: %s %s ns: %j', domain, synced ? 'done' : 'not done', nameservers);

                retryCallback(synced ? null : new DomainsError(DomainsError.EXTERNAL_ERROR, 'ETRYAGAIN'));
            });
@@ -103,7 +103,7 @@ function waitForDns(hostname, zoneName, type, value, options, callback) {
    }, function retryDone(error) {
        if (error) return callback(error);

-        debug(`waitForDns: ${hostname} has propagated`);
+        debug(`waitForDns: ${domain} has propagated`);

        callback(null);
    });
@@ -1,55 +1,47 @@
 'use strict';

 exports = module.exports = {
-    removePrivateFields: removePrivateFields,
-    injectPrivateFields: injectPrivateFields,
    upsert: upsert,
    get: get,
    del: del,
-    wait: wait,
+    waitForDns: require('./waitfordns.js'),
    verifyDnsConfig: verifyDnsConfig
 };

 var assert = require('assert'),
    debug = require('debug')('box:dns/manual'),
    dns = require('../native-dns.js'),
-    domains = require('../domains.js'),
    DomainsError = require('../domains.js').DomainsError,
    sysinfo = require('../sysinfo.js'),
-    util = require('util'),
-    waitForDns = require('./waitfordns.js');
+    util = require('util');

-function removePrivateFields(domainObject) {
-    return domainObject;
-}
-
-function injectPrivateFields(newConfig, currentConfig) {
-}
-
-function upsert(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function upsert(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug('upsert: %s for zone %s of type %s with values %j', location, domainObject.zoneName, type, values);
+    debug('upsert: %s for zone %s of type %s with values %j', subdomain, zoneName, type, values);

    return callback(null);
 }

-function get(domainObject, location, type, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function get(dnsConfig, zoneName, subdomain, type, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

    callback(null, [ ]); // returning ip confuses apptask into thinking the entry already exists
 }

-function del(domainObject, location, type, values, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
+function del(dnsConfig, zoneName, subdomain, type, values, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');
@@ -57,33 +49,20 @@ function del(domainObject, location, type, values, callback) {
    return callback();
 }

-function wait(domainObject, location, type, value, options, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof location, 'string');
-    assert.strictEqual(typeof type, 'string');
-    assert.strictEqual(typeof value, 'string');
-    assert(options && typeof options === 'object'); // { interval: 5000, times: 50000 }
+function verifyDnsConfig(dnsConfig, domain, zoneName, ip, callback) {
+    assert.strictEqual(typeof dnsConfig, 'object');
+    assert.strictEqual(typeof domain, 'string');
+    assert.strictEqual(typeof zoneName, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const fqdn = domains.fqdn(location, domainObject);
-
-    waitForDns(fqdn, domainObject.zoneName, type, value, options, callback);
-}
-
-function verifyDnsConfig(domainObject, callback) {
-    assert.strictEqual(typeof domainObject, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const zoneName = domainObject.zoneName;
-
    // Very basic check if the nameservers can be fetched
    dns.resolve(zoneName, 'NS', { timeout: 5000 }, function (error, nameservers) {
        if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, 'Unable to resolve nameservers for this domain'));
        if (error || !nameservers) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : 'Unable to get nameservers'));

-        const location = 'cloudrontestdns';
-        const fqdn = domains.fqdn(location, domainObject);
-
+        const separator = dnsConfig.hyphenatedSubdomains ? '-' : '.';
+        const fqdn = `cloudrontest${separator}${domain}`;
        dns.resolve(fqdn, 'A', { server: '127.0.0.1', timeout: 5000 }, function (error, result) {
            if (error && error.code === 'ENOTFOUND') return callback(new DomainsError(DomainsError.BAD_FIELD, `Unable to resolve ${fqdn}`));
            if (error || !result) return callback(new DomainsError(DomainsError.BAD_FIELD, error ? error.message : `Unable to resolve ${fqdn}`));
@@ -22,7 +22,6 @@ exports = module.exports = {
    getContainerIdByIp: getContainerIdByIp,
    inspect: inspect,
    inspectByName: inspect,
-    getEvents: getEvents,
    memoryUsage: memoryUsage,
    execContainer: execContainer,
    createVolume: createVolume,
@@ -55,15 +54,17 @@ var addons = require('./addons.js'),
    config = require('./config.js'),
    constants = require('./constants.js'),
    debug = require('debug')('box:docker.js'),
+    mkdirp = require('mkdirp'),
    once = require('once'),
    path = require('path'),
+    paths = require('./paths.js'),
+    safe = require('safetydance'),
    shell = require('./shell.js'),
    spawn = child_process.spawn,
    util = require('util'),
    _ = require('underscore');

-const CLEARVOLUME_CMD = path.join(__dirname, 'scripts/clearvolume.sh'),
-    MKDIRVOLUME_CMD = path.join(__dirname, 'scripts/mkdirvolume.sh');
+const RMVOLUME_CMD = path.join(__dirname, 'scripts/rmvolume.sh');

 function DockerError(reason, errorOrMessage) {
    assert.strictEqual(typeof reason, 'string');
@@ -181,17 +182,14 @@ function createSubcontainer(app, name, cmd, options, callback) {
    var manifest = app.manifest;
    var exposedPorts = {}, dockerPortBindings = { };
    var domain = app.fqdn;
-
-    const envPrefix = manifest.manifestVersion <= 1 ? '' : 'CLOUDRON_';
-
-    let stdEnv = [
+    // TODO: these should all have the CLOUDRON_ prefix
+    var stdEnv = [
        'CLOUDRON=1',
        'CLOUDRON_PROXY_IP=172.18.0.1',
-        `CLOUDRON_APP_HOSTNAME=${name}`,
-        `${envPrefix}WEBADMIN_ORIGIN=${config.adminOrigin()}`,
-        `${envPrefix}API_ORIGIN=${config.adminOrigin()}`,
-        `${envPrefix}APP_ORIGIN=https://${domain}`,
-        `${envPrefix}APP_DOMAIN=${domain}`
+        'WEBADMIN_ORIGIN=' + config.adminOrigin(),
+        'API_ORIGIN=' + config.adminOrigin(),
+        'APP_ORIGIN=https://' + domain,
+        'APP_DOMAIN=' + domain
    ];

    // docker portBindings requires ports to be exposed
@@ -238,9 +236,9 @@ function createSubcontainer(app, name, cmd, options, callback) {
        // Note that Hostname has no effect on DNS. We have to use the --net-alias for dns.
        // Hostname cannot be set with container NetworkMode
        var containerOptions = {
-            name: name, // for referencing containers
+            name: name, // used for filtering logs
            Tty: isAppContainer,
-            Hostname: name,
+            Hostname: app.id, // set to something 'constant' so app containers can use this to communicate (across app updates)
            Image: app.manifest.dockerImage,
            Cmd: (isAppContainer && app.debugMode && app.debugMode.cmd) ? app.debugMode.cmd : cmd,
            Env: stdEnv.concat(addonEnv).concat(portEnv).concat(appEnv),
@@ -276,17 +274,10 @@ function createSubcontainer(app, name, cmd, options, callback) {
                },
                CpuShares: 512, // relative to 1024 for system processes
                VolumesFrom: isAppContainer ? null : [ app.containerId + ':rw' ],
-                NetworkMode: 'cloudron', // user defined bridge network
+                NetworkMode: 'cloudron',
                Dns: ['172.18.0.1'], // use internal dns
                DnsSearch: ['.'], // use internal dns
                SecurityOpt: [ 'apparmor=docker-cloudron-app' ]
-            },
-            NetworkingConfig: {
-                EndpointsConfig: {
-                    cloudron: {
-                        Aliases: [ name ] // this allows sub-containers reach app containers by name
-                    }
-                }
            }
        };

@@ -382,19 +373,15 @@ function deleteContainer(containerId, callback) {
    });
 }

-function deleteContainers(appId, options, callback) {
+function deleteContainers(appId, callback) {
    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof options, 'object');
    assert.strictEqual(typeof callback, 'function');

    var docker = exports.connection;

    debug('deleting containers of %s', appId);

-    let labels = [ 'appId=' + appId ];
-    if (options.managedOnly) labels.push('isCloudronManaged=true');
-
-    docker.listContainers({ all: 1, filters: JSON.stringify({ label: labels }) }, function (error, containers) {
+    docker.listContainers({ all: 1, filters: JSON.stringify({ label: [ 'appId=' + appId ] }) }, function (error, containers) {
        if (error) return callback(error);

        async.eachSeries(containers, function (container, iteratorDone) {
@@ -485,19 +472,6 @@ function inspect(containerId, callback) {
    });
 }

-function getEvents(options, callback) {
-    assert.strictEqual(typeof options, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    let docker = exports.connection;
-
-    docker.getEvents(options, function (error, stream) {
-        if (error) return callback(new DockerError(DockerError.INTERNAL_ERROR, error));
-
-        callback(null, stream);
-    });
-}
-
 function memoryUsage(containerId, callback) {
    assert.strictEqual(typeof containerId, 'string');
    assert.strictEqual(typeof callback, 'function');
@@ -543,14 +517,16 @@ function execContainer(containerId, cmd, options, callback) {
    if (options.stdin) options.stdin.pipe(cp.stdin).on('error', callback);
 }

-function createVolume(app, name, volumeDataDir, callback) {
+function createVolume(app, name, subdir, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof volumeDataDir, 'string');
+    assert.strictEqual(typeof subdir, 'string');
    assert.strictEqual(typeof callback, 'function');

    let docker = exports.connection;

+    const volumeDataDir = path.join(paths.APPS_DATA_DIR, app.id, subdir);
+
    const volumeOptions = {
        Name: name,
        Driver: 'local',
@@ -565,8 +541,7 @@ function createVolume(app, name, volumeDataDir, callback) {
        },
    };

-    // requires sudo because the path can be outside appsdata
-    shell.sudo('createVolume', [ MKDIRVOLUME_CMD, volumeDataDir ], {}, function (error) {
+    mkdirp(volumeDataDir, function (error) {
        if (error) return callback(new Error(`Error creating app data dir: ${error.message}`));

        docker.createVolume(volumeOptions, function (error) {
@@ -577,35 +552,30 @@ function createVolume(app, name, volumeDataDir, callback) {
    });
 }

-function clearVolume(app, name, options, callback) {
+function clearVolume(app, name, subdir, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof name, 'string');
-    assert.strictEqual(typeof options, 'object');
+    assert.strictEqual(typeof subdir, 'string');
    assert.strictEqual(typeof callback, 'function');

-    let docker = exports.connection;
-    let volume = docker.getVolume(name);
-    volume.inspect(function (error, v) {
-        if (error && error.statusCode === 404) return callback();
-        if (error) return callback(error);
-
-        const volumeDataDir = v.Options.device;
-        shell.sudo('clearVolume', [ CLEARVOLUME_CMD, options.removeDirectory ? 'rmdir' : 'clear', volumeDataDir ], {}, callback);
-    });
+    shell.sudo('removeVolume', [ RMVOLUME_CMD, app.id, subdir ], {}, callback);
 }

-// this only removes the volume and not the data
-function removeVolume(app, name, callback) {
+function removeVolume(app, name, subdir, callback) {
    assert.strictEqual(typeof app, 'object');
    assert.strictEqual(typeof name, 'string');
+    assert.strictEqual(typeof subdir, 'string');
    assert.strictEqual(typeof callback, 'function');

    let docker = exports.connection;

    let volume = docker.getVolume(name);
    volume.remove(function (error) {
-        if (error && error.statusCode !== 404) return callback(new Error(`removeVolume: Error removing volume of ${app.id} ${error.message}`));
+        if (error && error.statusCode !== 404) {
+            debug(`removeVolume: Error removing volume of ${app.id} ${error}`);
+            callback(error);
+        }

-        callback();
+        shell.sudo('removeVolume', [ RMVOLUME_CMD, app.id, subdir ], {}, callback);
    });
 }
@@ -70,7 +70,7 @@ function attachDockerRequest(req, res, next) {
 function containersCreate(req, res, next) {
    safe.set(req.body, 'HostConfig.NetworkMode', 'cloudron'); // overwrite the network the container lives in
    safe.set(req.body, 'NetworkingConfig', {}); // drop any custom network configs
-    safe.set(req.body, 'Labels',  _.extend({ }, safe.query(req.body, 'Labels'), { appId: req.app.id, isCloudronManaged: String(false) }));    // overwrite the app id to track containers of an app
+    safe.set(req.body, 'Labels',  _.extend({ }, safe.query(req.body, 'Labels'), { appId: req.app.id }));    // overwrite the app id to track containers of an app
    safe.set(req.body, 'HostConfig.LogConfig', { Type: 'syslog', Config: { 'tag': req.app.id, 'syslog-address': 'udp://127.0.0.1:2514', 'syslog-format': 'rfc5424' }});

    const appDataDir = path.join(paths.APPS_DATA_DIR, req.app.id, 'data'),
@@ -122,7 +122,7 @@ function start(callback) {

    if (config.TEST) {
        proxyServer.use(function (req, res, next) {
-            debug('proxying: ' + req.method, req.url);
+            console.log('Proxying: ' + req.method, req.url);
            next();
        });
    }
@@ -16,7 +16,7 @@ var assert = require('assert'),
    DatabaseError = require('./databaseerror'),
    safe = require('safetydance');

-var DOMAINS_FIELDS = [ 'domain', 'zoneName', 'provider', 'configJson', 'tlsConfigJson', 'locked' ].join(',');
+var DOMAINS_FIELDS = [ 'domain', 'zoneName', 'provider', 'configJson', 'tlsConfigJson' ].join(',');

 function postProcess(data) {
    data.config = safe.JSON.parse(data.configJson);
@@ -24,8 +24,6 @@ function postProcess(data) {
    delete data.configJson;
    delete data.tlsConfigJson;

-    data.locked = !!data.locked; // make it bool
-
    return data;
 }

@@ -7,9 +7,9 @@ module.exports = exports = {
    update: update,
    del: del,
    clear: clear,
+    isLocked: isLocked,

    fqdn: fqdn,
-    getName: getName,

    getDnsRecords: getDnsRecords,
    upsertDnsRecords: upsertDnsRecords,
@@ -26,15 +26,13 @@ module.exports = exports = {

    parentDomain: parentDomain,

-    prepareDashboardDomain: prepareDashboardDomain,
-
    DomainsError: DomainsError,

-    SECRET_PLACEHOLDER: String.fromCharCode(0x25CF).repeat(8)
+    // exported for testing
+    _getName: getName
 };

 var assert = require('assert'),
-    async = require('async'),
    config = require('./config.js'),
    constants = require('./constants.js'),
    DatabaseError = require('./databaseerror.js'),
@@ -92,7 +90,6 @@ function api(provider) {
    case 'gandi': return require('./dns/gandi.js');
    case 'godaddy': return require('./dns/godaddy.js');
    case 'namecom': return require('./dns/namecom.js');
-    case 'namecheap': return require('./dns/namecheap.js');
    case 'noop': return require('./dns/noop.js');
    case 'manual': return require('./dns/manual.js');
    case 'wildcard': return require('./dns/wildcard.js');
@@ -105,18 +102,18 @@ function parentDomain(domain) {
    return domain.replace(/^\S+?\./, ''); // +? means non-greedy
 }

-function verifyDnsConfig(dnsConfig, domain, zoneName, provider, callback) {
+function verifyDnsConfig(dnsConfig, domain, zoneName, provider, ip, callback) {
    assert(dnsConfig && typeof dnsConfig === 'object'); // the dns config to test with
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof zoneName, 'string');
    assert.strictEqual(typeof provider, 'string');
+    assert.strictEqual(typeof ip, 'string');
    assert.strictEqual(typeof callback, 'function');

    var backend = api(provider);
    if (!backend) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Invalid provider'));

-    const domainObject = { config: dnsConfig, domain: domain, zoneName: zoneName };
-    api(provider).verifyDnsConfig(domainObject, function (error, result) {
+    api(provider).verifyDnsConfig(dnsConfig, domain, zoneName, ip, function (error, result) {
        if (error && error.reason === DomainsError.ACCESS_DENIED) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Incorrect configuration. Access denied'));
        if (error && error.reason === DomainsError.NOT_FOUND) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Zone not found'));
        if (error && error.reason === DomainsError.EXTERNAL_ERROR) return callback(new DomainsError(DomainsError.BAD_FIELD, 'Configuration error: ' + error.message));
@@ -145,6 +142,7 @@ function validateHostname(location, domainObject) {
    const hostname = fqdn(location, domainObject);

    const RESERVED_LOCATIONS = [
+        constants.API_LOCATION,
        constants.SMTP_LOCATION,
        constants.IMAP_LOCATION
    ];
@@ -226,24 +224,32 @@ function add(domain, data, auditSource, callback) {
    let error = validateTlsConfig(tlsConfig, provider);
    if (error) return callback(error);

-    verifyDnsConfig(config, domain, zoneName, provider, function (error, sanitizedConfig) {
-        if (error) return callback(error);
+    sysinfo.getPublicIp(function (error, ip) {
+        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));

-        domaindb.add(domain, { zoneName: zoneName, provider: provider, config: sanitizedConfig, tlsConfig: tlsConfig }, function (error) {
-            if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainsError(DomainsError.ALREADY_EXISTS));
-            if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+        verifyDnsConfig(config, domain, zoneName, provider, ip, function (error, sanitizedConfig) {
+            if (error) return callback(error);

-            reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
+            domaindb.add(domain, { zoneName: zoneName, provider: provider, config: sanitizedConfig, tlsConfig: tlsConfig }, function (error) {
+                if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new DomainsError(DomainsError.ALREADY_EXISTS));
                if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

-                eventlog.add(eventlog.ACTION_DOMAIN_ADD, auditSource, { domain, zoneName, provider });
+                reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
+                    if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

-                callback();
+                    eventlog.add(eventlog.ACTION_DOMAIN_ADD, auditSource, { domain, zoneName, provider });
+
+                    callback();
+                });
            });
        });
    });
 }

+function isLocked(domain) {
+    return domain === config.adminDomain() && config.edition() === 'hostingprovider';
+}
+
 function get(domain, callback) {
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');
@@ -253,6 +259,8 @@ function get(domain, callback) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

+        result.locked = isLocked(domain);
+
        reverseProxy.getFallbackCertificate(domain, function (error, bundle) {
            if (error && error.reason !== ReverseProxyError.NOT_FOUND) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

@@ -274,6 +282,8 @@ function getAll(callback) {
    domaindb.getAll(function (error, result) {
        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

+        result.forEach(function (r) { r.locked = isLocked(r.domain); });
+
        return callback(null, result);
    });
 }
@@ -308,30 +318,25 @@ function update(domain, data, auditSource, callback) {
        error = validateTlsConfig(tlsConfig, provider);
        if (error) return callback(error);

-        if (provider === domainObject.provider) api(provider).injectPrivateFields(config, domainObject.config);
+        sysinfo.getPublicIp(function (error, ip) {
+            if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));

-        verifyDnsConfig(config, domain, zoneName, provider, function (error, sanitizedConfig) {
-            if (error) return callback(error);
+            verifyDnsConfig(config, domain, zoneName, provider, ip, function (error, sanitizedConfig) {
+                if (error) return callback(error);

-            let newData = {
-                config: sanitizedConfig,
-                zoneName: zoneName,
-                provider: provider,
-                tlsConfig: tlsConfig
-            };
-
-            domaindb.update(domain, newData, function (error) {
-                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
-                if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
-
-                if (!fallbackCertificate) return callback();
-
-                reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
+                domaindb.update(domain, { zoneName: zoneName, provider: provider, config: sanitizedConfig, tlsConfig: tlsConfig }, function (error) {
+                    if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainsError(DomainsError.NOT_FOUND));
                    if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

-                    eventlog.add(eventlog.ACTION_DOMAIN_UPDATE, auditSource, { domain, zoneName, provider });
+                    if (!fallbackCertificate) return callback();

-                    callback();
+                    reverseProxy.setFallbackCertificate(domain, fallbackCertificate, function (error) {
+                        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));
+
+                        eventlog.add(eventlog.ACTION_DOMAIN_UPDATE, auditSource, { domain, zoneName, provider });
+
+                        callback();
+                    });
                });
            });
        });
@@ -367,36 +372,39 @@ function clear(callback) {
 }

 // returns the 'name' that needs to be inserted into zone
-function getName(domain, location, type) {
+function getName(domain, subdomain, type) {
+    // hack for supporting special caas domains. if we want to remove this, we have to fix the appstore domain API first
+    if (domain.provider === 'caas') return subdomain;
+
    const part = domain.domain.slice(0, -domain.zoneName.length - 1);

-    if (location === '') return part;
+    if (subdomain === '') return part;

-    if (!domain.config.hyphenatedSubdomains) return part ? `${location}.${part}` : location;
+    if (!domain.config.hyphenatedSubdomains) return part ? `${subdomain}.${part}` : subdomain;

    // hyphenatedSubdomains
-    if (type !== 'TXT') return `${location}-${part}`;
+    if (type !== 'TXT') return `${subdomain}-${part}`;

-    if (location.startsWith('_acme-challenge.')) {
-        return `${location}-${part}`;
-    } else if (location === '_acme-challenge') {
+    if (subdomain.startsWith('_acme-challenge.')) {
+        return `${subdomain}-${part}`;
+    } else if (subdomain === '_acme-challenge') {
        const up = part.replace(/^[^.]*\.?/, ''); // this gets the domain one level up
-        return up ? `${location}.${up}` : location;
+        return up ? `${subdomain}.${up}` : subdomain;
    } else {
-        return `${location}.${part}`;
+        return `${subdomain}.${part}`;
    }
 }

-function getDnsRecords(location, domain, type, callback) {
-    assert.strictEqual(typeof location, 'string');
+function getDnsRecords(subdomain, domain, type, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert.strictEqual(typeof callback, 'function');

-    get(domain, function (error, domainObject) {
+    get(domain, function (error, result) {
        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

-        api(domainObject.provider).get(domainObject, location, type, function (error, values) {
+        api(result.provider).get(result.config, result.zoneName, getName(result, subdomain, type), type, function (error, values) {
            if (error) return callback(error);

            callback(null, values);
@@ -405,19 +413,19 @@ function getDnsRecords(location, domain, type, callback) {
 }

 // note: for TXT records the values must be quoted
-function upsertDnsRecords(location, domain, type, values, callback) {
-    assert.strictEqual(typeof location, 'string');
+function upsertDnsRecords(subdomain, domain, type, values, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug('upsertDNSRecord: %s on %s type %s values', location, domain, type, values);
+    debug('upsertDNSRecord: %s on %s type %s values', subdomain, domain, type, values);

-    get(domain, function (error, domainObject) {
+    get(domain, function (error, result) {
        if (error) return callback(new DomainsError(DomainsError.INTERNAL_ERROR, error));

-        api(domainObject.provider).upsert(domainObject, location, type, values, function (error) {
+        api(result.provider).upsert(result.config, result.zoneName, getName(result, subdomain, type), type, values, function (error) {
            if (error) return callback(error);

            callback(null);
@@ -425,19 +433,19 @@ function upsertDnsRecords(location, domain, type, values, callback) {
    });
 }

-function removeDnsRecords(location, domain, type, values, callback) {
-    assert.strictEqual(typeof location, 'string');
+function removeDnsRecords(subdomain, domain, type, values, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof type, 'string');
    assert(util.isArray(values));
    assert.strictEqual(typeof callback, 'function');

-    debug('removeDNSRecord: %s on %s type %s values', location, domain, type, values);
+    debug('removeDNSRecord: %s on %s type %s values', subdomain, domain, type, values);

-    get(domain, function (error, domainObject) {
+    get(domain, function (error, result) {
        if (error) return callback(error);

-        api(domainObject.provider).del(domainObject, location, type, values, function (error) {
+        api(result.provider).del(result.config, result.zoneName, getName(result, subdomain, type), type, values, function (error) {
            if (error && error.reason !== DomainsError.NOT_FOUND) return callback(error);

            callback(null);
@@ -445,8 +453,8 @@ function removeDnsRecords(location, domain, type, values, callback) {
    });
 }

-function waitForDnsRecord(location, domain, type, value, options, callback) {
-    assert.strictEqual(typeof location, 'string');
+function waitForDnsRecord(subdomain, domain, type, value, options, callback) {
+    assert.strictEqual(typeof subdomain, 'string');
    assert.strictEqual(typeof domain, 'string');
    assert(type === 'A' || type === 'TXT');
    assert.strictEqual(typeof value, 'string');
@@ -456,14 +464,17 @@ function waitForDnsRecord(location, domain, type, value, options, callback) {
    get(domain, function (error, domainObject) {
        if (error) return callback(error);

-        api(domainObject.provider).wait(domainObject, location, type, value, options, callback);
+        const hostname = fqdn(subdomain, domainObject);
+
+        api(domainObject.provider).waitForDns(hostname, domainObject.zoneName, type, value, options, callback);
    });
 }

 // removes all fields that are strictly private and should never be returned by API calls
 function removePrivateFields(domain) {
    var result = _.pick(domain, 'domain', 'zoneName', 'provider', 'config', 'tlsConfig', 'fallbackCertificate', 'locked');
-    return api(result.provider).removePrivateFields(result);
+    if (result.fallbackCertificate) delete result.fallbackCertificate.key;  // do not return the 'key'. in caas, this is private
+    return result;
 }

 // removes all fields that are not accessible by a normal user
@@ -483,31 +494,3 @@ function makeWildcard(hostname) {
    parts[0] = '*';
    return parts.join('.');
 }
-
-function prepareDashboardDomain(domain, auditSource, progressCallback, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof progressCallback, 'function');
-    assert.strictEqual(typeof callback, 'function');
-
-    get(domain, function (error, domainObject) {
-        if (error) return callback(error);
-
-        sysinfo.getPublicIp(function (error, ip) {
-            if (error) return callback(new DomainsError(DomainsError.EXTERNAL_ERROR, error.message));
-
-            async.series([
-                (done) => { progressCallback({ percent: 10, message: 'Updating DNS' }); done(); },
-                upsertDnsRecords.bind(null, constants.ADMIN_LOCATION, domain, 'A', [ ip ]),
-                (done) => { progressCallback({ percent: 40, message: 'Waiting for DNS' }); done(); },
-                waitForDnsRecord.bind(null, constants.ADMIN_LOCATION, domain, 'A', ip, { interval: 30000, times: 50000 }),
-                (done) => { progressCallback({ percent: 70, message: 'Getting certificate' }); done(); },
-                reverseProxy.ensureCertificate.bind(null, fqdn(constants.ADMIN_LOCATION, domainObject), domain, auditSource)
-            ], function (error) {
-                if (error) return callback(error);
-
-                callback(null);
-            });
-        });
-    });
-}
@@ -6,37 +6,27 @@ exports = module.exports = {

 var appdb = require('./appdb.js'),
    apps = require('./apps.js'),
-    assert = require('assert'),
    async = require('async'),
    config = require('./config.js'),
-    constants = require('./constants.js'),
    debug = require('debug')('box:dyndns'),
    domains = require('./domains.js'),
-    eventlog = require('./eventlog.js'),
-    paths = require('./paths.js'),
-    safe = require('safetydance'),
    sysinfo = require('./sysinfo.js');

+var NOOP_CALLBACK = function (error) { if (error) debug(error); };
+
 // called for dynamic dns setups where we have to update the IP
-function sync(auditSource, callback) {
-    assert.strictEqual(typeof auditSource, 'object');
-    assert.strictEqual(typeof callback, 'function');
+function sync(callback) {
+    callback = callback || NOOP_CALLBACK;

    sysinfo.getPublicIp(function (error, ip) {
        if (error) return callback(error);

-        let info = safe.JSON.parse(safe.fs.readFileSync(paths.DYNDNS_INFO_FILE, 'utf8')) || { ip: null };
-        if (info.ip === ip) {
-            debug(`refreshDNS: no change in IP ${ip}`);
-            return callback();
-        }
+        debug('refreshDNS: current ip %s', ip);

-        debug(`refreshDNS: updating ip from ${info.ip} to ${ip}`);
-
-        domains.upsertDnsRecords(constants.ADMIN_LOCATION, config.adminDomain(), 'A', [ ip ], function (error) {
+        domains.upsertDnsRecords(config.adminLocation(), config.adminDomain(), 'A', [ ip ], function (error) {
            if (error) return callback(error);

-            debug('refreshDNS: updated admin location');
+            debug('refreshDNS: done for admin location');

            apps.getAll(function (error, result) {
                if (error) return callback(error);
@@ -49,11 +39,7 @@ function sync(auditSource, callback) {
                }, function (error) {
                    if (error) return callback(error);

-                    debug('refreshDNS: updated apps');
-
-                    eventlog.add(eventlog.ACTION_DYNDNS_UPDATE, auditSource, { fromIp: info.ip, toIp: ip });
-                    info.ip = ip;
-                    safe.fs.writeFileSync(paths.DYNDNS_INFO_FILE, JSON.stringify(info), 'utf8');
+                    debug('refreshDNS: done for apps');

                    callback();
                });
@@ -17,25 +17,15 @@ exports = module.exports = {
    ACTION_APP_RESTORE: 'app.restore',
    ACTION_APP_UNINSTALL: 'app.uninstall',
    ACTION_APP_UPDATE: 'app.update',
-    ACTION_APP_UPDATE_FINISH: 'app.update.finish',
    ACTION_APP_LOGIN: 'app.login',
-    ACTION_APP_OOM: 'app.oom',
-    ACTION_APP_UP: 'app.up',
-    ACTION_APP_DOWN: 'app.down',
-    ACTION_APP_TASK_START: 'app.task.start',
-    ACTION_APP_TASK_CRASH: 'app.task.crash',
-    ACTION_APP_TASK_SUCCESS: 'app.task.success',

    ACTION_BACKUP_FINISH: 'backup.finish',
    ACTION_BACKUP_START: 'backup.start',
-    ACTION_BACKUP_CLEANUP_START: 'backup.cleanup.start',
-    ACTION_BACKUP_CLEANUP_FINISH: 'backup.cleanup.finish',
+    ACTION_BACKUP_CLEANUP: 'backup.cleanup',

    ACTION_CERTIFICATE_NEW: 'certificate.new',
    ACTION_CERTIFICATE_RENEWAL: 'certificate.renew',

-    ACTION_DASHBOARD_DOMAIN_UPDATE: 'dashboard.domain.update',
-
    ACTION_DOMAIN_ADD: 'domain.add',
    ACTION_DOMAIN_UPDATE: 'domain.update',
    ACTION_DOMAIN_REMOVE: 'domain.remove',
@@ -57,17 +47,12 @@ exports = module.exports = {
    ACTION_USER_REMOVE: 'user.remove',
    ACTION_USER_UPDATE: 'user.update',
    ACTION_USER_TRANSFER: 'user.transfer',
-
-    ACTION_DYNDNS_UPDATE: 'dyndns.update',
-
-    ACTION_PROCESS_CRASH: 'system.crash'
 };

 var assert = require('assert'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:eventlog'),
    eventlogdb = require('./eventlogdb.js'),
-    notifications = require('./notifications.js'),
    util = require('util'),
    uuid = require('uuid');

@@ -103,16 +88,12 @@ function add(action, source, data, callback) {

    callback = callback || NOOP_CALLBACK;

-    // we do only daily upserts for login actions, so they don't spam the db
-    var api = action === exports.ACTION_USER_LOGIN ? eventlogdb.upsert : eventlogdb.add;
-    api(uuid.v4(), action, source, data, function (error, id) {
+    var id = uuid.v4();
+
+    eventlogdb.add(id, action, source, data, function (error) {
        if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error));

-        notifications.onEvent(id, action, source, data, function (error) {
-            if (error) return callback(new EventLogError(EventLogError.INTERNAL_ERROR, error));
-
-            callback(null, { id: id });
-        });
+        callback(null, { id: id });
    });
 }

@@ -5,7 +5,6 @@ exports = module.exports = {
    getAllPaged: getAllPaged,
    getByCreationTime: getByCreationTime,
    add: add,
-    upsert: upsert,
    count: count,
    delByCreationTime: delByCreationTime,

@@ -13,14 +12,13 @@ exports = module.exports = {
 };

 var assert = require('assert'),
-    async = require('async'),
    database = require('./database.js'),
    DatabaseError = require('./databaseerror'),
    mysql = require('mysql'),
    safe = require('safetydance'),
    util = require('util');

-var EVENTLOG_FIELDS = [ 'id', 'action', 'source', 'data', 'creationTime' ].join(',');
+var EVENTLOGS_FIELDS = [ 'id', 'action', 'source', 'data', 'creationTime' ].join(',');

 function postProcess(eventLog) {
    // usually we have sourceJson and dataJson, however since this used to be the JSON data type, we don't
@@ -34,7 +32,7 @@ function get(eventId, callback) {
    assert.strictEqual(typeof eventId, 'string');
    assert.strictEqual(typeof callback, 'function');

-    database.query('SELECT ' + EVENTLOG_FIELDS + ' FROM eventlog WHERE id = ?', [ eventId ], function (error, result) {
+    database.query('SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog WHERE id = ?', [ eventId ], function (error, result) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
        if (result.length === 0) return callback(new DatabaseError(DatabaseError.NOT_FOUND));

@@ -50,7 +48,7 @@ function getAllPaged(actions, search, page, perPage, callback) {
    assert.strictEqual(typeof callback, 'function');

    var data = [];
-    var query = 'SELECT ' + EVENTLOG_FIELDS + ' FROM eventlog';
+    var query = 'SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog';

    if (actions.length || search) query += ' WHERE';
    if (search) query += ' (source LIKE ' + mysql.escape('%' + search + '%') + ' OR data LIKE ' + mysql.escape('%' + search + '%') + ')';
@@ -80,7 +78,7 @@ function getByCreationTime(creationTime, callback) {
    assert(util.isDate(creationTime));
    assert.strictEqual(typeof callback, 'function');

-    var query = 'SELECT ' + EVENTLOG_FIELDS + ' FROM eventlog WHERE creationTime >= ? ORDER BY creationTime DESC';
+    var query = 'SELECT ' + EVENTLOGS_FIELDS + ' FROM eventlog WHERE creationTime >= ? ORDER BY creationTime DESC';
    database.query(query, [ creationTime ], function (error, results) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

@@ -101,33 +99,7 @@ function add(id, action, source, data, callback) {
        if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error));
        if (error || result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

-        callback(null, id);
-    });
-}
-
-// id is only used if we didn't do an update but insert instead
-function upsert(id, action, source, data, callback) {
-    assert.strictEqual(typeof id, 'string');
-    assert.strictEqual(typeof action, 'string');
-    assert.strictEqual(typeof source, 'object');
-    assert.strictEqual(typeof data, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    // can't do a real sql upsert, for frequent eventlog entries we only have to do 2 queries once a day
-    var queries = [{
-        query: 'UPDATE eventlog SET creationTime=NOW(), data=? WHERE action = ? AND source LIKE ? AND DATE(creationTime)=CURDATE()',
-        args: [ JSON.stringify(data), action, JSON.stringify(source) ]
-    }, {
-        query: 'SELECT ' + EVENTLOG_FIELDS + ' FROM eventlog WHERE action = ? AND source LIKE ? AND DATE(creationTime)=CURDATE()',
-        args: [ action, JSON.stringify(source) ]
-    }];
-
-    database.transaction(queries, function (error, result) {
-        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-        if (result[0].affectedRows >= 1) return callback(null, result[1][0].id);
-
-        // no existing eventlog found, create one
-        add(id, action, source, data, callback);
+        callback(null);
    });
 }

@@ -145,7 +117,7 @@ function clear(callback) {
    database.query('DELETE FROM eventlog', function (error) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

-        callback(null);
+        callback(error);
    });
 }

@@ -153,19 +125,11 @@ function delByCreationTime(creationTime, callback) {
    assert(util.isDate(creationTime));
    assert.strictEqual(typeof callback, 'function');

-    // remove notifications that reference the events as well
-    database.query('SELECT * FROM eventlog WHERE creationTime <= ?', [ creationTime ], function (error, result) {
+    var query = 'DELETE FROM eventlog WHERE creationTime < ?';
+
+    database.query(query, [ creationTime ], function (error) {
        if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

-        async.eachSeries(result, function (item, iteratorCallback) {
-            async.series([
-                database.query.bind(null, 'DELETE FROM notifications WHERE eventId=?', [ item.id ]),
-                database.query.bind(null, 'DELETE FROM eventlog WHERE id=?', [ item.id ])
-            ], iteratorCallback);
-        }, function (error) {
-            if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));
-
-            callback(null);
-        });
+        callback(error);
    });
 }
@@ -19,7 +19,6 @@ function startGraphite(existingInfra, callback) {
    if (existingInfra.version === infra.version && infra.images.graphite.tag === existingInfra.images.graphite.tag) return callback();

    const cmd = `docker run --restart=always -d --name="graphite" \
-                --hostname graphite \
                --net cloudron \
                --net-alias graphite \
                --log-driver syslog \
@@ -6,7 +6,7 @@

 exports = module.exports = {
    // a version change recreates all containers with latest docker config
-    'version': '48.15.0',
+    'version': '48.12.1',

    'baseImages': [
        { repo: 'cloudron/base', tag: 'cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617' }
@@ -15,12 +15,11 @@ exports = module.exports = {
    // a major version bump in the db containers will trigger the restore logic that uses the db dumps
    // docker inspect --format='{{index .RepoDigests 0}}' $IMAGE to get the sha256
    'images': {
-        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:2.0.2@sha256:a28320f313785816be60e3f865e09065504170a3d20ed37de675c719b32b01eb' },
+        'mysql': { repo: 'cloudron/mysql', tag: 'cloudron/mysql:2.0.1@sha256:5a13360da4a2085c7d474bea6b1090c5eb24732d4f73459942af7612d4993d7f' },
        'postgresql': { repo: 'cloudron/postgresql', tag: 'cloudron/postgresql:2.0.2@sha256:6dcee0731dfb9b013ed94d56205eee219040ee806c7e251db3b3886eaa4947ff' },
        'mongodb': { repo: 'cloudron/mongodb', tag: 'cloudron/mongodb:2.0.2@sha256:95e006390ddce7db637e1672eb6f3c257d3c2652747424f529b1dee3cbe6728c' },
        'redis': { repo: 'cloudron/redis', tag: 'cloudron/redis:2.0.0@sha256:8a88dd334b62b578530a014ca1a2425a54cb9df1e475f5d3a36806e5cfa22121' },
-        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.3.1@sha256:9693e3ae42a12a7ac8cf5df94d828d46f5b22b4e2e1c7d1bc614d6ee2a22c365' },
-        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.0.2@sha256:454f035d60b768153d4f31210380271b5ba1c09367c9d95c7fa37f9e39d2f59c' },
-        'sftp': { repo: 'cloudron/sftp', tag: 'cloudron/sftp:0.1.0@sha256:e177c5bf5f38c84ce1dea35649c22a1b05f96eec67a54a812c5a35e585670f0f' }
+        'mail': { repo: 'cloudron/mail', tag: 'cloudron/mail:2.0.1@sha256:deee3739011670d45abd8997a8a0b8d3c4cd577a93f235417614dea58338e0f9' },
+        'graphite': { repo: 'cloudron/graphite', tag: 'cloudron/graphite:2.0.2@sha256:454f035d60b768153d4f31210380271b5ba1c09367c9d95c7fa37f9e39d2f59c' }
    }
 };
@@ -13,14 +13,13 @@ var assert = require('assert'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:ldap'),
    eventlog = require('./eventlog.js'),
+    users = require('./users.js'),
+    UsersError = users.UsersError,
    ldap = require('ldapjs'),
    mail = require('./mail.js'),
    MailError = mail.MailError,
    mailboxdb = require('./mailboxdb.js'),
-    path = require('path'),
-    safe = require('safetydance'),
-    users = require('./users.js'),
-    UsersError = users.UsersError;
+    safe = require('safetydance');

 var gServer = null;

@@ -48,7 +47,7 @@ function getUsersWithAccessToApp(req, callback) {
    assert.strictEqual(typeof req.app, 'object');
    assert.strictEqual(typeof callback, 'function');

-    users.getAll(function (error, result) {
+    users.list(function (error, result) {
        if (error) return callback(new ldap.OperationsError(error.toString()));

        async.filter(result, apps.hasAccessTo.bind(null, req.app), function (error, allowedUsers) {
@@ -96,9 +95,9 @@ function finalSend(results, req, res, next) {

        var resultCookie;
        if (last < max) {
-            resultCookie = Buffer.from(last.toString());
+            resultCookie = new Buffer(last.toString());
        } else {
-            resultCookie = Buffer.from('');
+            resultCookie = new Buffer('');
        }

        res.controls.push(new ldap.PagedResultsControl({
@@ -271,7 +270,11 @@ function mailboxSearch(req, res, next) {
                    objectcategory: 'mailbox',
                    cn: `${mailbox.name}@${mailbox.domain}`,
                    uid: `${mailbox.name}@${mailbox.domain}`,
-                    mail: `${mailbox.name}@${mailbox.domain}`
+                    mail: `${mailbox.name}@${mailbox.domain}`,
+                    displayname: 'Max Mustermann',
+                    givenName: 'Max',
+                    username: 'mmustermann',
+                    samaccountname: 'mmustermann'
                }
            };

@@ -441,7 +444,7 @@ function authorizeUserForApp(req, res, next) {
        // we return no such object, to avoid leakage of a users existence
        if (!result) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-        eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: req.app.id }, { userId: req.user.id, user: users.removePrivateFields(req.user) });
+        eventlog.add(eventlog.ACTION_USER_LOGIN, { authType: 'ldap', appId: req.app.id, app: req.app }, { userId: req.user.id, user: users.removePrivateFields(req.user) });

        res.end();
    });
@@ -478,71 +481,6 @@ function authenticateUserMailbox(req, res, next) {
    });
 }

-function authenticateSftp(req, res, next) {
-    debug('sftp auth: %s (from %s)', req.dn.toString(), req.connection.ldap.id);
-
-    if (!req.dn.rdns[0].attrs.cn) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-
-    var email = req.dn.rdns[0].attrs.cn.value.toLowerCase();
-    var parts = email.split('@');
-    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-
-    // actual user bind
-    users.verifyWithUsername(parts[0], req.credentials, function (error) {
-        if (error) return next(new ldap.InvalidCredentialsError(req.dn.toString()));
-
-        debug('sftp auth: success');
-
-        res.end();
-    });
-}
-
-function userSearchSftp(req, res, next) {
-    debug('sftp user search: dn %s, scope %s, filter %s (from %s)', req.dn.toString(), req.scope, req.filter.toString(), req.connection.ldap.id);
-
-    if (req.filter.attribute !== 'username' || !req.filter.value) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-
-    var parts = req.filter.value.split('@');
-    if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
-
-    var username = parts[0];
-    var appFqdn = parts[1];
-
-    apps.getByFqdn(appFqdn, function (error, app) {
-        if (error) return next(new ldap.OperationsError(error.toString()));
-
-        // only allow apps which specify "ftp" support in the localstorage addon
-        if (!safe.query(app.manifest.addons, 'localstorage.ftp.uid')) return next(new ldap.UnavailableError('Not supported'));
-        if (typeof app.manifest.addons.localstorage.ftp.uid !== 'number') return next(new ldap.UnavailableError('Bad uid, must be a number'));
-
-        const uidNumber = app.manifest.addons.localstorage.ftp.uid;
-
-        users.getByUsername(username, function (error, user) {
-            if (error) return next(new ldap.OperationsError(error.toString()));
-
-            apps.hasAccessTo(app, user, function (error, hasAccess) {
-                if (error) return next(new ldap.OperationsError(error.toString()));
-                if (!hasAccess) return next(new ldap.InsufficientAccessRightsError('Not authorized'));
-
-                var obj = {
-                    dn: ldap.parseDN(`cn=${username}@${appFqdn},ou=sftp,dc=cloudron`).toString(),
-                    attributes: {
-                        homeDirectory: path.join('/app/data', app.id, 'data'),
-                        objectclass: ['user'],
-                        objectcategory: 'person',
-                        cn: user.id,
-                        uid: `${username}@${appFqdn}`,  // for bind after search
-                        uidNumber: uidNumber,           // unix uid for ftp access
-                        gidNumber: uidNumber            // unix gid for ftp access
-                    }
-                };
-
-                finalSend([ obj ], req, res, next);
-            });
-        });
-    });
-}
-
 function authenticateMailAddon(req, res, next) {
    debug('mail addon auth: %s (from %s)', req.dn.toString(), req.connection.ldap.id);

@@ -560,13 +498,13 @@ function authenticateMailAddon(req, res, next) {

        if (addonId === 'recvmail' && !domain.enabled) return next(new ldap.NoSuchObjectError(req.dn.toString()));

-        let namePattern; // manifest v2 has a CLOUDRON_ prefix for names
-        if (addonId === 'sendmail') namePattern = '%MAIL_SMTP_PASSWORD';
-        else if (addonId === 'recvmail') namePattern = '%MAIL_IMAP_PASSWORD';
+        let name;
+        if (addonId === 'sendmail') name = 'MAIL_SMTP_PASSWORD';
+        else if (addonId === 'recvmail') name = 'MAIL_IMAP_PASSWORD';
        else return next(new ldap.OperationsError('Invalid DN'));

        // note: with sendmail addon, apps can send mail without a mailbox (unlike users)
-        appdb.getAppIdByAddonConfigValue(addonId, namePattern, req.credentials || '', function (error, appId) {
+        appdb.getAppIdByAddonConfigValue(addonId, name, req.credentials || '', function (error, appId) {
            if (error && error.reason !== DatabaseError.NOT_FOUND) return next(new ldap.OperationsError(error.message));
            if (appId) { // matched app password
                eventlog.add(eventlog.ACTION_APP_LOGIN, { authType: 'ldap', mailboxId: email }, { appId: appId, addonId: addonId });
@@ -604,10 +542,6 @@ function start(callback) {

    gServer = ldap.createServer({ log: logger });

-    gServer.on('error', function (error) {
-        console.error('LDAP:', error);
-    });
-
    gServer.search('ou=users,dc=cloudron', authenticateApp, userSearch);
    gServer.search('ou=groups,dc=cloudron', authenticateApp, groupSearch);
    gServer.bind('ou=users,dc=cloudron', authenticateApp, authenticateUser, authorizeUserForApp);
@@ -621,9 +555,6 @@ function start(callback) {
    gServer.bind('ou=recvmail,dc=cloudron', authenticateMailAddon); // dovecot
    gServer.bind('ou=sendmail,dc=cloudron', authenticateMailAddon); // haraka

-    gServer.bind('ou=sftp,dc=cloudron', authenticateSftp);    // sftp
-    gServer.search('ou=sftp,dc=cloudron', userSearchSftp);
-
    gServer.compare('cn=users,ou=groups,dc=cloudron', authenticateApp, groupUsersCompare);
    gServer.compare('cn=admins,ou=groups,dc=cloudron', authenticateApp, groupAdminsCompare);

@@ -0,0 +1,78 @@
+'use strict';
+
+exports = module.exports = {
+    sendFailureLogs: sendFailureLogs
+};
+
+var assert = require('assert'),
+    mailer = require('./mailer.js'),
+    safe = require('safetydance'),
+    path = require('path'),
+    util = require('util');
+
+var COLLECT_LOGS_CMD = path.join(__dirname, 'scripts/collectlogs.sh');
+
+var CRASH_LOG_TIMESTAMP_OFFSET = 1000 * 60 * 60; // 60 min
+var CRASH_LOG_TIMESTAMP_FILE = '/tmp/crashlog.timestamp';
+var CRASH_LOG_STASH_FILE = '/tmp/crashlog';
+var CRASH_LOG_FILE_LIMIT = 2 * 1024 * 1024; // 2mb
+
+function collectLogs(unitName, callback) {
+    assert.strictEqual(typeof unitName, 'string');
+    assert.strictEqual(typeof callback, 'function');
+
+    var logs = safe.child_process.execSync('sudo ' + COLLECT_LOGS_CMD + ' ' + unitName, { encoding: 'utf8' });
+    if (!logs) return callback(safe.error);
+
+    logs = logs + '\n\n=====================================\n\n';
+
+    callback(null, logs);
+}
+
+function stashLogs(logs) {
+    var stat = safe.fs.statSync(CRASH_LOG_STASH_FILE);
+    if (stat && (stat.size > CRASH_LOG_FILE_LIMIT)) {
+        console.error('Dropping logs since crash file has become too big');
+        return;
+    }
+
+    // append here
+    safe.fs.writeFileSync(CRASH_LOG_STASH_FILE, logs, { flag: 'a' });
+}
+
+function sendFailureLogs(processName, options) {
+    assert.strictEqual(typeof processName, 'string');
+    assert.strictEqual(typeof options, 'object');
+
+    collectLogs(options.unit || processName, function (error, newLogs) {
+        if (error) {
+            console.error('Failed to collect logs.', error);
+            newLogs = util.format('Failed to collect logs.', error);
+        }
+
+        console.log('Sending failure logs for', processName);
+
+        var timestamp = safe.fs.readFileSync(CRASH_LOG_TIMESTAMP_FILE, 'utf8');
+
+        // check if we already sent a mail in the last CRASH_LOG_TIME_OFFSET window
+        if (timestamp && (parseInt(timestamp) + CRASH_LOG_TIMESTAMP_OFFSET) > Date.now()) {
+            console.log('Crash log already sent within window. Stashing logs.');
+            return stashLogs(newLogs);
+        }
+
+        var stashedLogs = safe.fs.readFileSync(CRASH_LOG_STASH_FILE, 'utf8');
+        var compiledLogs = stashedLogs ? (stashedLogs + newLogs) : newLogs;
+        var mailSubject = processName + (stashedLogs ? ' and others' : '');
+
+        mailer.unexpectedExit(mailSubject, compiledLogs, function (error) {
+            if (error) {
+                console.log('Error sending crashlog. Stashing logs.');
+                return stashLogs(newLogs);
+            }
+
+            // write the new timestamp file and delete stash file
+            safe.fs.writeFileSync(CRASH_LOG_TIMESTAMP_FILE, String(Date.now()));
+            safe.fs.unlinkSync(CRASH_LOG_STASH_FILE);
+        });
+    });
+}
@@ -2,7 +2,6 @@

 exports = module.exports = {
    getStatus: getStatus,
-    checkConfiguration: checkConfiguration,

    getDomains: getDomains,

@@ -11,10 +10,7 @@ exports = module.exports = {
    removeDomain: removeDomain,
    clearDomains: clearDomains,

-    removePrivateFields: removePrivateFields,
-
    setDnsRecords: setDnsRecords,
-    onMailFqdnChanged: onMailFqdnChanged,

    validateName: validateName,

@@ -24,8 +20,6 @@ exports = module.exports = {
    setMailEnabled: setMailEnabled,

    startMail: restartMail,
-    restartMail: restartMail,
-    handleCertChanged: handleCertChanged,

    sendTestMail: sendTestMail,

@@ -54,7 +48,6 @@ exports = module.exports = {
 var assert = require('assert'),
    async = require('async'),
    config = require('./config.js'),
-    constants = require('./constants.js'),
    DatabaseError = require('./databaseerror.js'),
    debug = require('debug')('box:mail'),
    dns = require('./native-dns.js'),
@@ -78,7 +71,7 @@ var assert = require('assert'),
    util = require('util'),
    _ = require('underscore');

-const DNS_OPTIONS = { timeout: 5000 };
+const DNS_OPTIONS = { server: '127.0.0.1', timeout: 5000 }; // unbound runs on 127.0.0.1
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };

 function MailError(reason, errorOrMessage) {
@@ -106,6 +99,7 @@ MailError.BAD_FIELD = 'Bad Field';
 MailError.ALREADY_EXISTS = 'Already Exists';
 MailError.NOT_FOUND = 'Not Found';
 MailError.IN_USE = 'In Use';
+MailError.BILLING_REQUIRED = 'Billing Required';

 function validateName(name) {
    assert.strictEqual(typeof name, 'string');
@@ -147,13 +141,13 @@ function checkOutboundPort25(callback) {
    });
    client.on('timeout', function () {
        relay.status = false;
-        relay.value = `Connect to ${smtpServer} timed out. Check if port 25 (outbound) is blocked`;
+        relay.value = 'Connect to ' + smtpServer + ' timed out';
        client.destroy();
        callback(new Error('Timeout'), relay);
    });
    client.on('error', function (error) {
        relay.status = false;
-        relay.value = `Connect to ${smtpServer} failed: ${error.message}. Check if port 25 (outbound) is blocked`;
+        relay.value = 'Connect to ' + smtpServer + ' failed: ' + error.message;
        client.destroy();
        callback(error, relay);
    });
@@ -165,24 +159,16 @@ function checkSmtpRelay(relay, callback) {
        status: false
    };

-    var options = {
+    var transporter = nodemailer.createTransport(smtpTransport({
        connectionTimeout: 5000,
        greetingTimeout: 5000,
        host: relay.host,
-        port: relay.port
-    };
-
-    // only set auth if either username or password is provided, some relays auth based on IP (range)
-    if (relay.username || relay.password) {
-        options.auth = {
+        port: relay.port,
+        auth: {
            user: relay.username,
            pass: relay.password
-        };
-    }
-
-    if (relay.acceptSelfSignedCerts) options.tls = { rejectUnauthorized: false };
-
-    var transporter = nodemailer.createTransport(smtpTransport(options));
+        }
+    }));

    transporter.verify(function(error) {
        result.status = !error;
@@ -201,7 +187,7 @@ function verifyRelay(relay, callback) {

    // we used to verify cloudron-smtp with checkOutboundPort25 but that is unreliable given that we just
    // randomly select some smtp server
-    if (relay.provider === 'cloudron-smtp' || relay.provider === 'noop') return callback();
+    if (relay.provider === 'cloudron-smtp') return callback();

    checkSmtpRelay(relay, function (error) {
        if (error) return callback(new MailError(MailError.BAD_FIELD, error.message));
@@ -210,14 +196,10 @@ function verifyRelay(relay, callback) {
    });
 }

-function checkDkim(mailDomain, callback) {
-    assert.strictEqual(typeof mailDomain, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    const domain = mailDomain.domain;
-    let dkim = {
-        domain: `${mailDomain.dkimSelector}._domainkey.${domain}`,
-        name: `${mailDomain.dkimSelector}._domainkey`,
+function checkDkim(domain, callback) {
+    var dkim = {
+        domain: config.dkimSelector() + '._domainkey.' + domain,
+        name: config.dkimSelector() + '._domainkey',
        type: 'TXT',
        expected: null,
        value: null,
@@ -241,17 +223,13 @@ function checkDkim(mailDomain, callback) {
    });
 }

-function checkSpf(domain, mailFqdn, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof mailFqdn, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
+function checkSpf(domain, callback) {
    var spf = {
        domain: domain,
        name: '@',
        type: 'TXT',
        value: null,
-        expected: 'v=spf1 a:' + mailFqdn + ' ~all',
+        expected: 'v=spf1 a:' + config.mailFqdn() + ' ~all',
        status: false
    };

@@ -277,41 +255,25 @@ function checkSpf(domain, mailFqdn, callback) {
    });
 }

-function checkMx(domain, mailFqdn, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof mailFqdn, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
+function checkMx(domain, callback) {
    var mx = {
        domain: domain,
        name: '@',
        type: 'MX',
        value: null,
-        expected: '10 ' + mailFqdn + '.',
+        expected: '10 ' + config.mailFqdn() + '.',
        status: false
    };

    dns.resolve(mx.domain, mx.type, DNS_OPTIONS, function (error, mxRecords) {
        if (error) return callback(error, mx);
-        if (mxRecords.length === 0) return callback(null, mx);

-        mx.status = mxRecords.length == 1 && mxRecords[0].exchange === mailFqdn;
-        mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange + '.'; }).join(' ');
+        if (mxRecords.length !== 0) {
+            mx.status = mxRecords.length == 1 && mxRecords[0].exchange === config.mailFqdn();
+            mx.value = mxRecords.map(function (r) { return r.priority + ' ' + r.exchange + '.'; }).join(' ');
+        }

-        if (mx.status) return callback(null, mx); // MX record is "my."
-
-        // cloudflare might create a conflict subdomain (https://support.cloudflare.com/hc/en-us/articles/360020296512-DNS-Troubleshooting-FAQ)
-        dns.resolve(mxRecords[0].exchange, 'A', DNS_OPTIONS, function (error, mxIps) {
-            if (error || mxIps.length !== 1) return callback(null, mx);
-
-            sysinfo.getPublicIp(function (error, ip) {
-                if (error) return callback(null, mx);
-
-                mx.status = mxIps[0] === ip;
-
-                callback(null, mx);
-            });
-        });
+        callback(null, mx);
    });
 }

@@ -348,15 +310,12 @@ function checkDmarc(domain, callback) {
    });
 }

-function checkPtr(mailFqdn, callback) {
-    assert.strictEqual(typeof mailFqdn, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
+function checkPtr(callback) {
    var ptr = {
        domain: null,
        type: 'PTR',
        value: null,
-        expected: mailFqdn, // any trailing '.' is added by client software (https://lists.gt.net/spf/devel/7918)
+        expected: config.mailFqdn(), // any trailing '.' is added by client software (https://lists.gt.net/spf/devel/7918)
        status: false
    };

@@ -480,9 +439,9 @@ function getStatus(domain, callback) {

    // ensure we always have a valid toplevel properties for the api
    var results = {
-        dns: {}, // { mx: { expected, value }, dmarc: { expected, value }, dkim: { expected, value }, spf: { expected, value }, ptr: { expected, value } }
-        rbl: {}, // { status, ip, servers: [{name,site,dns}]} optional. only for cloudron-smtp
-        relay: {} // { status, value } always checked
+        dns: {},
+        rbl: {},
+        relay: {}
    };

    function recordResult(what, func) {
@@ -497,30 +456,25 @@ function getStatus(domain, callback) {
        };
    }

-    const mailFqdn = config.mailFqdn();
-
-    getDomain(domain, function (error, mailDomain) {
+    getDomain(domain, function (error, result) {
        if (error) return callback(error);

-        let checks = [];
-        if (mailDomain.enabled) {
-            checks.push(
-                recordResult('dns.mx', checkMx.bind(null, domain, mailFqdn)),
-                recordResult('dns.dmarc', checkDmarc.bind(null, domain))
-            );
-        }
+        var checks = [
+            recordResult('dns.mx', checkMx.bind(null, domain)),
+            recordResult('dns.dmarc', checkDmarc.bind(null, domain))
+        ];

-        if (mailDomain.relay.provider === 'cloudron-smtp') {
+        if (result.relay.provider === 'cloudron-smtp') {
            // these tests currently only make sense when using Cloudron's SMTP server at this point
            checks.push(
-                recordResult('dns.spf', checkSpf.bind(null, domain, mailFqdn)),
-                recordResult('dns.dkim', checkDkim.bind(null, mailDomain)),
-                recordResult('dns.ptr', checkPtr.bind(null, mailFqdn)),
+                recordResult('dns.spf', checkSpf.bind(null, domain)),
+                recordResult('dns.dkim', checkDkim.bind(null, domain)),
+                recordResult('dns.ptr', checkPtr),
                recordResult('relay', checkOutboundPort25),
                recordResult('rbl', checkRblStatus.bind(null, domain))
            );
-        } else if (mailDomain.relay.provider !== 'noop') {
-            checks.push(recordResult('relay', checkSmtpRelay.bind(null, mailDomain.relay)));
+        } else {
+            checks.push(recordResult('relay', checkSmtpRelay.bind(null, result.relay)));
        }

        async.parallel(checks, function () {
@@ -529,54 +483,7 @@ function getStatus(domain, callback) {
    });
 }

-function checkConfiguration(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    let messages = {};
-
-    domains.getAll(function (error, allDomains) {
-        if (error) return callback(error);
-
-        async.eachSeries(allDomains, function (domainObject, iteratorCallback) {
-            getStatus(domainObject.domain, function (error, result) {
-                if (error) return iteratorCallback(error);
-
-                let message = [];
-
-                Object.keys(result.dns).forEach((type) => {
-                    const record = result.dns[type];
-                    if (!record.status) message.push(`${type.toUpperCase()} DNS record did not match. Expected: \`${record.expected}\`. Actual: \`${record.value}\``);
-                });
-                if (result.relay && result.relay.status === false) message.push(`Relay error: ${result.relay.value}`);
-                if (result.rbl && result.rbl.status === false) { // rbl field contents is optional
-                    const servers = result.rbl.servers.map((bs) => `[${bs.name}](${bs.site})`); // in markdown
-                    message.push(`This server's IP \`${result.rbl.ip}\` is blacklisted in the following servers - ${servers.join(', ')}`);
-                }
-
-                if (message.length) messages[domainObject.domain] = message;
-
-                iteratorCallback(null);
-            });
-        }, function (error) {
-            if (error) return callback(error);
-
-            // create bulleted list for each domain
-            let markdownMessage = '';
-            Object.keys(messages).forEach((domain) => {
-                markdownMessage += `**${domain}**\n`;
-                markdownMessage += messages[domain].map((m) => `* ${m}\n`).join('');
-                markdownMessage += '\n\n';
-            });
-
-            if (markdownMessage) markdownMessage += 'Email Status is checked every 30 minutes\n See the [troubleshooting docs](https://cloudron.io/documentation/troubleshooting/#mail-dns) for more information.\n';
-
-            callback(null, markdownMessage); // empty message means all status checks succeeded
-        });
-    });
-}
-
-function createMailConfig(mailFqdn, callback) {
-    assert.strictEqual(typeof mailFqdn, 'string');
+function createMailConfig(callback) {
    assert.strictEqual(typeof callback, 'function');

    debug('createMailConfig: generating mail config');
@@ -584,65 +491,72 @@ function createMailConfig(mailFqdn, callback) {
    getDomains(function (error, mailDomains) {
        if (error) return callback(error);

-        const mailOutDomains = mailDomains.filter(d => d.relay.provider !== 'noop').map(d => d.domain).join(',');
-        const mailInDomains = mailDomains.filter(function (d) { return d.enabled; }).map(function (d) { return d.domain; }).join(',');
+        users.getOwner(function (error, owner) {
+            const mailFqdn = config.mailFqdn();
+            const defaultDomain = config.adminDomain();
+            const alertsFrom = `no-reply@${defaultDomain}`;

-        if (!safe.fs.writeFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/mail.ini'),
-            `mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_server_name=${mailFqdn}\n\n`, 'utf8')) {
-            return callback(new Error('Could not create mail var file:' + safe.error.message));
-        }
+            const alertsTo = config.provider() === 'caas' ? [ 'support@cloudron.io' ] : [ ];
+            alertsTo.concat(error ? [] : owner.email).join(','); // owner may not exist yet

-        // enable_outbound makes plugin forward email for relayed mail. non-relayed mail always hits LMTP plugin first
-        if (!safe.fs.writeFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/smtp_forward.ini'), 'enable_outbound=false\ndomain_selector=mail_from\n', 'utf8')) {
-            return callback(new Error('Could not create smtp forward file:' + safe.error.message));
-        }
+            const mailOutDomains = mailDomains.map(function (d) { return d.domain; }).join(',');
+            const mailInDomains = mailDomains.filter(function (d) { return d.enabled; }).map(function (d) { return d.domain; }).join(',');

-        // create sections for per-domain configuration
-        mailDomains.forEach(function (domain) {
-            const catchAll = domain.catchAll.map(function (c) { return `${c}@${domain.domain}`; }).join(',');
-            const mailFromValidation = domain.mailFromValidation;
-
-            if (!safe.fs.appendFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/mail.ini'),
-                `[${domain.domain}]\ncatch_all=${catchAll}\nmail_from_validation=${mailFromValidation}\n\n`, 'utf8')) {
+            if (!safe.fs.writeFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/mail.ini'),
+                `mail_in_domains=${mailInDomains}\nmail_out_domains=${mailOutDomains}\nmail_default_domain=${defaultDomain}\nmail_server_name=${mailFqdn}\nalerts_from=${alertsFrom}\nalerts_to=${alertsTo}\n\n`, 'utf8')) {
                return callback(new Error('Could not create mail var file:' + safe.error.message));
            }

-            const relay = domain.relay;
-
-            const enableRelay = relay.provider !== 'cloudron-smtp' && relay.provider !== 'noop',
-                host = relay.host || '',
-                port = relay.port || 25,
-                authType = relay.username ? 'plain' : '',
-                username = relay.username || '',
-                password = relay.password || '';
-
-            if (!enableRelay) return;
-
-            if (!safe.fs.appendFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
-                `[${domain.domain}]\nenable_outbound=true\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=${authType}\nauth_user=${username}\nauth_pass=${password}\n\n`, 'utf8')) {
-                return callback(new Error('Could not create mail var file:' + safe.error.message));
+            // enable_outbound makes plugin forward email for relayed mail. non-relayed mail always hits LMTP plugin first
+            if (!safe.fs.writeFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/smtp_forward.ini'), 'enable_outbound=false\ndomain_selector=mail_from\n', 'utf8')) {
+                return callback(new Error('Could not create smtp forward file:' + safe.error.message));
            }
+
+            // create sections for per-domain configuration
+            mailDomains.forEach(function (domain) {
+                const catchAll = domain.catchAll.map(function (c) { return `${c}@${domain.domain}`; }).join(',');
+                const mailFromValidation = domain.mailFromValidation;
+
+                if (!safe.fs.appendFileSync(path.join(paths.ADDON_CONFIG_DIR, 'mail/mail.ini'),
+                    `[${domain.domain}]\ncatch_all=${catchAll}\nmail_from_validation=${mailFromValidation}\n\n`, 'utf8')) {
+                    return callback(new Error('Could not create mail var file:' + safe.error.message));
+                }
+
+                const relay = domain.relay;
+
+                const enableRelay = relay.provider !== 'cloudron-smtp',
+                    host = relay.host || '',
+                    port = relay.port || 25,
+                    username = relay.username || '',
+                    password = relay.password || '';
+
+                if (!enableRelay) return;
+
+                if (!safe.fs.appendFileSync(paths.ADDON_CONFIG_DIR + '/mail/smtp_forward.ini',
+                    `[${domain.domain}]\nenable_outbound=true\nhost=${host}\nport=${port}\nenable_tls=true\nauth_type=plain\nauth_user=${username}\nauth_pass=${password}\n\n`, 'utf8')) {
+                    return callback(new Error('Could not create mail var file:' + safe.error.message));
+                }
+            });
+
+            callback(null, mailInDomains.length !== 0 /* allowInbound */);
        });
-
-        callback(null, mailInDomains.length !== 0 /* allowInbound */);
    });
 }

-function configureMail(mailFqdn, mailDomain, callback) {
-    assert.strictEqual(typeof mailFqdn, 'string');
-    assert.strictEqual(typeof mailDomain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
+function restartMail(callback) {
    // mail (note: 2525 is hardcoded in mail container and app use this port)
    // MAIL_SERVER_NAME is the hostname of the mailserver i.e server uses these certs
    // MAIL_DOMAIN is the domain for which this server is relaying mails
    // mail container uses /app/data for backed up data and /run for restart-able data

+    if (process.env.BOX_ENV === 'test' && !process.env.TEST_CREATE_INFRA) return callback();
+
    const tag = infra.images.mail.tag;
    const memoryLimit = 4 * 256;
-    const cloudronToken = hat(8 * 128), relayToken = hat(8 * 128);
+    const cloudronToken = hat(8 * 128);

-    reverseProxy.getCertificate(mailFqdn, mailDomain, function (error, bundle) {
+    // admin and mail share the same certificate
+    reverseProxy.getCertificate({ fqdn: config.adminFqdn(), domain: config.adminDomain() }, function (error, bundle) {
        if (error) return callback(error);

        // the setup script copies dhparams.pem to /addons/mail
@@ -655,7 +569,7 @@ function configureMail(mailFqdn, mailDomain, callback) {
        shell.exec('startMail', 'docker rm -f mail || true', function (error) {
            if (error) return callback(error);

-            createMailConfig(mailFqdn, function (error, allowInbound) {
+            createMailConfig(function (error, allowInbound) {
                if (error) return callback(error);

                var ports = allowInbound ? '-p 587:2525 -p 993:9993 -p 4190:4190 -p 25:2525' : '';
@@ -672,7 +586,6 @@ function configureMail(mailFqdn, mailDomain, callback) {
                            --dns 172.18.0.1 \
                            --dns-search=. \
                            -e CLOUDRON_MAIL_TOKEN="${cloudronToken}" \
-                            -e CLOUDRON_RELAY_TOKEN="${relayToken}" \
                            -v "${paths.MAIL_DATA_DIR}:/app/data" \
                            -v "${paths.PLATFORM_DATA_DIR}/addons/mail:/etc/mail" \
                            ${ports} \
@@ -686,15 +599,6 @@ function configureMail(mailFqdn, mailDomain, callback) {
    });
 }

-function restartMail(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    if (process.env.BOX_ENV === 'test' && !process.env.TEST_CREATE_INFRA) return callback();
-
-    debug(`restartMail: restarting mail container with ${config.mailFqdn()} ${config.adminDomain()}`);
-    configureMail(config.mailFqdn(), config.adminDomain(), callback);
-}
-
 function restartMailIfActivated(callback) {
    assert.strictEqual(typeof callback, 'function');

@@ -709,13 +613,6 @@ function restartMailIfActivated(callback) {
    });
 }

-function handleCertChanged(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    debug('handleCertChanged: will restart if activated');
-    restartMailIfActivated(callback);
-}
-
 function getDomain(domain, callback) {
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');
@@ -739,9 +636,8 @@ function getDomains(callback) {
 }

 // https://agari.zendesk.com/hc/en-us/articles/202952749-How-long-can-my-SPF-record-be-
-function txtRecordsWithSpf(domain, mailFqdn, callback) {
+function txtRecordsWithSpf(domain, callback) {
    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof mailFqdn, 'string');
    assert.strictEqual(typeof callback, 'function');

    domains.getDnsRecords('', domain, 'TXT', function (error, txtRecords) {
@@ -756,17 +652,17 @@ function txtRecordsWithSpf(domain, mailFqdn, callback) {
            if (matches === null) continue;

            // this won't work if the entry is arbitrarily "split" across quoted strings
-            validSpf = txtRecords[i].indexOf('a:' + mailFqdn) !== -1;
+            validSpf = txtRecords[i].indexOf('a:' + config.mailFqdn()) !== -1;
            break; // there can only be one SPF record
        }

        if (validSpf) return callback(null, null);

        if (!matches) { // no spf record was found, create one
-            txtRecords.push('"v=spf1 a:' + mailFqdn + ' ~all"');
+            txtRecords.push('"v=spf1 a:' + config.mailFqdn() + ' ~all"');
            debug('txtRecordsWithSpf: adding txt record');
        } else { // just add ourself
-            txtRecords[i] = matches[1] + ' a:' + mailFqdn + txtRecords[i].slice(matches[1].length);
+            txtRecords[i] = matches[1] + ' a:' + config.mailFqdn() + txtRecords[i].slice(matches[1].length);
            debug('txtRecordsWithSpf: inserting txt record');
        }

@@ -774,10 +670,9 @@ function txtRecordsWithSpf(domain, mailFqdn, callback) {
    });
 }

-function ensureDkimKeySync(mailDomain) {
-    assert.strictEqual(typeof mailDomain, 'object');
+function ensureDkimKeySync(domain) {
+    assert.strictEqual(typeof domain, 'string');

-    const domain = mailDomain.domain;
    const dkimPath = path.join(paths.MAIL_DATA_DIR, `dkim/${domain}`);
    const dkimPrivateKeyFile = path.join(dkimPath, 'private');
    const dkimPublicKeyFile = path.join(dkimPath, 'public');
@@ -800,10 +695,7 @@ function ensureDkimKeySync(mailDomain) {
    if (!safe.child_process.execSync('openssl genrsa -out ' + dkimPrivateKeyFile + ' 1024')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
    if (!safe.child_process.execSync('openssl rsa -in ' + dkimPrivateKeyFile + ' -out ' + dkimPublicKeyFile + ' -pubout -outform PEM')) return new MailError(MailError.INTERNAL_ERROR, safe.error);

-    if (!safe.fs.writeFileSync(dkimSelectorFile, mailDomain.dkimSelector, 'utf8')) return new MailError(MailError.INTERNAL_ERROR, safe.error);
-
-    // if the 'yellowtent' user of OS and the 'cloudron' user of mail container don't match, the keys become inaccessible by mail code
-    if (!safe.fs.chmodSync(dkimPrivateKeyFile, 0o644)) return new MailError(MailError.INTERNAL_ERROR, safe.error);
+    if (!safe.fs.writeFileSync(dkimSelectorFile, config.dkimSelector(), 'utf8')) return new MailError(MailError.INTERNAL_ERROR, safe.error);

    return null;
 }
@@ -827,18 +719,15 @@ function readDkimPublicKeySync(domain) {
    return publicKey;
 }

-function upsertDnsRecords(domain, mailFqdn, callback) {
+function setDnsRecords(domain, callback) {
    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof mailFqdn, 'string');
    assert.strictEqual(typeof callback, 'function');

-    debug(`upsertDnsRecords: updating mail dns records of domain ${domain} and mail fqdn ${mailFqdn}`);
-
-    maildb.get(domain, function (error, mailDomain) {
+    maildb.get(domain, function (error, result) {
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));

-        error = ensureDkimKeySync(mailDomain);
+        error = ensureDkimKeySync(domain);
        if (error) return callback(error);

        if (process.env.BOX_ENV === 'test') return callback();
@@ -847,31 +736,33 @@ function upsertDnsRecords(domain, mailFqdn, callback) {
        if (!dkimKey) return callback(new MailError(MailError.INTERNAL_ERROR, new Error('Failed to read dkim public key')));

        // t=s limits the domainkey to this domain and not it's subdomains
-        var dkimRecord = { subdomain: `${mailDomain.dkimSelector}._domainkey`, domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };
+        var dkimRecord = { subdomain: config.dkimSelector() + '._domainkey', domain: domain, type: 'TXT', values: [ '"v=DKIM1; t=s; p=' + dkimKey + '"' ] };

        var records = [ ];
        records.push(dkimRecord);
-        if (mailDomain.enabled) {
+        if (result.enabled) {
            records.push({ subdomain: '_dmarc', domain: domain, type: 'TXT', values: [ '"v=DMARC1; p=reject; pct=100"' ] });
-            records.push({ subdomain: '', domain: domain, type: 'MX', values: [ '10 ' + mailFqdn + '.' ] });
+            records.push({ subdomain: '', domain: domain, type: 'MX', values: [ '10 ' + config.mailFqdn() + '.' ] });
        }

-        txtRecordsWithSpf(domain, mailFqdn, function (error, txtRecords) {
+        debug('setDnsRecords: %j', records);
+
+        txtRecordsWithSpf(domain, function (error, txtRecords) {
            if (error) return callback(error);

            if (txtRecords) records.push({ subdomain: '', domain: domain, type: 'TXT', values: txtRecords });

-            debug('upsertDnsRecords: will update %j', records);
+            debug('setDnsRecords: will update %j', records);

            async.mapSeries(records, function (record, iteratorCallback) {
                domains.upsertDnsRecords(record.subdomain, record.domain, record.type, record.values, iteratorCallback);
            }, function (error, changeIds) {
                if (error) {
-                    debug(`upsertDnsRecords: failed to update: ${error}`);
+                    debug(`setDnsRecords: failed to update: ${error}`);
                    return callback(new MailError(MailError.EXTERNAL_ERROR, error.message));
                }

-                debug('upsertDnsRecords: records %j added with changeIds %j', records, changeIds);
+                debug('setDnsRecords: records %j added with changeIds %j', records, changeIds);

                callback(null);
            });
@@ -879,45 +770,17 @@ function upsertDnsRecords(domain, mailFqdn, callback) {
    });
 }

-function setDnsRecords(domain, callback) {
-    assert.strictEqual(typeof domain, 'string');
-    assert.strictEqual(typeof callback, 'function');
-
-    upsertDnsRecords(domain, config.mailFqdn(), callback);
-}
-
-function onMailFqdnChanged(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    const mailFqdn = config.mailFqdn(),
-        mailDomain = config.adminDomain();
-
-    domains.getAll(function (error, allDomains) {
-        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-        async.eachOfSeries(allDomains, function (domainObject, idx, iteratorDone) {
-            upsertDnsRecords(domainObject.domain, mailFqdn, iteratorDone);
-        }, function (error) {
-            if (error) return callback(new MailError(MailError.EXTERNAL_ERROR, error.message));
-
-            configureMail(mailFqdn, mailDomain, callback);
-        });
-    });
-}
-
 function addDomain(domain, callback) {
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof callback, 'function');

-    const dkimSelector = domain === config.adminDomain() ? 'cloudron' : ('cloudron-' + config.adminDomain().replace(/\./g, ''));
-
-    maildb.add(domain, { dkimSelector }, function (error) {
+    maildb.add(domain, function (error) {
        if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'Domain already exists'));
        if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'No such domain'));
        if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));

        async.series([
-            upsertDnsRecords.bind(null, domain, config.mailFqdn()), // do this first to ensure DKIM keys
+            setDnsRecords.bind(null, domain), // do this first to ensure DKIM keys
            restartMailIfActivated
        ], NOOP_CALLBACK); // do these asynchronously

@@ -952,16 +815,6 @@ function clearDomains(callback) {
    });
 }

-// remove all fields that should never be sent out via REST API
-function removePrivateFields(domain) {
-    let result = _.pick(domain, 'domain', 'enabled', 'mailFromValidation', 'catchAll', 'relay');
-    if (result.relay.provider !== 'cloudron-smtp') {
-        if (result.relay.username === result.relay.password) result.relay.username = constants.SECRET_PLACEHOLDER;
-        result.relay.password = constants.SECRET_PLACEHOLDER;
-    }
-    return result;
-}
-
 function setMailFromValidation(domain, enabled, callback) {
    assert.strictEqual(typeof domain, 'string');
    assert.strictEqual(typeof enabled, 'boolean');
@@ -997,26 +850,16 @@ function setMailRelay(domain, relay, callback) {
    assert.strictEqual(typeof relay, 'object');
    assert.strictEqual(typeof callback, 'function');

-    getDomain(domain, function (error, result) {
+    verifyRelay(relay, function (error) {
        if (error) return callback(error);

-        // inject current username/password
-        if (result.relay.provider === relay.provider) {
-            if (relay.username === constants.SECRET_PLACEHOLDER) relay.username = result.relay.username;
-            if (relay.password === constants.SECRET_PLACEHOLDER) relay.password = result.relay.password;
-        }
+        maildb.update(domain, { relay: relay }, function (error) {
+            if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
+            if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));

-        verifyRelay(relay, function (error) {
-            if (error) return callback(error);
+            restartMail(NOOP_CALLBACK);

-            maildb.update(domain, { relay: relay }, function (error) {
-                if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND));
-                if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
-
-                restartMail(NOOP_CALLBACK);
-
-                callback(null);
-            });
+            callback(null);
        });
    });
 }
@@ -1047,11 +890,9 @@ function sendTestMail(domain, to, callback) {
    getDomain(domain, function (error, result) {
        if (error) return callback(error);

-        mailer.sendTestMail(result.domain, to, function (error) {
-            if (error) return callback(new MailError(MailError.EXTERNAL_ERROR, error.message));
+        mailer.sendTestMail(result.domain, to);

-            callback();
-        });
+        callback();
    });
 }

@@ -7,9 +7,9 @@ The application '<%= title %>' installed at <%= appFqdn %> is not responding.
 This is most likely a problem in the application.

 To resolve this, you can try the following:
-* Restart the app by opening the app's web terminal - https://cloudron.io/documentation/apps/#web-terminal
-* Restore the app to the latest backup - https://cloudron.io/documentation/backups/#restoring-an-app
-* Contact us via <%= supportEmail %> or https://forum.cloudron.io
+* Restart the app in the app configuration dialog
+* Restore the app to the latest backup
+* Contact us via support@cloudron.io or https://forum.cloudron.io


 Powered by https://cloudron.io
@@ -1,14 +0,0 @@
-<%if (format === 'text') { %>
-
-Dear Cloudron Admin,
-
-The application '<%= title %>' installed at <%= appFqdn %> is back online
-and responding to health checks.
-
-Powered by https://cloudron.io
-
-Sent at: <%= new Date().toUTCString() %>
-
-<% } else { %>
-
-<% } %>
@@ -0,0 +1,49 @@
+<%if (format === 'text') { %>
+
+Dear Cloudron Admin,
+
+A new version <%= updateInfo.manifest.version %> of the app '<%= app.manifest.title %>' installed at <%= app.fqdn %> is available!
+
+Changes:
+<%= updateInfo.manifest.changelog %>
+
+<% if (!hasSubscription) { -%>
+*Keep your Cloudron automatically up-to-date and secure by upgrading to a paid plan at* <%= webadminUrl %>/#/settings
+<% } -%>
+
+Powered by https://cloudron.io
+
+Sent at: <%= new Date().toUTCString() %>
+
+<% } else { %>
+
+    <center>
+
+    <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
+
+    <h3>Dear <%= cloudronName %> Admin,</h3>
+
+    <div style="width: 650px; text-align: left;">
+        <p>
+            A new version <%= updateInfo.manifest.version %> of the app '<%= app.manifest.title %>' installed at <%= app.fqdn %> is available!
+        </p>
+
+        <h5>Changelog:</h5>
+        <%- changelogHTML %>
+
+        <br/>
+
+        <% if (!hasSubscription) { %>
+        <p>Keep your Cloudron automatically up-to-date and secure by upgrading to a <a href="<%= webadminUrl %>/#/settings">paid plan</a>.</p>
+        <% } %>
+
+        <br/>
+    </div>
+
+    <div style="font-size: 10px; color: #333333; background: #ffffff;">
+        Powered by <a href="https://cloudron.io">Cloudron</a>.
+    </div>
+
+    </center>
+
+<% } %>
@@ -1,40 +0,0 @@
-<%if (format === 'text') { %>
-
-Dear Cloudron Admin,
-
-The application '<%= title %>' installed at <%= appFqdn %> was updated to app package version <%= version %>.
-
-Changes:
-<%= changelog %>
-
-Powered by https://cloudron.io
-
-Sent at: <%= new Date().toUTCString() %>
-
-<% } else { %>
-
-    <center>
-
-        <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
-
-        <h3>Dear <%= cloudronName %> Admin,</h3>
-
-        <br/>
-
-        <div style="width: 650px; text-align: left;">
-            The application '<%= title %>' installed at <%= appFqdn %> was updated to app package version <%= version %>.
-
-            <h5>Changelog:</h5>
-            <%- changelogHTML %>
-        </div>
-
-        <br/>
-        <br/>
-
-        <div style="font-size: 10px; color: #333333; background: #ffffff;">
-            Powered by <a href="https://cloudron.io">Cloudron</a>.<br/>
-            Sent at: <%= new Date().toUTCString() %>
-        </div>
-
-    </center>
-<% } %>
@@ -1,63 +0,0 @@
-<%if (format === 'text') { %>
-
-Dear Cloudron Admin,
-
-<% for (var i = 0; i < apps.length; i++) { -%>
-A new version <%= apps[i].updateInfo.manifest.version %> of the app '<%= apps[i].app.manifest.title %>' installed at <%= apps[i].app.fqdn %> is available.
-
-Changes:
-<%= apps[i].updateInfo.manifest.changelog %>
-
-<% } -%>
-
-<% if (!hasSubscription) { -%>
-*Keep your Cloudron automatically up-to-date and secure by upgrading to a paid plan at* <%= webadminUrl %>/#/settings
-<% } else { -%>
-Update now at <%= webadminUrl %>
-<% } -%>
-
-Powered by https://cloudron.io
-
-Sent at: <%= new Date().toUTCString() %>
-
-<% } else { %>
-
-    <center>
-
-    <img src="<%= cloudronAvatarUrl %>" width="128px" height="128px"/>
-
-    <h3>Dear <%= cloudronName %> Admin,</h3>
-
-    <br/>
-
-    <div style="width: 650px; text-align: left;">
-<% for (var i = 0; i < apps.length; i++) { -%>
-        <p>
-            A new version <%= apps[i].updateInfo.manifest.version %> of the app '<%= apps[i].app.manifest.title %>' installed at <a href="https://<%= apps[i].app.fqdn %>"><%= apps[i].app.fqdn %></a> is available.
-        </p>
-
-        <h5>Changelog:</h5>
-        <%- apps[i].changelogHTML %>
-
-        <br/>
-<% } -%>
-
-<% if (!hasSubscription) { -%>
-        <p>Keep your Cloudron automatically up-to-date and secure by upgrading to a <a href="<%= webadminUrl %>/#/settings">paid plan</a>.</p>
-<% } else { -%>
-        <p>
-            <br/>
-            <center><a href="<%= webadminUrl %>">Update now</a></center>
-            <br/>
-        </p>
-<% } -%>
-    </div>
-
-    <div style="font-size: 10px; color: #333333; background: #ffffff;">
-        Powered by <a href="https://cloudron.io">Cloudron</a>.<br/>
-        Sent at: <%= new Date().toUTCString() %>
-    </div>
-
-    </center>
-
-<% } %>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Girish Ramakrishnan	fd723cf7eb	3.4.3 changes	2018-12-16 21:07:53 -08:00
Girish Ramakrishnan	f2c8102a6a	track last oom time using a global variable because it was a local variable, we were just sending out oom mails like crazy also, fixes an issue that if docker.getEvents gets stuck because docker does not respond then we do not do any health monitoring. i guess this can happen if the docker API gets stuck. (cherry picked from commit `a536e9fc4b`)	2018-12-16 21:07:14 -08:00
Girish Ramakrishnan	6589ba0988	Add LDAP_MAILBOXES_BASE_DN this got removed by mistake in the email refactor assuming this was unused (but it is used by sogo)	2018-12-16 18:44:46 -08:00
Girish Ramakrishnan	2d7f0c3ebe	3.4.2 changes	2018-12-15 09:28:18 -08:00
Girish Ramakrishnan	a66bc7192d	3.4.1 changes	2018-12-14 17:35:54 -08:00