diff --git a/.forgejo/workflows/build-deploy.yaml b/.forgejo/workflows/build-deploy.yaml index 2679828..00d11b6 100644 --- a/.forgejo/workflows/build-deploy.yaml +++ b/.forgejo/workflows/build-deploy.yaml @@ -42,7 +42,7 @@ jobs: container: catthehacker/ubuntu:act-latest environment: name: prod - url: https://serva.la/ + url: https://servala.com/ steps: - name: Checkout repository diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5161da1..50b492a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,6 @@ deploy: - oc -n ${NAMESPACE} rollout restart deployment/servala environment: name: prod - url: https://poc.serva.la/ + url: https://servala.com/ only: - main diff --git a/hub/services/templates/base.html b/hub/services/templates/base.html index cb22791..f0c2d76 100644 --- a/hub/services/templates/base.html +++ b/hub/services/templates/base.html @@ -1,6 +1,7 @@ {% load static %} {% load canonical_tags %} {% load social_meta_tags %} +{% load json_ld_tags %}
@@ -12,6 +13,7 @@ {% social_meta_tags %} + {% json_ld_structured_data %} diff --git a/hub/services/templatetags/json_ld_tags.py b/hub/services/templatetags/json_ld_tags.py index 977452e..689dd5a 100644 --- a/hub/services/templatetags/json_ld_tags.py +++ b/hub/services/templatetags/json_ld_tags.py @@ -11,6 +11,7 @@ register = template.Library() def json_ld_structured_data(context): """ Generates appropriate JSON-LD structured data based on the current page. + For schemas, see https://schema.org/ """ request = context["request"] current_url = request.path @@ -30,8 +31,8 @@ def json_ld_structured_data(context): "contactPoint": { "@type": "ContactPoint", "telephone": "+41 44 545 53 00", - "email": "hi@serva.la", - "contactType": "Customer Support", + "email": "hi@servala.com", + "contactType": "Sales", }, "address": { "@type": "PostalAddress", @@ -52,7 +53,7 @@ def json_ld_structured_data(context): "description": "Servala connects businesses, developers, and cloud service providers on one unique hub with secure, scalable, and easy-to-use cloud-native services.", "potentialAction": { "@type": "SearchAction", - "target": f"{base_url}/services/?search={{search_term_string}}", + "target": f"{base_url}/service/?search={{search_term_string}}", "query-input": "required name=search_term_string", }, } @@ -62,7 +63,7 @@ def json_ld_structured_data(context): "@context": "https://schema.org", "@type": "CollectionPage", "name": "Cloud Services - Servala", - "url": f"{base_url}/services/", + "url": f"{base_url}/service/", "description": "Explore all available cloud services on Servala, with new services added regularly.", "isPartOf": {"@type": "WebSite", "name": "Servala", "url": base_url}, }