Merge branch 'master' into add_github_gitlab_docs

Author: tdgroot

.github/workflows/deploy.yaml

@@ -37,6 +37,7 @@ jobs:
         with:
           name: deployment-build
           path: build/build.tgz
+          retention-days: 5
 
   deploy_acceptance:
     needs: build

docs/about-hypernode/billing/billing-faq-for-the-service-panel.md

@@ -44,10 +44,6 @@ In short, the changes in legislation make the invoicing, administration and fili
 
 The rules apply to individuals, not to companies. If possible, we therefore advise you to use your company name and company details or if you have a Dutch address, use them.
 
-## How Can I Edit My Account Details?
-
-For more information about editing your account details please see [this article](../../services/service-panel/how-to-change-your-customer-details-and-other-questions.md).
-
 ## What Do I Pay Extra Costs For?
 
 At Hypernode you pay for a hosting plan, domain registration and any add-ons (such as SSL). For more information, see the product pages for Hypernode hosting and / or Add-ons

docs/about-hypernode/support/emergency-support-outside-office-hours.md

@@ -17,7 +17,7 @@ Are you experiencing a business-critical disruption on your web shop? You can ac
 
 ## During Office Hours
 
-During office hours (from 8:00 AM – 6 PM CEST) you can request Hypernode Emergency Support by email (support@hypernode.com), chat via the Control Panel and / or telephone (+31 (0)20 521 6226).
+During office hours (from 9:00 AM – 6 PM CEST) you can request Hypernode Emergency Support by email (support@hypernode.com) or telephone (+31 (0)20 521 6226).
 
 **If you send in a request during office hours, your request will be picked up by our Support Team free of charge. This also means the steps below do not apply.**
 

docs/hypernode-platform/tools/hypernode-brancher.md

@@ -100,13 +100,22 @@ The appname specified in the request url is the appname on which the Brancher no
 
 Once the Brancher node becomes available, you can control it via the `/v2/app/<appname>-eph123456` endpoint just like a regular Hypernode.
 
-### Hypernode-deploy
+To specify `labels` and/or `clear_services` in the API call, you can set the header `Content-Type: application/json` with a content body like:
 
-Hypernode-deploy is our recommended way of deploying your webshop to Hypernode. which makes it easier for you to manage your application’s codebase. This platform is fully integrated with Hypernode Brancher, which makes it a breeze for you to try out upgrade scenarios, or pushes to the Staging environment.
+```json
+{
+  "labels": ["some_label"],
+  "clear_services": ["cron", "elasticsearch", "mysql", "supervisor"]
+}
+```
+
+### Hypernode Deploy
 
-Once you set up your Hypernode to make use of Hypernode-deploy, you can run your tests against a Brancher node with just a single command. This will then run against your fresh Branched version of the Node, making sure that your tests are passing before deploying to production.
+Hypernode Deploy is our recommended way of deploying your webshop to Hypernode. which makes it easier for you to manage your application’s codebase. This platform is fully integrated with Hypernode Brancher, which makes it a breeze for you to try out upgrade scenarios, or pushes to the Staging environment.
 
-You can use Brancher in your Hypernode-deploy deploy.php file like this:
+Once you set up your Hypernode to make use of Hypernode Deploy, you can run your tests against a Brancher node with just a single command. This will then run against your fresh Branched version of the Node, making sure that your tests are passing before deploying to production.
+
+You can use Brancher in your Hypernode Deploy `deploy.php` file like this:
 
 ```php
 <?php
@@ -120,51 +129,76 @@ $testStage = $configuration->addStage('test', 'example.com');
 // We use an automatically created Brancher node based on the parent for the 'test' stage.
 // In your testing pipeline, you can simply use the 'test' stage to push changes to the Brancher server,
 // and run your tests. Cancel it when your tests fail or after your tests pass to incur minimal costs.
-$testStage->addBrancherServer('appname')
-    ->setSettings(['cron_enabled' => false, 'supervisor_enabled' => false]);
+$testStage->addBrancherServer('example')
+    ->setLabels(['stage=test'])
+    ->setSettings(['clear_services' => ['cron', 'supervisor']);
 
 return $configuration;
 ```
 
 This will automatically create a Brancher node based on the parent Hypernode and push to it, allowing you to test the changes before making them on the production Hypernode.
 
