From 4d31a80fe7b1e451a995f9e0a5cb8feaca5d00d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= <john@ankarstrom.se>
Date: Sun, 18 Jul 2021 19:28:23 +0200
Subject: httpd.conf: Configure perlisdead.org

Also add redirection for git.ankarstrom.se.
---
 usr/pkg/etc/httpd/httpd.conf | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'usr')

diff --git a/usr/pkg/etc/httpd/httpd.conf b/usr/pkg/etc/httpd/httpd.conf
index 80813dc..a9f36e4 100644
--- a/usr/pkg/etc/httpd/httpd.conf
+++ b/usr/pkg/etc/httpd/httpd.conf
@@ -250,6 +250,7 @@ use Tie::DxHash;
 my %redir = (
 	'git.ankarstrom.se' => block(
 		RewriteRule => '^Apache-Inject\.git/?$ /cpan/Apache-Inject/ [L,R,END]',
+		RewriteRule => '^vix/?$ /exrc/ [L,R,END]',
 		RewriteRule => '^([^/]*)\.git(/.*)?$ /$1$2 [L,R,END]',
 	),
 	'john.ankarstrom.se' => block(
@@ -290,6 +291,7 @@ vhost block(ServerName => 'git.ankarstrom.se',
 		Options => '+ExecCGI',
 		AddHandler => 'cgi-script .cgi',
 		RewriteEngine => 'On',
+		%{$redir{'git.ankarstrom.se'}},
 		RewriteCond => '%{REQUEST_FILENAME} !-f',
 		RewriteCond => '%{REQUEST_FILENAME} !-d',
 		RewriteRule => '(.*) cgit.cgi/$1 [END,QSA]',
@@ -302,7 +304,8 @@ vhost block(ServerName => 'john.ankarstrom.se');
 vhost block(ServerName => 'mail.ankarstrom.se');
 vhost block(ServerName => 'software.ankarstrom.se');
 vhost block(ServerName => 'perlisdead.org',
-	DocumentRoot => '/var/www/perlisdead/out');
+	DocumentRoot => '/var/www/perlisdead/out'
+);
 
 # Default virtual host configuration
 
-- 
cgit v1.2.3