Merge pull request platformsh#3466 from platformsh/vendorize-dev-section

Vendorize Development section

shared/data/regions.yaml

@@ -1,179 +1,179 @@
 europe:
     eu:
         name: Ireland (eu)
-        label: eu.platform.sh
+        label: eu
         provider: AWS
         available: true
         outbound_ips: 
             - "54.72.94.105"
             - "54.76.137.67"
             - "54.76.137.94"
-        inbound_location: gw.eu.platformsh.site
+        inbound_location: gw.eu
         inbound_ips:
             - "54.76.137.79"
             - "54.76.136.188"
             - "54.76.137.151"
     eu-2:
         name: Ireland (eu-2)
-        label: eu-2.platform.sh
+        label: eu-2
         provider: AWS
         available: false
         outbound_ips: 
             - "52.208.123.9"
             - "52.214.63.84"
             - "52.30.200.164"
-        inbound_location: gw.eu-2.platformsh.site
+        inbound_location: gw.eu-2
         inbound_ips:
             - "34.248.104.12"
             - "34.241.191.143"
             - "52.210.208.94"
     eu-4:
         name: Ireland (eu-4)
-        label: eu-4.platform.sh
+        label: eu-4
         provider: AWS
         available: false
         outbound_ips: 
             - "18.200.158.188"
             - "18.200.157.200"
             - "18.200.184.206"
-        inbound_location: gw.eu-4.platformsh.site
+        inbound_location: gw.eu-4
         inbound_ips:
             - "52.215.88.119"
             - "52.208.179.40"
             - "18.200.179.139"
     eu-5:
         name: Sweden (eu-5)
-        label: eu-5.platform.sh
+        label: eu-5
         provider: AWS
         available: true
         outbound_ips: 
             - "13.48.116.14"
             - "13.51.46.87"
             - "13.48.202.56"
-        inbound_location: gw.eu-5.platformsh.site
+        inbound_location: gw.eu-5
         inbound_ips:
             - "13.51.62.86"
     de-2:
         name: Germany (de-2)
-        label: de-2.platform.sh
+        label: de-2
         provider: Google Cloud Platform
         available: true
         outbound_ips: 
             - "35.246.248.138"
             - "35.246.184.45"
             - "35.242.229.239"
-        inbound_location: gw.de-2.platformsh.site
+        inbound_location: gw.de-2
         inbound_ips:
             - "35.246.248.138"
             - "35.246.184.45"
             - "35.242.229.239"
     fr-1:
         name: France (fr-1)
-        label: fr-1.platform.sh
+        label: fr-1
         provider: Orange
         available: false
         outbound_ips: 
             - "90.84.46.222"
             - "90.84.47.148"
             - "90.84.46.40"
-        inbound_location: gw.fr-1.platformsh.site
+        inbound_location: gw.fr-1
         inbound_ips:
             - "90.84.46.40"
             - "90.84.47.148"
             - "90.84.46.222"
     fr-3:
         name: France (fr-3)
-        label: fr-3.platform.sh
+        label: fr-3
         provider: OVHcloud
         available: true
         outbound_ips: 
             - "135.125.91.125"
             - "135.125.89.47"
             - "135.125.90.255"
-        inbound_location: gw.fr-3.platformsh.site
+        inbound_location: gw.fr-3
         inbound_ips:
             - "94.23.123.122"
     fr-4:
         name: France (fr-4)
-        label: fr-4.platform.sh
+        label: fr-4
         provider: Azure
         available: true
         outbound_ips: 
             - "20.74.41.190"
             - "20.74.41.218"
             - "20.74.42.30"
-        inbound_location: gw.fr-4.platformsh.site
+        inbound_location: gw.fr-4
         inbound_ips:
             - "20.74.41.190"
             - "20.74.41.218"
             - "20.74.42.30"
     uk-1:
         name: United Kingdom (uk-1)
-        label: uk-1.platform.sh
+        label: uk-1
         provider: Google Cloud Platform
         available: true
         outbound_ips: 
             - "35.242.142.110"
             - "35.189.126.202"
             - "35.242.183.249"