+In this example, we also set the label `stage=test` and the setting `clear_services` with value `cron` and `supervisor`, which means that the `cron` and `supervisor` configurations found on `example` will not be actively present on the Brancher instance.
+
 ### Hypernode-systemctl brancher
 
-You can use the command hypernode-systemctl brancher tool to quickly interact with the Hypernode API in a validated and controlled manner. Creating a Brancher node goes like this:
+You can use the command hypernode-systemctl brancher tool to quickly interact with the Hypernode API in a validated and controlled manner.
+
+```{note}
+There's an alias `hypernode-brancher` for the command `hypernode-systemctl brancher`, this might save you some keystrokes :).
+```
+
+#### Creating a Brancher node
 
 ```console
 $ hypernode-systemctl brancher --create
-Brancher App created for app 'testalex'. See hypernode-systemctl brancher --list for the progress
-app_name: testalex-eph123456
-parent: testalex
-Host: testalex-eph123456.hypernode.io
+Brancher App created for app 'example'. See hypernode-systemctl brancher --list for the progress
+app_name: example-eph123456
+parent: example
+Host: example-eph123456.hypernode.io
+Labels: None
+Services with data to be cleared: cron
 IP: will become available in a couple of minutes
 ```
 
-You can then list the available Brancher nodes:
+In the above example you see the details of the created Brancher instance. The output also contains the given labels and services to be cleared, which have the respective defaults of `None` and `cron`.
+
+To apply one or more label(s) to the Brancher instance, you can specify one or more `--label` options when creating the instance:
+
+```console
+$ hypernode-systemctl brancher --create --label my_brancher_instance --label 'user=johndoe'
+```
+
+To override the services that are cleared by default, pass the `--clear-services` option:
+
+```console
+$ hypernode-systemctl brancher --create --clear-services cron elasticsearch mysql supervisor
+```
+
+#### Listing available Brancher nodes
 
 ```console
 $ hypernode-systemctl brancher --list
 +--------------------+----------------+---------------------------------+---------+
 |        Name        |       IP       |               Host              | Minutes |
 +--------------------+----------------+---------------------------------+---------+
-| testalex-ephjopv59 |  83.217.88.80  | testalex-ephjopv59.hypernode.io |   4592  |
-| testalex-ephw4zcjr | 185.111.198.18 | testalex-ephw4zcjr.hypernode.io |   4345  |
-| testalex-ephsbuos6 | 37.72.165.123  | testalex-ephsbuos6.hypernode.io |   1866  |
+| example-ephjopv59  |  83.217.88.80  | example-ephjopv59.hypernode.io  |   4592  |
+| example-ephw4zcjr  | 185.111.198.18 | example-ephw4zcjr.hypernode.io  |   4345  |
+| example-ephsbuos6  | 37.72.165.123  | example-ephsbuos6.hypernode.io  |   1866  |
 +--------------------+----------------+---------------------------------+---------+
 ```
 
-Finally, you can delete it:
+#### Deleting a brancher node
 
 ```console
 $ hypernode-systemctl brancher --delete
-Brancher App 'testalex-eph123456' deleted. See hypernode-systemctl brancher --list for the list of remaining brancher apps.
+Brancher App 'example-eph123456' deleted. See hypernode-systemctl brancher --list for the list of remaining brancher apps.
 ```
 
 And with some creativity you can come up with a one-liner to remove all active Brancher nodes:
 
 ```console
 $ hypernode-systemctl brancher --list | awk '{print$2}' | grep -eph | xargs -n1 hypernode-systemctl brancher --delete
-Brancher App 'testalex-eph123456' deleted. See hypernode-systemctl brancher --list for the list of remaining brancher apps.
-Brancher App 'testalex-eph234567' deleted. See hypernode-systemctl brancher --list for the list of remaining brancher apps.
+Brancher App 'example-eph123456' deleted. See hypernode-systemctl brancher --list for the list of remaining brancher apps.
+Brancher App 'example-eph234567' deleted. See hypernode-systemctl brancher --list for the list of remaining brancher apps.
 ```

