From eeb8544425feb32e0ad1b360cec06b4a5b2c8025 Mon Sep 17 00:00:00 2001 From: julia-queen <110978904+julia-queen@users.noreply.github.com> Date: Thu, 18 Apr 2024 17:27:33 +0000 Subject: [PATCH 1/4] Add product cards modified: templates/blog/product-cards.html new file: templates/blog/product-cards/_ai-solutions.html new file: templates/blog/product-cards/_ceph.html new file: templates/blog/product-cards/_charmed_mongodb.html new file: templates/blog/product-cards/_desktop_ubuntu-desktop-for-organisations.html new file: templates/blog/product-cards/_desktop_ubuntu-for-desktops.html new file: templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html new file: templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html new file: templates/blog/product-cards/_kubernetes.html new file: templates/blog/product-cards/_lxd.html new file: templates/blog/product-cards/_microcloud.html new file: templates/blog/product-cards/_opensearch.html new file: templates/blog/product-cards/_openstack.html new file: templates/blog/product-cards/_server_scale-out-with-ubuntu-server.html new file: templates/blog/product-cards/_wsl_ubuntu-on-windows.html --- templates/blog/product-cards.html | 132 +++++++----------- .../blog/product-cards/_ai-solutions.html | 14 ++ templates/blog/product-cards/_ceph.html | 11 ++ .../blog/product-cards/_charmed_mongodb.html | 13 ++ ...ktop_ubuntu-desktop-for-organisations.html | 18 +++ .../_desktop_ubuntu-for-desktops.html | 18 +++ ...re_maximise-your-cloud-infrastructure.html | 11 ++ ...ture_optimised-costs-across-any-cloud.html | 11 ++ templates/blog/product-cards/_kubernetes.html | 12 ++ templates/blog/product-cards/_lxd.html | 11 ++ templates/blog/product-cards/_microcloud.html | 11 ++ templates/blog/product-cards/_opensearch.html | 18 +++ templates/blog/product-cards/_openstack.html | 11 ++ .../_server_scale-out-with-ubuntu-server.html | 18 +++ .../product-cards/_wsl_ubuntu-on-windows.html | 18 +++ 15 files changed, 246 insertions(+), 81 deletions(-) create mode 100644 templates/blog/product-cards/_ai-solutions.html create mode 100644 templates/blog/product-cards/_ceph.html create mode 100644 templates/blog/product-cards/_charmed_mongodb.html create mode 100644 templates/blog/product-cards/_desktop_ubuntu-desktop-for-organisations.html create mode 100644 templates/blog/product-cards/_desktop_ubuntu-for-desktops.html create mode 100644 templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html create mode 100644 templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html create mode 100644 templates/blog/product-cards/_kubernetes.html create mode 100644 templates/blog/product-cards/_lxd.html create mode 100644 templates/blog/product-cards/_microcloud.html create mode 100644 templates/blog/product-cards/_opensearch.html create mode 100644 templates/blog/product-cards/_openstack.html create mode 100644 templates/blog/product-cards/_server_scale-out-with-ubuntu-server.html create mode 100644 templates/blog/product-cards/_wsl_ubuntu-on-windows.html diff --git a/templates/blog/product-cards.html b/templates/blog/product-cards.html index 43243dd32a1..f88228f6209 100644 --- a/templates/blog/product-cards.html +++ b/templates/blog/product-cards.html @@ -7,9 +7,50 @@ {% elif article.tags and 2976 in article.tags %} {% include "blog/product-cards/_multi_cloud.html" %} - {# Ubuntu 18.04 tag cards #} - {% elif article.tags and 3486 in article.tags %} - {% include "blog/product-cards/_ubuntu_18.04_end_of_support.html" %} + {# AI/ML tag cards #} + {% elif article.tags and 4062 in article.tags %} + {% include "blog/product-cards/_ai-solutions.html" %} + + {# OpenSearch tag cards #} + {% elif article.tags and 4353 in article.tags %} + {% include "blog/product-cards/_opensearch.html" %} + + {# MongoDB tag cards #} + {% elif article.tags and 3949 in article.tags %} + {% include "blog/product-cards/_charmed_mongodb.html" %} + + {# MicroCloud tag cards #} + {% elif article.tags and 4499 in article.tags %} + {% include "blog/product-cards/_microcloud.html" %} + + {# OpenStack tag cards #} + {% elif article.tags and 1327 in article.tags %} + {% include "blog/product-cards/_openstack.html" %} + + {# LXD tag cards #} + {% elif article.tags and 1743 in article.tags %} + {% include "blog/product-cards/_lxd.html" %} + + {# Infrastructure tag cards #} + {% elif article.tags and 2554 in article.tags %} + {% include "blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html" %} + {% include "blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html" %} + + {# Ubuntu desktop tag cards #} + {% elif article.tags and 1920 in article.tags %} + {% include "blog/product-cards/_desktop_ubuntu-for-desktops.html" %} + + {# Ubuntu Server tag cards #} + {% elif article.tags and 1610 in article.tags %} + {% include "blog/product-cards/_server_scale-out-with-ubuntu-server.html" %} + + {# Ubuntu WSL tag cards #} + {% elif article.tags and 3332 in article.tags %} + {% include "blog/product-cards/_wsl_ubuntu-on-windows.html" %} + + {# Identity Management tag cards #} + {% elif article.tags and 4195 in article.tags %} + {% include "blog/product-cards/_desktop_ubuntu-desktop-for-organisations.html" %} {# Hybrid-cloud tag cards #} {% elif article.tags and 3150 in article.tags %} @@ -63,103 +104,32 @@ {% include "blog/product-cards/_ceph_what-is-ceph.html" %} {% include "blog/product-cards/_ceph_optimise-storage-costs.html" %} {% include "blog/product-cards/_ceph_guide-sds-for-ent.html" %} + {% include "blog/product-cards/_ceph.html" %} {# Bosch tag cards #} {% elif article.tags and 3680 in article.tags %} {% include "blog/product-cards/_bosch_ubuntu-for-iot.html" %} {# Legacy fallback content #} - {% elif article.group and article.group.slug == "kubernetes" %} -
-

- - Multi-cloud Kubernetes on Ubuntu - -

-

- Deploy, scale and upgrade Kubernetes clusters across multiple physical or virtual machines with Charmed Kubernetes, with full support available. -

-

Get started with Charmed K8s ›

-
- {% elif article.group and article.group.slug == "openstack" %} -
-

- - OpenStack deployment made easy - -

-

- Ready to move from expensive, proprietary virtualisation to OpenStack? Canonical designs, builds, operates and supports OpenStack private clouds. -

-

Move to OpenStack ›

-
{% elif article.group and article.group.slug == "support" %}

- - Open source enterprise support - + Enterprise support for your full open source stack

- UA Infrastructure is a single subscription for open source software, security and IaaS support, with OpenStack and Kubernetes included. + Build with confidence and operate at scale with enterprise support from Canonical. + Our global team of experts is available 24/7 to provide the best support experience for Ubuntu and your full open source stack, from infrastructure to applications.

-

Solve open source security and compliance ›

-
- {% elif article.group and article.group.slug == "cloud-and-server" %} -
-

- - Ubuntu cloud - -

-

- Ubuntu offers all the training, software infrastructure, tools, - services and support you need for your public and private clouds. -

-
- {% elif article.group and article.group.slug == "internet-of-things" %} -
-

- - Internet of Things - -

- From home control to drones, robots and industrial systems, Ubuntu Core and Snaps provide robust security, app stores and reliable updates for all your IoT devices. -

-
- {% elif article.group and article.group.slug == "desktop" %} -
-

- - Ubuntu desktop - -

-

- Learn how the Ubuntu desktop operating system powers millions of PCs and laptops around the world. -

-
- {% elif article.group and article.group.slug == "server" %} -
-

- - Ubuntu Server - -

-

- The leading platform for scale-out computing, Ubuntu Server delivers the best value scale-out performance available. + Learn more ›

{% else %}

- - Talk to us today - + Talk to us today

-

- Interested in running Ubuntu in your organisation? -

+

Interested in running Ubuntu in your organisation?

{% endif %} diff --git a/templates/blog/product-cards/_ai-solutions.html b/templates/blog/product-cards/_ai-solutions.html new file mode 100644 index 00000000000..0f5ad0e8ee4 --- /dev/null +++ b/templates/blog/product-cards/_ai-solutions.html @@ -0,0 +1,14 @@ +
+

+ Enterprise AI, simplified +

+ canonical ai ml illustration +

+ AI doesn’t have to be difficult. Accelerate innovation with an end-to-end stack that delivers all the open source tooling you need for the entire AI/ML lifecycle. +

+

+ Explore Canonical’s AI solutions › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_ceph.html b/templates/blog/product-cards/_ceph.html new file mode 100644 index 00000000000..f2cdc114047 --- /dev/null +++ b/templates/blog/product-cards/_ceph.html @@ -0,0 +1,11 @@ +
+

+ Performant, reliable and cost-effective cloud scaling with Ceph +

+

+ Canonical Ceph simplifies the entire management lifecycle of deployment, configuration, and operation of a Ceph cluster, no matter its size or complexity. Install, monitor, and scale cloud storage with extensive interoperability. +

+

+ Find out how Ceph scales clouds so cost-effectively › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_charmed_mongodb.html b/templates/blog/product-cards/_charmed_mongodb.html new file mode 100644 index 00000000000..5f155b61fa1 --- /dev/null +++ b/templates/blog/product-cards/_charmed_mongodb.html @@ -0,0 +1,13 @@ +
+ canonical charmed mongodb logo +
+

+ What can Charmed MongoDB bring to modern data management? +

+

Explore core of MongoDB and use cases for financial, automotive and telecommunications sector in our guide.

+

+ Download the guide › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_desktop_ubuntu-desktop-for-organisations.html b/templates/blog/product-cards/_desktop_ubuntu-desktop-for-organisations.html new file mode 100644 index 00000000000..c920c100f63 --- /dev/null +++ b/templates/blog/product-cards/_desktop_ubuntu-desktop-for-organisations.html @@ -0,0 +1,18 @@ +
+ ubuntu logo +
+

+ Bring Ubuntu to your organisation +

+

+ Ubuntu Desktop combines enterprise-grade support, security and functionality with the best of open source. +
+
+ Seamlessly integrate Ubuntu machines with your existing infrastructure and tools. +

+

+ Explore Ubuntu Desktop for organisations › +

+
diff --git a/templates/blog/product-cards/_desktop_ubuntu-for-desktops.html b/templates/blog/product-cards/_desktop_ubuntu-for-desktops.html new file mode 100644 index 00000000000..75f15b889e3 --- /dev/null +++ b/templates/blog/product-cards/_desktop_ubuntu-for-desktops.html @@ -0,0 +1,18 @@ +
+ ubuntu logo +
+

+ Ubuntu for desktops +

+

+ The open source Ubuntu desktop operating system powers millions of PCs and laptops around the world. +
+
+ Ubuntu is fast, modern, secure and it comes with everything you need to run your organisation, school, home or enterprise. +

+

+ Explore Ubuntu Desktop › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html b/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html new file mode 100644 index 00000000000..b76abf907d5 --- /dev/null +++ b/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html @@ -0,0 +1,11 @@ +
+

+ Maximise your cloud infrastructure +

+

+ Canonical lets you take control of your cloud, cutting costs and easily mixing private and public cloud platforms – all with a 10-year security guarantee. +

+

+ Explore Canonical's Infrastructure Solutions › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html b/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html new file mode 100644 index 00000000000..e80a7d61d5c --- /dev/null +++ b/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html @@ -0,0 +1,11 @@ +
+

+ Optimised costs across any cloud +

+

+ Deploy and control your cloud environment seamlessly, with secure, stable, and performant cloud infrastructure that maximises CapEx and OpEx savings +

+

+ Explore Canonical's Infrastructure Solutions › +

+
diff --git a/templates/blog/product-cards/_kubernetes.html b/templates/blog/product-cards/_kubernetes.html new file mode 100644 index 00000000000..953d257c0f1 --- /dev/null +++ b/templates/blog/product-cards/_kubernetes.html @@ -0,0 +1,12 @@ +
+

+ Give your platform the deep integration it needs +

+

+ Canonical Kubernetes optimises your systems for any cloud, on a per-cloud basis. Maximise performance and deliver security and updates across your whole cloud. + Per-cloud optimisations for performance, boot speed, and drivers on all major public clouds Out-of-the-box cloud integration with the option of enterprise-grade commercial support. +

+

+ Get out-the-box integration with Canonical Kubernetes › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_lxd.html b/templates/blog/product-cards/_lxd.html new file mode 100644 index 00000000000..9c0854b5df8 --- /dev/null +++ b/templates/blog/product-cards/_lxd.html @@ -0,0 +1,11 @@ +
+

+ Fast, dense, and secure container and VM management at any scale +

+

+ LXD brings flexible resource limits, advanced snapshot and networking support, and better security – all making for easier, leaner and more robust containerised solutions and VMs. +

+

+ Find out how LXD simplifies VM management › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_microcloud.html b/templates/blog/product-cards/_microcloud.html new file mode 100644 index 00000000000..40094c8116f --- /dev/null +++ b/templates/blog/product-cards/_microcloud.html @@ -0,0 +1,11 @@ +
+

+ Microcloud. Same great performance. +

+

+ Deploy highly available, secure, and dense microcloud environments anywhere, with a lightweight cloud infrastructure that’s designed for the edge. +

+

+ Take compute anywhere, with Canonical MicroCloud › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_opensearch.html b/templates/blog/product-cards/_opensearch.html new file mode 100644 index 00000000000..048f6307022 --- /dev/null +++ b/templates/blog/product-cards/_opensearch.html @@ -0,0 +1,18 @@ +
+ canonical charmed opensearch logo +
+

+ What is Charmed OpenSearch? +

+

+ Charmed OpenSearch is Canonical’s enterprise-grade OpenSearch offering. It is the cost-effective, reliable, secure and scalable way to use Opensearch on any cloud, hybrid cloud or on-premise. +
+
+ It simplifies the operations of OpenSearch applications through automation, security, scalability, availability and monitoring. +

+

+ Learn more about Charmed OpenSearch › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_openstack.html b/templates/blog/product-cards/_openstack.html new file mode 100644 index 00000000000..3f46acbfeb5 --- /dev/null +++ b/templates/blog/product-cards/_openstack.html @@ -0,0 +1,11 @@ +
+

+ Smart operations, optimal architecture, better pricing. +

+

+ OpenStack and Ubuntu bring automated deployment and management that help you optimise infrastructure costs – no matter your industry or use case. +

+

+ Find out how OpenStack will work for you › +

+
diff --git a/templates/blog/product-cards/_server_scale-out-with-ubuntu-server.html b/templates/blog/product-cards/_server_scale-out-with-ubuntu-server.html new file mode 100644 index 00000000000..536455200c8 --- /dev/null +++ b/templates/blog/product-cards/_server_scale-out-with-ubuntu-server.html @@ -0,0 +1,18 @@ +
+ ubuntu server logo +
+

+ Scale out with Ubuntu Server +

+

+ Ubuntu Server brings economic and technical scalability to your data centre, public or private cloud. +
+
+ Whether you want to deploy an OpenStack cloud, a Kubernetes cluster or a 50,000-node render farm, Ubuntu Server delivers the best value scale-out performance available. +

+

+ Explore Ubuntu Server › +

+
\ No newline at end of file diff --git a/templates/blog/product-cards/_wsl_ubuntu-on-windows.html b/templates/blog/product-cards/_wsl_ubuntu-on-windows.html new file mode 100644 index 00000000000..1481f3265ac --- /dev/null +++ b/templates/blog/product-cards/_wsl_ubuntu-on-windows.html @@ -0,0 +1,18 @@ +
+ ubuntu logo +
+

+ The full Ubuntu experience, now available on Windows +

+

+ Access the power of a full Ubuntu terminal environment on Windows with Windows Subsystem for Linux (WSL). +
+
+ Streamline web application development, leverage cutting-edge AI/ML tooling, develop cross-platform applications and manage IT infrastructure without leaving Windows. +

+

+ Explore Ubuntu on WSL › +

+
\ No newline at end of file From eeb6bee83fb7278397ae282213239ad7871fe8a2 Mon Sep 17 00:00:00 2001 From: julia-queen <110978904+julia-queen@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:06:10 +0000 Subject: [PATCH 2/4] Modified product-cards.html --- templates/blog/product-cards.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/blog/product-cards.html b/templates/blog/product-cards.html index f88228f6209..00002eacd54 100644 --- a/templates/blog/product-cards.html +++ b/templates/blog/product-cards.html @@ -98,6 +98,7 @@ {# Kubernetes tag cards #} {% elif article.tags and 1833 in article.tags %} {% include "blog/product-cards/_kubernetes_what-is-kubernetes.html" %} + {% include "blog/product-cards/_kubernetes.html" %} {# Ceph tag cards #} {% elif article.tags and 1780 in article.tags %} From 18ec604e9a873facc0e3668dfef92e30da9ae087 Mon Sep 17 00:00:00 2001 From: julia-queen <110978904+julia-queen@users.noreply.github.com> Date: Mon, 22 Apr 2024 06:04:10 -0700 Subject: [PATCH 3/4] Update _infrastructure_maximise-your-cloud-infrastructure.html http => https --- .../_infrastructure_maximise-your-cloud-infrastructure.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html b/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html index b76abf907d5..eebbc2825c1 100644 --- a/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html +++ b/templates/blog/product-cards/_infrastructure_maximise-your-cloud-infrastructure.html @@ -1,11 +1,11 @@

- Maximise your cloud infrastructure + Maximise your cloud infrastructure

Canonical lets you take control of your cloud, cutting costs and easily mixing private and public cloud platforms – all with a 10-year security guarantee.

- Explore Canonical's Infrastructure Solutions › + Explore Canonical's Infrastructure Solutions ›

-
\ No newline at end of file + From 341942fc6428fb093c60420794afd31c7907d51b Mon Sep 17 00:00:00 2001 From: julia-queen <110978904+julia-queen@users.noreply.github.com> Date: Mon, 22 Apr 2024 06:04:55 -0700 Subject: [PATCH 4/4] Update _infrastructure_optimised-costs-across-any-cloud.html http => https --- .../_infrastructure_optimised-costs-across-any-cloud.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html b/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html index e80a7d61d5c..83507564f8e 100644 --- a/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html +++ b/templates/blog/product-cards/_infrastructure_optimised-costs-across-any-cloud.html @@ -1,11 +1,11 @@

- Optimised costs across any cloud + Optimised costs across any cloud

Deploy and control your cloud environment seamlessly, with secure, stable, and performant cloud infrastructure that maximises CapEx and OpEx savings

- Explore Canonical's Infrastructure Solutions › + Explore Canonical's Infrastructure Solutions ›