-        inbound_location: gw.uk-1.platformsh.site
+        inbound_location: gw.uk-1
         inbound_ips:
             - "35.242.142.110"
             - "35.189.126.202"
             - "35.242.183.249"
 us:
     us:
         name: East (us)
-        label: us.platform.sh
+        label: us
         provider: AWS
         available: true
         outbound_ips: 
             - "54.88.149.31"
             - "54.209.114.37"
             - "54.210.53.51"
-        inbound_location: gw.us.platformsh.site
+        inbound_location: gw.us
         inbound_ips:
             - "54.88.119.241"
             - "18.213.180.11"
             - "54.163.149.158"
     us-2:
         name: East (us-2)
-        label: us-2.platform.sh
+        label: us-2
         provider: AWS
         available: true
         outbound_ips: 
             - "34.238.64.193"
             - "52.4.246.137"
             - "54.157.66.30"
-        inbound_location: gw.us-2.platformsh.site
+        inbound_location: gw.us-2
         inbound_ips:
             - "34.226.46.235"
             - "34.238.11.122"
             - "54.89.106.200"
     us-3:
         name: West (us-3)
-        label: us-3.platform.sh
+        label: us-3
         provider: Azure
         available: true
         outbound_ips: 
             - "52.137.90.183"
             - "52.156.93.30"
             - "51.143.107.76"
-        inbound_location: gw.us-3.platformsh.site
+        inbound_location: gw.us-3
         inbound_ips:
             - "52.137.90.183"
             - "52.156.93.30"
             - "51.143.107.76"
     us-4:
         name: East (us-4)
-        label: us-4.platform.sh
+        label: us-4
         provider: Google Cloud Platform
         available: true
         outbound_ips: 
             - "34.73.189.215"
             - "34.74.8.155"
             - "34.75.104.115"
-        inbound_location: gw.us-4.platformsh.site
+        inbound_location: gw.us-4
         inbound_ips:
             - "34.73.189.215"
             - "34.74.8.155"
@@ -182,43 +182,43 @@ canada:
     ca-1:
         name: Canada (ca-1)
         location_guarantee: false
-        label: ca-1.platform.sh
+        label: ca-1
         provider: AWS
         available: true
         outbound_ips: 
             - "35.182.24.224"
             - "52.60.213.255"
             - "35.182.220.113"
-        inbound_location: gw.ca-1.platformsh.site
+        inbound_location: gw.ca-1
         inbound_ips:
             - "35.182.174.169"
             - "35.182.59.77"
             - "52.60.219.22"
 australia:
     au:
         name: Australia (au)
-        label: au.platform.sh
+        label: au
         provider: AWS
         available: true
         outbound_ips: 
             - "13.55.135.0"
             - "13.54.121.225"
             - "13.55.215.151"
-        inbound_location: gw.au.platformsh.site
+        inbound_location: gw.au
         inbound_ips:
             - "13.54.88.239"
             - "13.55.140.143"
             - "13.54.222.56"
     au-2:
         name: Australia (au-2)
-        label: au-2.platform.sh
+        label: au-2
         provider: Azure
         available: true
         outbound_ips: 
             - "20.92.240.74"
             - "20.191.224.199"
             - "20.92.240.236"
-        inbound_location: gw.au-2.platformsh.site
+        inbound_location: gw.au-2
         inbound_ips:
             - "20.92.240.74"
             - "20.191.224.199"

sites/friday/.yaml

@@ -953,9 +953,10 @@ varnish:
   endpoint: http+stats
   min_disk_size: null
   configuration: |2-
-        vcl: !include
-            type: string
-            path: config.vcl
+        configuration:
+            vcl: !include
+                type: string
+                path: config.vcl
   service_relationships: 'application: ''app:http'''
   name: Varnish
   runtime: false
@@ -979,11 +980,12 @@ vault-kms:
   endpoint: manage_keys
   min_disk_size: 512
   configuration: |2-
