Skip to content

Commit 397e9a3

Browse files
chadwcarlsonAnouckColsongilzowthomasdiluccioremilejeune2
authored
Upsun GA + Git 26 (#3885)
* Bump versions for GA docs. * Update trial buttons + CTA banners. (#3840) * Remove 64 character Let's Encrypt limitation (#3876) * Revert "Revert instance mounts and temporary alias doc" (#3868) * Document billing (#3812) * Document billing * Add info on calculations * Review explanations on estimates * Small fixes * Other small fixes * Fix copy paste * Apply suggestions from review * Add screenshots * Update formula * Document configurable build resources (#3782) * Document build resources * Add note * Add notes * Apply feedback from review --------- Co-authored-by: chadcarlson <[email protected]> * Update secondary vendor site name (#3841) * Rename secondary vendor site to upsun. * Not found error + timeout. * Update scope. * again. * Update regions.md (#3892) * allow checks & environments for PRs against ga-staging * Add framework section landing page.' (#3894) * Update GS link + wrongly inherited content. (#3897) * [WordPress] review Anouck (#3891) * init commit * adds additional files section * adds locations and mounts sections * corrects issue with the header information formatting * final change sections, adds documentation, community content, blogs sections * spelling, grammatical updates/corrections * Review * Fix description and snippets * Update table and apply suggestions. --------- Co-authored-by: Paul Gilzow <[email protected]> Co-authored-by: chadcarlson <[email protected]> * Add PHP and Python continuous profiling documentation (#3895) * Add PHP and Python continuous profiling documentation * Add CPU support for the node.js cont profiler * Doc review --------- Co-authored-by: Anouck Colson <[email protected]> Co-authored-by: chadcarlson <[email protected]> * [Upsun] Custom backup schedules (#3890) * Draft for the self-service automated-backup configuration * Doc review * Multi-line PATCH calls. --------- Co-authored-by: remi <[email protected]> Co-authored-by: Anouck Colson <[email protected]> Co-authored-by: chadcarlson <[email protected]> * Update teams feature availability for GA/self-service. (#3908) * [Laravel] Resubmit: Adding the "Getting started" guide for Laravel (#3899) * Clone the Symfony Getting Started. The page is done. * Correct typo on get-started * WIP: First version of the laravel getting started guide * First version of the Laravel Get Started Guide * Update sites/friday/src/get-started/stacks/laravel/_index.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/blackfire.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/crons.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/environment-variables.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/faq.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/faq.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/faq.md Co-authored-by: Thomas di Luccio <[email protected]> * Update sites/friday/src/get-started/stacks/laravel/faq.md Co-authored-by: Thomas di Luccio <[email protected]> * Doc review --------- Co-authored-by: Guillaume Moigneu <[email protected]> Co-authored-by: Guillaume Moigneu <[email protected]> Co-authored-by: Thomas di Luccio <[email protected]> Co-authored-by: Anouck Colson <[email protected]> * [Express] Getting started guide (#3904) * Reinstate Express GS guide. * Fix express links. add add-database page. * Doc review --------- Co-authored-by: Anouck Colson <[email protected]> * Restore simplified relationships (updated) (#3881) * Update registry to use service names for relationship names. * add-services/_index.md * add-services/headless-chrome.md * themes/../partials/examples/relationships.html * themes/../partials/examples/servicedefn.html * themes/../shortcodes/endpoint-description.md * themes/../shortcodes/v2connect2app.md * add-services/influxdb.md * Fix usage example indents and comment spacing. * add-services/kafka * add-services/memcached. * Fix double = typo. * add-services/mongodb.md * endpoint-description > oracle-mysql fix * add-services/mysql/_index.md * add-services/mysql/mysql-replication. * add-services/network-storage * add-services/opensearch.md * add-services/postgresql * add-services/rabbitmq.md * add-services/redis * add-services/solr.md * add-services/varnish * Fix random character mistake. * create-apps/_index.md * create-apps/app-reference * guides/drupal/redis. * languages/elixir. * languages/java/migration * languages/lisp. * languages/ruby. * learn/tutorials/restrict-service-access * create-apps/workers. * [guides|get-started/stacks]/symfony/environment-variables * [Next.js] Getting started guide (#3903) * Reinstate Next.js GS guide. * Doc review --------- Co-authored-by: Anouck Colson <[email protected]> * Composable image (#3879) * first draft for composable image on Upsun side (only for now) * report changes to platform folder * some improvement on Upsun composable image * adding multiple runtimes note + NixOs presentation draft * adding note at the beginning of PHP doc page (draft) * adding disclaimer on languages and align P.sh with Upsun composable * removing top level key from Upsun + reformat code + adding TODO block in the HTML * Apply doc review and suggestions from Jerome * missing replacement of built-in image * split codetab for PHP ext and Python to separate section * remaining built-in image * remaining built-in image * Move PHP-specific content and redorder side nav * Remove extra space * PHP extensions update * Update PSH composable image page * Update PSH section index page * Reorder side nav for PSH * Fix numbering * Further review suggestions applied * Fix links. Remove duplicated file on conflict resolution. * Add redirect notes where relevant (for type and extensions). * Add the sticky note option, even though its not yet enabled. * Fix failing 'Check internal links' for platform docs. * Match fixed links on upsun docs. * Fix note. * Fix platform config from using upsun config. * Fix platform file name. * socket_family/protocol for primary runtimes * Update example configuration for PHP runtime config. * Fix links post-merge. * Link checks on builds. * Fix side nav --------- Co-authored-by: Anouck Colson <[email protected]> Co-authored-by: chadcarlson <[email protected]> * [Strapi] Getting started guide (#3905) * Reinstate Strapi GS guide. * Add an add-database page to Strapi section. * Doc review --------- Co-authored-by: Anouck Colson <[email protected]> * [Django + Flask] Getting Started Frameworks section for Upsun (#3816) * WIP: initial changes to the Django stacks page * finishes out the remaining steps, small configuration change * adds flask instructions * corrects indentation between from and to for deploy hook examples * Update sites/friday/src/get-started/stacks/django.md Co-authored-by: Chad Carlson <[email protected]> * Update sites/friday/src/get-started/stacks/django.md Co-authored-by: Chad Carlson <[email protected]> * Update sites/friday/src/get-started/stacks/flask.md Co-authored-by: Chad Carlson <[email protected]> * adds the remaining bits to the flask doc * adds section on alternative web servers and db migrate * removes naming a specific number of remaining steps * Match Django guide with the WordPress guide. * Match Flask guide with the WordPress format. * Doc review --------- Co-authored-by: Chad Carlson <[email protected]> Co-authored-by: chadcarlson <[email protected]> Co-authored-by: Anouck Colson <[email protected]> * Fix composable image xdebug configuration. (#3915) * Pre-GA fixes (#3917) * fix vale errors . * Fix bad merges. * Remove hardcoded company names. --------- Co-authored-by: AnouckColson <[email protected]> Co-authored-by: Paul Gilzow <[email protected]> Co-authored-by: Thomas di Luccio <[email protected]> Co-authored-by: Anouck Colson <[email protected]> Co-authored-by: remilejeune2 <[email protected]> Co-authored-by: remi <[email protected]> Co-authored-by: Guillaume Moigneu <[email protected]> Co-authored-by: Guillaume Moigneu <[email protected]> Co-authored-by: Thomas di Luccio <[email protected]> Co-authored-by: flovntp <[email protected]>
1 parent 35ab38f commit 397e9a3

File tree

535 files changed

+9925
-3135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

535 files changed

+9925
-3135
lines changed

.github/workflows/build-from-fork.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build from fork
22

33
on:
44
pull_request_target:
5-
branches: [main]
5+
branches: [main, ga-staging]
66
types: [labeled,unlabeled,synchronize]
77

88
env:

.github/workflows/check-labels.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Check labels
22
on:
33
pull_request_target:
4-
branches: [main]
4+
branches: [main, ga-staging]
55
types: [labeled,opened,reopened,synchronize]
66

77
env:

.github/workflows/generate-cli-commands-page.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
BRANCH_TITLE: cli-commands-doc-page
1717
DEFAULT_BRANCH: "main"
1818
PLATFORMSH_CLI_DOC_PATH: "sites/platform/src/administration/cli/reference.md"
19-
UPSUN_CLI_DOC_PATH: "sites/friday/src/administration/cli/reference.md"
19+
UPSUN_CLI_DOC_PATH: "sites/upsun/src/administration/cli/reference.md"
2020
permissions:
2121
contents: write
2222

.github/workflows/get-pr-info.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Get info on PR
22
on:
33
pull_request_target:
4-
branches: [main]
4+
branches: [main, ga-staging]
55
types: [labeled,opened,reopened,synchronize]
66

77
env:

.github/workflows/linting.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Linting
22
on:
33
pull_request_target:
4-
branches: [main]
4+
branches: [main, ga-staging]
55
types: [labeled,opened,reopened,synchronize]
66

77
jobs:

.github/workflows/manage-environment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Manage environment
22
on:
33
pull_request_target:
4-
branches: [main]
4+
branches: [main, ga-staging]
55
types:
66
- opened
77
- reopened

.github/workflows/pr-check-links.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Check internal links
22
on:
33
pull_request:
4-
branches: [main]
4+
branches: [main, ga-staging]
55
types: [opened,reopened,synchronize,labeled,unlabeled]
66

77

.platform/applications.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
size: S
6767

6868
- # The name of this application, which must be unique within a project.
69-
name: 'friday'
69+
name: 'upsun'
7070

7171
# The type key specifies the language and version for your application.
7272
type: 'nodejs:20'
@@ -75,7 +75,7 @@
7575
variables:
7676
env:
7777
HUGOVERSION: 0.116.0
78-
SITE_DIR: 'sites/friday'
78+
SITE_DIR: 'sites/upsun'
7979

8080
build:
8181
flavor: none
@@ -111,7 +111,7 @@
111111
locations:
112112
'/':
113113
# The public directory of the application relative to its root.
114-
root: 'sites/friday/public'
114+
root: 'sites/upsun/public'
115115
passthru: true
116116
index: ['index.html']
117117
scripts: false
@@ -124,8 +124,8 @@
124124
disk: 1024
125125

126126
mounts:
127-
"sites/friday/public/scripts/xss/dist/config":
127+
"sites/upsun/public/scripts/xss/dist/config":
128128
source: local
129-
source_path: "sites/friday/config"
129+
source_path: "sites/upsun/config"
130130

131131
size: S

.platform/routes.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ https://{default}/:
272272

273273
https://docs.upsun.com/:
274274
type: upstream
275-
upstream: friday:http
276-
id: friday
275+
upstream: upsun:http
276+
id: upsun
277277
cache:
278278
enabled: true
279279
ssi:

.vale.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ StylesPath = contributing/styles
22

33
Vocab = Platform
44

5-
MinAlertLevel = suggestion # suggestion, warning, or error
5+
MinAlertLevel = error # suggestion, warning, or error
66

77
[*.md]
88
BasedOnStyles = Platform,Vale

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ but if you don't, the search field doesn't appear in the sidebar.
4747
1. To run the docs alone, clone this repository and install dependencies:
4848

4949
```bash
50-
cd sites/platform # or cd sites/friday
50+
cd sites/platform # or cd sites/upsun
5151
npm install
5252
```
5353

@@ -161,15 +161,15 @@ When you add a white label documentation, you want vendor-specific values, such
161161

162162
For example, if you add a white label documentation for a product called MyGreatProduct,
163163
you want every instance of `Platform.sh` and `Platform.sh CLI` to be automatically substituted by `MyGreatProduct` and `MyGreatProduct CLI` respectively.
164-
To achieve that result, use the settings placeholders defined in the `sites/friday/config/_default/params.yaml` file:
164+
To achieve that result, use the settings placeholders defined in the `sites/upsun/config/_default/params.yaml` file:
165165

166166
```yaml
167167
# Vendorization
168168
vendor:
169-
name: Deploy Friday
170-
cli: friday
171-
env_prefix: FRIDAY
172-
config_dir: .friday
169+
name: Upsun
170+
cli: upsun
171+
env_prefix: PLATFORM
172+
config_dir: .upsun
173173
```
174174

175175
Each of them can be used in any templates (HTML or MarkDown) using shortcodes:
@@ -207,7 +207,7 @@ To do so, you could implement the following file structure:
207207
208208
```bash
209209
sites
210-
├── friday
210+
├── upsun
211211
│ └── src
212212
│ └── tutorials
213213
│ └── migrating

contributing/styles/config/vocabularies/Platform/accept.txt

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CDNs?
2626
CMS
2727
CNAMEs?
2828
[Cc]onfig
29+
[Cc]omposable
2930
Corepack
3031
CPUs?
3132
[Cc]ron
@@ -101,6 +102,7 @@ Nagios
101102
Namecheap
102103
namespace
103104
Neve
105+
Nixpkgs
104106
[Nn]ginx
105107
NodePing
106108
Nori

search/index_external_sites.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
cleanup(){
44
echo "* CLEANING UP OLD DOCS INDEX"
55
rm -f output/platform_index.json
6-
rm -f output/friday_index.json
6+
rm -f output/upsun_index.json
77

88
}
99

@@ -27,9 +27,9 @@ update_index(){
2727
POETRY_LOCATION=/app/.local/bin/poetry
2828
# Update indexes
2929
$POETRY_LOCATION run python createPrimaryIndex.py platform
30-
$POETRY_LOCATION run python createPrimaryIndex.py friday
30+
$POETRY_LOCATION run python createPrimaryIndex.py upsun
3131
$POETRY_LOCATION run python main.py platform
32-
$POETRY_LOCATION run python main.py friday
32+
$POETRY_LOCATION run python main.py upsun
3333
}
3434

3535
# scrape

search/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ def update(self):
129129
# Create a new index
130130
create_index_task = client.create_index(uid=self.docs_index, options={'primaryKey': self.primaryKey, 'uid': self.index_name})
131131

132-
timeout = 5000
132+
timeout = 10000
133133
if "friday" == docs_index_name:
134134
timeout = 15000
135135

136136
try:
137137
client.wait_for_task(create_index_task['taskUid'], timeout)
138-
except MeilisearchTimeoutError as merror:
138+
except meilisearch.errors.MeilisearchTimeoutError as merror:
139139
print('Failed waiting {0} milliseconds for Meilisearch to create the index. Error message: {1}'.format(timeout, merror))
140140
return
141141

search/post_deploy.sh

+12-12
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
cleanup(){
44
echo "* CLEANING UP OLD DOCS INDEX"
55
rm -v output/platform_docs.json && echo "output json for platform deleted" || echo "failed to delete output json for platform"
6-
rm -v output/friday_docs.json && echo "output json for upsun deleted" || echo "failed to delete output json for upsun"
6+
rm -v output/upsun_docs.json && echo "output json for upsun deleted" || echo "failed to delete output json for upsun"
77
}
88

99
getDocsData() {
1010
# Get the frontend URLs
1111
PLATFORM_DOCS_URL=$(echo $PLATFORM_ROUTES | base64 --decode | jq -r 'to_entries[] | select(.value.primary) | .key')
12-
FRIDAY_DOCS_URL=$(echo $PLATFORM_ROUTES | base64 --decode | jq -r 'to_entries[] | select(.value.id=="friday") | .key')
12+
UPSUN_DOCS_URL=$(echo $PLATFORM_ROUTES | base64 --decode | jq -r 'to_entries[] | select(.value.id=="upsun") | .key')
1313

1414
printf "URL for platform docs: %s\n" "${PLATFORM_DOCS_URL}"
15-
printf "URL for upsun docs: %s\n" "${FRIDAY_DOCS_URL}"
15+
printf "URL for upsun docs: %s\n" "${UPSUN_DOCS_URL}"
1616

1717
# Delete docs index in the mount if it exists
1818
rm -v data/platform_index.json && echo "data json for platform deleted" || echo "failed to delete data json for platform"
19-
rm -v data/friday_index.json && echo "data json for upsun deleted" || echo "failed to delete data json for upsun"
19+
rm -v data/upsun_index.json && echo "data json for upsun deleted" || echo "failed to delete data json for upsun"
2020

2121
# remove the previous headers log
2222
if [ -f "data/platform-headers.txt" ]; then
@@ -34,17 +34,17 @@ getDocsData() {
3434
# curl --user-agent "request-to-upsun-docs" -s -D - -o foobar.json "https://docs.upsun.com/index.json" >> headers.txt
3535
curl --user-agent "request-search-index-for-platform-docs" -s -D - -o data/platform_index.json "${PLATFORM_DOCS_URL}index.json" >> data/platform-headers.txt
3636
#curl -s "${PLATFORM_DOCS_URL}index.json" >> data/platform_index.json && echo "retrieved psh index" || echo "failed to retrieve psh index"
37-
curl --user-agent "request-search-index-for-upsun-docs" -s -D - -o data/friday_index.json "${FRIDAY_DOCS_URL}index.json" >> data/upsun-headers.txt
38-
#curl -s "${FRIDAY_DOCS_URL}index.json" >> data/friday_index.json && echo "retrieved upsun index" || echo "failed to retrieve upsun index"
37+
curl --user-agent "request-search-index-for-upsun-docs" -s -D - -o data/upsun_index.json "${UPSUN_DOCS_URL}index.json" >> data/upsun-headers.txt
38+
#curl -s "${UPSUN_DOCS_URL}index.json" >> data/upsun_index.json && echo "retrieved upsun index" || echo "failed to retrieve upsun index"
3939

4040
# How many times does Platform.sh appear in the platform index? Should be 3815
4141
pshOccurrenceInPsh=$(cat data/platform_index.json | grep -o -i Platform.sh | wc -l)
4242
# How many times does Platform.sh appear in the Upsun index? should be 33
43-
pshOccurrenceInUpsun=$(cat data/friday_index.json | grep -o -i Platform.sh | wc -l)
43+
pshOccurrenceInUpsun=$(cat data/upsun_index.json | grep -o -i Platform.sh | wc -l)
4444
#How many times does Upsun appear in the platform index? Should be 0
4545
upsunOccurrenceInPsh=$(cat data/platform_index.json | grep -o -i Upsun | wc -l)
4646
#how many times does Upsun appear in the upsun index? Should be 4616
47-
upsunOccurrenceInUpsun=$(cat data/friday_index.json | grep -o -i Upsun | wc -l)
47+
upsunOccurrenceInUpsun=$(cat data/upsun_index.json | grep -o -i Upsun | wc -l)
4848

4949
printf "Upsun appears %d times in the platform index.\nUpsun appears %d times in the Upsun index.\n" "${upsunOccurrenceInPsh}" "${upsunOccurrenceInUpsun}"
5050
printf "Platform appears %d times in the platform index.\nPlatform appears %d times in the Upsun index.\n" "${pshOccurrenceInPsh}" "${pshOccurrenceInUpsun}"
@@ -62,25 +62,25 @@ getDocsData() {
6262

6363
# Delete templates index in the mount if it exists
6464
rm -f data/platform_templates.yaml
65-
rm -f data/friday_templates.yaml
65+
rm -f data/upsun_templates.yaml
6666

6767
# Get the updated index for templates
6868
curl -s "${PLATFORM_DOCS_URL}files/indexes/templates.yaml" >> data/platform_templates.yaml
6969

7070
# @todo: For now, reuse the same index. To be removed entirely.
71-
cp data/platform_templates.yaml data/friday_templates.yaml
71+
cp data/platform_templates.yaml data/upsun_templates.yaml
7272
}
7373

7474
update_index(){
7575
echo "* UPDATING INDEX"
7676
POETRY_LOCATION=/app/.local/bin/poetry
7777
# Create indices for templates and docs
7878
$POETRY_LOCATION run python createPrimaryIndex.py platform
79-
$POETRY_LOCATION run python createPrimaryIndex.py friday
79+
$POETRY_LOCATION run python createPrimaryIndex.py upsun
8080

8181
# Update indexes
8282
$POETRY_LOCATION run python main.py platform
83-
$POETRY_LOCATION run python main.py friday
83+
$POETRY_LOCATION run python main.py upsun
8484
}
8585

8686
save_headers() {

0 commit comments

Comments
 (0)