From dafb21adc4bd2412e5e76f185e9739725d79bfcc Mon Sep 17 00:00:00 2001
From: "The repo.or.cz admin team" <admin@repo.or.cz>
Date: Sat, 18 Jul 2020 08:20:14 +0200
Subject: [PATCH] apache.conf.in: redirect www.repo.or.cz to repo.or.cz

Signed-off-by: The repo.or.cz admin team <admin@repo.or.cz>
---
 apache.conf.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apache.conf.in b/apache.conf.in
index d2fbd9b..15ffdba 100644
--- a/apache.conf.in
+++ b/apache.conf.in
@@ -5,14 +5,16 @@
 # at repo.or.cz; unfortunately, somewhat independent from Girocco::Config.
 # It is not essential for Girocco to use a special virtualhost, however.
 <VirtualHost *:80>
-	<IfDefine @@TLSHost@@>
 	<IfModule rewrite_module>
 		RewriteEngine on
+		RewriteCond %{SERVER_NAME} !=@@httpdnsname@@
+		RewriteRule ^ http://@@httpdnsname@@%{REQUEST_URI} [L,NE,R=301]
+	<IfDefine @@TLSHost@@>
 		RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/
 		RewriteCond %{SERVER_NAME} =@@httpdnsname@@
 		RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [L,NE,R=301]
-	</IfModule>
 	</IfDefine>
+	</IfModule>
 
 	Alias /.well-known/acme-challenge/ @@webroot@@/../certs/acme/.well-known/acme-challenge/
 	<Directory "@@webroot@@/../certs/acme/.well-known/acme-challenge/">
-- 
2.11.4.GIT