-        endpoints:
-            <ENDPOINT_ID>:
-                - policy: <POLICY>
-                  key: <KEY_NAME>
-                  type: <ENDPOINT_TYPE>
+        configuration:
+            endpoints:
+                <ENDPOINT_ID>:
+                    - policy: <POLICY>
+                      key: <KEY_NAME>
+                      type: <ENDPOINT_TYPE>
   name: Vault KMS
   repo_name: vault-kms
   runtime: false

sites/friday/config/_default/config.yaml

@@ -61,6 +61,10 @@ module:
               - "increase-observability/logs/forward-fastly-logs.md"
               - "increase-observability/metrics/dedicated.md"
               - "increase-observability/metrics/dedicated-generation-3.md"
+              - "development/templates.md"
+              - "development/local/docksal.md"
+              - "development/local/lando.md"
+              - "development/deploy-button.md"
               - "domains/cdn/managed-fastly.md"
               - "domains/security/web-application-firewall/fastly.md"
               - "domains/steps/custom-domains-preview-environments.md"

sites/platform/src/add-services/mysql/_index.md

@@ -561,7 +561,7 @@ If not, make a backup or do a database export before importing.
 ## Sanitizing data
 
 To ensure people who review code changes can't access personally identifiable information stored in your database,
-[sanitize your preview environments](../../development/sanitize-db/mariadb.md).
+[sanitize your preview environments](../../development/sanitize-db/_index.md).
 
 ## Replication
 

sites/platform/src/development/email.md

@@ -66,10 +66,16 @@ v=spf1 include:sendgrid.net -all
 
 ## 3. (Optional) Validate your email
 
+{{% version/specific %}}
+<!-- Platform.sh -->
 {{< premium-features/tiered "Enterprise and Elite" >}}
 
 If you're on an Enterprise or Elite plan,
 you can request for DomainKeys Identified Mail (DKIM) to be enabled on your domain.
+<--->
+<!-- Upsun -->
+You can request for DomainKeys Identified Mail (DKIM) to be enabled on your domain.
+{{% /version/specific %}}
 
 DKIM improves your delivery rate as an email sender.
 Learn more about [how DKIM works](https://docs.sendgrid.com/glossary/dkim).

sites/platform/src/development/file-transfer.md

@@ -32,7 +32,7 @@ To do so, run the following command:
 The output is similar to the following:
 
 ```bash
-Mounts on [email protected].platform.sh:
+Mounts on [email protected].{{< vendor/urlraw "host" >}}:
 +-------------------------+----------------------+
 | Mount path              | Definition           |
 +-------------------------+----------------------+

sites/platform/src/development/local/_index.md

@@ -17,21 +17,32 @@ the various dependencies, certificates, and connections your app needs to run.
 
 The **recommended tool** for local development with {{% vendor/name %}} is **[DDEV](./ddev.md)**.
 The integration with DDEV is maintained by {{% vendor/name %}} to ensure it works smoothly.
-Other Docker-based tools are also supported, such as [Docksal](./docksal.md) and [Lando](./lando.md).
 
+{{% version/specific %}}
+<!-- Platform.sh -->
+Other Docker-based tools are also supported, such as [Docksal](./docksal.md) and [Lando](./lando.md).
 If you choose to use a Docker-based tool, follow the steps on its page.
 
+<--->
+<!-- Upsun -->
+If you choose to use DDEV, follow the steps [on its page](./ddev.md).
+{{% /version/specific %}}
 Otherwise, follow these steps to run your app on your computer.
 
 ## Before you begin
 
 You need to have:
-
-- A {{% vendor/name %}} account:
+{{% version/specific %}}
+<!-- Platform.sh -->
+- A {{< vendor/name >}} account:
   new users can sign up for a [free trial account](https://auth.api.platform.sh/register)
-- A working project,
-  either started from a [template](../../development/templates.md) 
-  or with your own code pushed to {{% vendor/name %}}
+
+<--->
+<!-- Upsun -->
+- A {{< vendor/name >}} account:
+  new users can [register here](https://upsun.com/register/)
+{{% /version/specific %}}
+- A working project
 - [Git](https://git-scm.com/downloads)
 - The [{{% vendor/name %}} CLI](../../administration/cli/_index.md)