update

Author: et-nik

.github/workflows/deploy.yml

@@ -25,7 +25,14 @@ jobs:
             -v "${{ github.workspace }}:/srv/jekyll" \
             -e JEKYLL_ENV=production \
             jekyll/jekyll:4.2.2@sha256:400b8d1569f118bca8a3a09a25f32803b00a55d1ea241feaf5f904d66ca9c625 \
-            sh -c "jekyll build --trace && mkdir -p _site/en/css _site/ru/css && cp css/*.css _site/en/css/ && cp css/*.css _site/ru/css/"
+            sh -c "jekyll build --trace && \
+              mkdir -p _site/en/css _site/ru/css && \
+              cp css/*.css _site/en/css/ && \
+              cp css/*.css _site/ru/css/ && \
+              find _site/en -name '*.html' -exec sed -i 's|href=\"/en/|href=\"/|g' {} \; && \
+              find _site/en -name '*.html' -exec sed -i 's|src=\"/en/|src=\"/|g' {} \; && \
+              find _site/ru -name '*.html' -exec sed -i 's|href=\"/ru/|href=\"/|g' {} \; && \
+              find _site/ru -name '*.html' -exec sed -i 's|src=\"/ru/|src=\"/|g' {} \;"
 
       - name: Upload site artifact
         uses: actions/upload-artifact@v6

CNAME

@@ -1,2 +1 @@
-docs.gameap.ru
-docs.gameap.com
+docs.gameap.com

Dockerfile

@@ -7,7 +7,11 @@ WORKDIR /site
 RUN jekyll build --trace && \
     mkdir -p _site/en/css _site/ru/css && \
     cp css/*.css _site/en/css/ && \
-    cp css/*.css _site/ru/css/
+    cp css/*.css _site/ru/css/ && \
+    find _site/en -name "*.html" -exec sed -i 's|href="/en/|href="/|g' {} \; && \
+    find _site/en -name "*.html" -exec sed -i 's|src="/en/|src="/|g' {} \; && \
+    find _site/ru -name "*.html" -exec sed -i 's|href="/ru/|href="/|g' {} \; && \
+    find _site/ru -name "*.html" -exec sed -i 's|src="/ru/|src="/|g' {} \;
 
 
 FROM golang:1.25-alpine as gobuilder

Makefile

@@ -7,6 +7,9 @@ PORT := 8080
 build:
 	docker buildx build -t $(IMAGE_NAME) --load --no-cache .
 
+build-push:
+	docker buildx build -t $(IMAGE_NAME) --push --no-cache .
+
 run: build
 	docker run -d --name $(CONTAINER_NAME) -p $(PORT):80 $(IMAGE_NAME)
 	@echo "Server running at http://localhost:$(PORT)"

_config.yml

@@ -1,6 +1,11 @@
 # Site title and subtitle. This is used in _includes/header.html
 title: 'GameAP Documentation'
 
+# Domain configuration for multi-language deployment
+domains:
+  en: "https://docs.gameap.com"
+  ru: "https://docs.gameap.ru"
+
 # if you wish to integrate disqus on pages set your shortname here
 disqus_shortname: ''
 

_includes/header.html

@@ -1,4 +1,11 @@
 {% assign lang = site.data.lang[page.lang] %}
+{% assign other_lang = 'ru' %}
+{% assign other_domain = site.domains.ru %}
+{% if page.lang == 'ru' %}
+    {% assign other_lang = 'en' %}
+    {% assign other_domain = site.domains.en %}
+{% endif %}
+{% assign clean_path = page.url | replace: '/en/', '/' | replace: '/ru/', '/' %}
 
 <div class="container">
     <header id="header">
@@ -9,6 +16,9 @@
         <nav class="header-nav">
             <a href="http://gameap.com">{{ lang.site }}</a>
             <a href="https://github.com/gameap">GitHub</a>
+            <a href="{{ other_domain }}{{ clean_path }}" class="lang-switch">
+                {% if page.lang == 'en' %}RU{% else %}EN{% endif %}
+            </a>
         </nav>
     </header>
 </div>

_layouts/default.html

@@ -7,6 +7,15 @@
 
         <title>{{ site.title }}{% if page.title %} : {{ page.title }}{% endif %}</title>
 
+        {% assign clean_path = page.url | replace: '/ru/', '/' | replace: '/en/', '/' %}
+        <!-- Canonical URL -->
+        <link rel="canonical" href="{{ site.domains[page.lang] }}{{ clean_path }}">
+
+        <!-- Hreflang tags for language alternatives -->
+        <link rel="alternate" hreflang="en" href="{{ site.domains.en }}{{ clean_path }}">
+        <link rel="alternate" hreflang="ru" href="{{ site.domains.ru }}{{ clean_path }}">
+        <link rel="alternate" hreflang="x-default" href="{{ site.domains.en }}{{ clean_path }}">
+
         <link rel="stylesheet" href="{{ site.baseurl }}/css/syntax.css">
         <link rel="stylesheet" href="{{ site.baseurl }}/css/main.css">
         <link rel="stylesheet" href="{{ site.baseurl }}/css/github-markdown.css">

server/main.go

@@ -137,10 +137,14 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
 	// Check if path starts with /$lang/
 	if lang, suffix, ok := extractLangPrefix(urlPath); ok {
 		if lang == cfg.Lang {
-			// Current language - serve locally
-			serveFile(w, r, path.Join(lang, suffix))
+			// Current language - redirect to clean URL (remove /ru/ or /en/ prefix)
+			cleanURL := "/" + suffix
+			if cleanURL == "/" {
+				cleanURL = "/"
+			}
+			http.Redirect(w, r, cleanURL, http.StatusMovedPermanently)
 		} else if domain, exists := cfg.Redirects[lang]; exists {
-			// Other language from REDIRECTS - redirect
+			// Other language from REDIRECTS - redirect to other domain with clean URL
 			http.Redirect(w, r, fmt.Sprintf("https://%s/%s", domain, suffix), http.StatusMovedPermanently)
 		} else {
 			// Language not in REDIRECTS - 404