docs/services/control-panel/how-to-transfer-ownership-of-a-hypernode-in-the-control-panel.md

@@ -12,17 +12,52 @@ redirect_from:
 
 # How to transfer ownership of a Hypernode in the Control Panel
 
-You can transfer ownership of a Hypernode. This means a different account will be charged for the Hypernode subscription. You also have the option to retain admin access after the transfer.
+You can easily transfer ownership of a Hypernode. This means a different account will be charged for the Hypernode subscription. You also have the option to retain admin access after the transfer.
 
-We will remove this Hypernode from all teams it belongs to and we will remove all SSH keys installed on this Hypernode to revoke access, excluding your admin access if you choose to retain this.
+*Note that the new owner is required to have a valid payment method to accept the transfer, they have the option to do so at this step in case they do not have a valid payment method on their account.*
+
+## Option 1: I want to transfer a single Hypernode to a new owner
 
 To transfer ownership of a Hypernode you need to follow these steps:
 
 1. Log into the Control Panel.
-1. Choose  **Hypernodes** > **Transfer Ownership**.
+1. Choose  **Hypernodes** > Select the Hypernode you want to transfer and click **Transfer Ownership**.
+1. Tick the boxes if you also want to transfer SSL and linked domains to the new owner (this can not be done afterwards).
 1. Enter the email address of the new owner and choose whether or not to retain access as admin after the transfer.
+1. The new owner will receive an email to accept the transfer. The new owner will need an account with a valid payment method, the email will include the link to create an account.
 1. The new owner receives a confirmation email and can then accept the transfer.
+1. We will remove this Hypernode from all teams it belongs to and we will remove all SSH keys installed on this Hypernode to revoke access, excluding your admin access if you choose to retain this.
 
-*Note that the new owner is required to have a valid payment method to accept the transfer, they have the option to do so at this step in case they do not have a valid payment method on their account.*
+## Option 2: I want to transfer my account to a new owner
+
+If it is desired to transfer the entire account, it is important to determine in advance whether the new owner is allowed to view, for example, previous invoices or log files.
+
+### Option 2.1: The new owner is allowed to see the current account details (invoices, logs etc)
+
+In this case, we advise you to change the name and e-mail address in your customer account and update the company details in the billing portal. Below you can find the steps that need to be taken:
+
+1. Log in to the Control Panel.
+1. Click on your username in the top right.
+1. Select Billing portal from the menu.
+1. Click Billing & Shipping Addresses to edit your billing info.
+1. After that, please click on your username in the top right in the Control Panel again
+1. Select Account Settings from the menu.
+1. Change the required information on this page
+1. After this you are done and the account is transferred.
+1. We do advise you to let the new owner change (if applicable) the Control Panel password after this change.
+
+### Option 2.2: The new owner is NOT allowed to see the correct account details (invoices, logs etc)
+
+In this case you need to transfer the Hypernode(s) individually to the new owner.
+
+To transfer ownership of a Hypernode you need to follow these steps:
+
+1. Log into the Control Panel.
+1. Choose  **Hypernodes** > Select the Hypernode you want to transfer and click **Transfer Ownership**.
+1. Tick the boxes if you also want to transfer SSL and linked domains to the new owner (this can not be done afterwards).
+1. Enter the email address of the new owner and choose whether or not to retain access as admin after the transfer.
+1. The new owner will receive an email to accept the transfer. The new owner will need an account with a valid payment method, the email will include the link to create an account.
+1. The new owner receives a confirmation email and can then accept the transfer.
+1. We will remove this Hypernode from all teams it belongs to and we will remove all SSH keys installed on this Hypernode to revoke access, excluding your admin access if you choose to retain this.
 
 ![](_res/rVwmoW-6vgh53FOxQIwlxas2TDVysOiGtA.png)