From b48e5cd9498130375e7052f550c936e946cac3bc Mon Sep 17 00:00:00 2001 From: lvuch Date: Tue, 7 Aug 2018 14:35:34 -0700 Subject: [PATCH 1/6] add customers to main nav --- config.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config.toml b/config.toml index 45086b9d898..9faca42468b 100644 --- a/config.toml +++ b/config.toml @@ -122,10 +122,16 @@ pre = "keyboard_arrow_down" #url = "https://rancher.com//customers/" #weight = "3" +[[menu.main]] +identifier = "customers" +name = "Customers" +url = "/customers/" +weight = "4" + [[menu.main]] identifier = "learn" name = "Learn" -weight = "4" +weight = "5" pre = "keyboard_arrow_down" [[menu.main]] From 6be569d231170f248876aa6a859ac9018ddffe8f Mon Sep 17 00:00:00 2001 From: lvuch Date: Wed, 5 Sep 2018 14:19:03 -0700 Subject: [PATCH 2/6] accordion, and yaml on one block --- .../installation/ha/kubernetes-rke/_index.md | 20 +++--- layouts/shortcodes/accordion.html | 6 +- src/sass/app.scss | 63 ------------------- 3 files changed, 13 insertions(+), 76 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md index bef2d2ab927..979f9dfed00 100644 --- a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md +++ b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md @@ -11,15 +11,15 @@ Using the sample below create the `rancher-cluster.yml` file. Replace the IP Add ```yaml nodes: -- address: 165.227.114.63 - user: ubuntu - role: [controlplane,worker,etcd] -- address: 165.227.116.167 - user: ubuntu - role: [controlplane,worker,etcd] -- address: 165.227.127.226 - user: ubuntu - role: [controlplane,worker,etcd] + - address: 165.227.114.63 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.116.167 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.127.226 + user: ubuntu + role: [controlplane,worker,etcd] ``` #### Common RKE nodes: options @@ -102,4 +102,4 @@ Save a copy of the `kube_config_rancher-cluster.yml` and `rancher-cluster.yml` f See the [Troubleshooting]({{< baseurl >}}/rancher/v2.x/en/installation/ha/kubernetes-rke/troubleshooting/) page. -### [Next: Initialize Helm]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-init/) \ No newline at end of file +### [Next: Initialize Helm]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-init/) diff --git a/layouts/shortcodes/accordion.html b/layouts/shortcodes/accordion.html index 600dbc68d4b..0e38ce3b217 100644 --- a/layouts/shortcodes/accordion.html +++ b/layouts/shortcodes/accordion.html @@ -1,7 +1,7 @@ -
- +
+ -
+
{{ .Inner }}
diff --git a/src/sass/app.scss b/src/sass/app.scss index f55845b9e5e..a75f2eff1a6 100644 --- a/src/sass/app.scss +++ b/src/sass/app.scss @@ -62,66 +62,3 @@ display: none; visibility: hidden; } - - -//accordion -.tab { - position: relative; - margin-bottom: 1px; - width: 100%; - overflow: hidden; - border: solid $border thin; - - input { - position: absolute; - opacity: 0; - z-index: -1; - } - label { - position: relative; - display: block; - padding: $spacer-xs; - background: lighten($bg-default,4%); - border: solid 1px $border; - font-size: 2rem; - cursor: pointer; - } - - .tab-content { - display: none; - overflow: hidden; - background: #fff; - -webkit-transition: max-height .35s; - -o-transition: max-height .35s; - transition: max-height .35s; - padding: $spacer-sm; - } - - /* :checked */ - input:checked~.tab-content { - display: block; - } - /* Icon */ - label::after { - position: absolute; - right: $spacer-xs; - top: $spacer-xs; - display: block; - text-align: center; - -webkit-transition: all .35s; - -o-transition: all .35s; - transition: all .35s; - } - input[type=checkbox]+label::after { - content: "+"; - } - input[type=radio]+label::after { - content: "\25BC"; - } - input[type=checkbox]:checked+label::after { - transform: rotate(90deg); - } - input[type=radio]:checked+label::after { - transform: rotateX(180deg); - } -} From 90f4106151fe46f8dfc2c06a0b47fc1846b494b4 Mon Sep 17 00:00:00 2001 From: lvuch Date: Wed, 5 Sep 2018 15:08:29 -0700 Subject: [PATCH 3/6] note format and search --- .../v2.x/en/installation/ha/helm-init/_index.md | 2 +- .../v2.x/en/installation/ha/helm-rancher/_index.md | 10 +++++----- .../ha/helm-rancher/chart-options/_index.md | 4 ++-- .../ha/helm-rancher/troubleshooting/_index.md | 2 +- src/js/app.js | 14 +++++++++++++- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md index 245775e475c..f8f96f1f2e6 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-init/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-init/_index.md @@ -28,6 +28,6 @@ kubectl create clusterrolebinding tiller \ helm init --service-account tiller ``` -> NOTE: This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. +> **NOTE:** This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements. ### [Next: Install Rancher]({{< baseurl >}}/rancher/v2.x/en/installation/ha//helm-rancher/) \ No newline at end of file diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md index 57fd70024ae..e14ab73341d 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/_index.md @@ -33,9 +33,9 @@ Rancher server is designed to be "secure by default" and requires SSL/TLS config There are three options for the source of the certificate. -* `rancher` - (Default) Use Rancher generated CA/Certificates. -* `letsEncrypt` - Use [LetsEncrypt](https://letsencrypt.org/) to issue a cert. -* `secret` - Configure a Kubernetes Secret with your certificate files. +1. `rancher` - (Default) Use Rancher generated CA/Certificates. +2. `letsEncrypt` - Use [LetsEncrypt](https://letsencrypt.org/) to issue a cert. +3. `secret` - Configure a Kubernetes Secret with your certificate files. @@ -71,11 +71,11 @@ helm install rancher-stable/rancher \ Create Kubernetes Secrets from your own certificates for Rancher to use. -> NOTE: The common name for the cert will need to match the `hostname` option or the ingress controller will fail to provision the site for Rancher. +> **NOTE:** The common name for the cert will need to match the `hostname` option or the ingress controller will fail to provision the site for Rancher. Set `hostname` and `ingress.tls.source=secret` -> NOTE: If you are using a Private CA signed cert, add `--set privateCA=true` +> **NOTE:** If you are using a Private CA signed cert, add `--set privateCA=true` ``` helm install rancher-stable/rancher \ diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md index f31c8c02a6c..8ab749ead03 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/chart-options/_index.md @@ -74,11 +74,11 @@ Add the `rancherImage` to point to your private registry image and `imagePullSec If you wish to terminate the SSL/TLS on a load-balancer external to the Rancher cluster (ingress), use the `--tls=external` option and point your load balancer at port http 80 on all of the rancher cluster nodes. -> NOTE: If you are using a Private CA signed cert, add `--set privateCA=true` and see [Adding TLS Secrets - Private CA Signed - Additional Steps]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/#private-ca-signed---additional-steps) to add the CA cert for Rancher. +> **NOTE:** If you are using a Private CA signed cert, add `--set privateCA=true` and see [Adding TLS Secrets - Private CA Signed - Additional Steps]({{< baseurl >}}/rancher/v2.x/en/installation/ha/helm-rancher/tls-secrets/#private-ca-signed---additional-steps) to add the CA cert for Rancher. Your load balancer must support long lived websocket connections and will need to insert proxy headers so Rancher can route links correctly. -> NOTE: The `tls=external` option will expose the Rancher interface on http port 80. Clients that are allowed to connect directly to the Rancher cluster will not be encrypted. We recommend that you restrict direct access at the network level to just your load balancer. +> **NOTE:** The `tls=external` option will expose the Rancher interface on http port 80. Clients that are allowed to connect directly to the Rancher cluster will not be encrypted. We recommend that you restrict direct access at the network level to just your load balancer. #### Required headers diff --git a/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md index fd12a12e04f..7aeededc860 100644 --- a/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md +++ b/content/rancher/v2.x/en/installation/ha/helm-rancher/troubleshooting/_index.md @@ -69,7 +69,7 @@ kubectl -n cattle-namespace logs -f rancher-784d94f59b-vgqzh Use your browser to check the certificate details. If it says the Common Name is "Kubernetes Ingress Controller Fake Certificate", something may have gone wrong with reading or issuing your SSL cert. -> Note: if you are using LetsEncrypt to issue certs it can sometimes take a few minuets to issue the cert. +> **NOTE:** if you are using LetsEncrypt to issue certs it can sometimes take a few minuets to issue the cert. #### cert-manager issued certs (Rancher Generated or LetsEncrypt) diff --git a/src/js/app.js b/src/js/app.js index d5780117d18..e7014892cbc 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -30,7 +30,19 @@ const bootstrapDocsSearch = function() { autofocus: true, loadingIndicator: true, container: '#search-box', - placeholder: 'Search Docs...', + placeholder: 'Search Blog, Events, etc...', + magnifier: false, + reset: true, + }) + ); + + + search.addWidget( + instantsearch.widgets.searchBox({ + autofocus: true, + loadingIndicator: true, + container: '#search-box-mobile', + placeholder: 'Search Blog, Events, etc...', magnifier: false, reset: true, }) From b917763cf301d941c986f77d04b2b7ee8742e60a Mon Sep 17 00:00:00 2001 From: lvuch Date: Wed, 5 Sep 2018 16:15:10 -0700 Subject: [PATCH 4/6] sitemap to robots --- layouts/robots.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/layouts/robots.txt b/layouts/robots.txt index 34b38b80170..769d069a8d7 100644 --- a/layouts/robots.txt +++ b/layouts/robots.txt @@ -1,2 +1,4 @@ User-agent: * -Disallow: {{ if ne (getenv "HUGO_ENV") "production" }}/{{ end }} \ No newline at end of file +Disallow: {{ if ne (getenv "HUGO_ENV") "production" }}/{{ end }} + +Sitemap: https://rancher.com/sitemap.xml From 43391c3bfdf6a82ca1b9a6eb4b6024b28ee3d14e Mon Sep 17 00:00:00 2001 From: lvuch Date: Thu, 13 Sep 2018 09:38:18 -0700 Subject: [PATCH 5/6] search and list pages --- config.toml | 6 +- .../installation/ha/kubernetes-rke/_index.md | 18 ++--- layouts/_default/list.html | 6 +- src/js/app.js | 80 ++++++++++++------- 4 files changed, 70 insertions(+), 40 deletions(-) diff --git a/config.toml b/config.toml index 58b122e7836..81f25129024 100644 --- a/config.toml +++ b/config.toml @@ -8,7 +8,11 @@ pluralizeListTitles = false enableRobotsTXT = true pygmentsCodeFences = true -pygmentsCodeFencesGuessSyntax = true + +PygmentsStyle = "native" + +#pygmentsCodeFencesGuessSyntax = true + [permalinks] inside-pages = "/:filename/" diff --git a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md index 979f9dfed00..9df59191d0d 100644 --- a/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md +++ b/content/rancher/v2.x/en/installation/ha/kubernetes-rke/_index.md @@ -11,15 +11,15 @@ Using the sample below create the `rancher-cluster.yml` file. Replace the IP Add ```yaml nodes: - - address: 165.227.114.63 - user: ubuntu - role: [controlplane,worker,etcd] - - address: 165.227.116.167 - user: ubuntu - role: [controlplane,worker,etcd] - - address: 165.227.127.226 - user: ubuntu - role: [controlplane,worker,etcd] + - address: 165.227.114.63 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.116.167 + user: ubuntu + role: [controlplane,worker,etcd] + - address: 165.227.127.226 + user: ubuntu + role: [controlplane,worker,etcd] ``` #### Common RKE nodes: options diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 817bfdccd56..c0006865931 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -10,18 +10,18 @@
-