The '<--#if expr...' magic I was using had stopped working. This
changeset fixes that. It also cleans up the .htaccess files (most of
which were rm'd)
* templates/header.template: Update to use "ap_expr" syntax.
* .htaccess: Use Apache 2.4.x access control with 'Require'
* changes/.htaccess: Removed. It wasn't doing anything that
wasn't aleady covered in the top-level .htaccess.
* docs/.htaccess: Ditto.
* people/.htaccess: Ditto.
Signed-off-by: Steve Youngs <steve@sxemacs.org>
-Options Indexes Includes
+Options +Indexes +Includes
XBitHack On
AddType text/html .template
AddOutputFilter INCLUDES .template
XBitHack On
AddType text/html .template
AddOutputFilter INCLUDES .template
-SetEnvIf User-Agent "git/*" BadGuy=1
-Order allow,deny
-Deny from env=BadGuy
-Allow from all
## Dreamhost Affiliate Rewrite
<IfModule mod_rewrite.c>
## Dreamhost Affiliate Rewrite
<IfModule mod_rewrite.c>
+++ /dev/null
-Options Indexes Includes
-XBitHack On
-AddType text/html .template
-AddOutputFilter INCLUDES .template
-
-## Dreamhost Affiliate Rewrite
-<IfModule mod_rewrite.c>
- Options +FollowSymlinks
- RewriteEngine On
- RewriteBase /
- RewriteCond %{REQUEST_URI} ^/hosting$ [NC]
- RewriteRule ^(.*)$ https://www.dreamhost.com/r.cgi?606408 [L]
-</IfModule>
-## End Dreamhost
+++ /dev/null
-Options Indexes Includes
-XBitHack On
-AddType text/html .template
-AddOutputFilter INCLUDES .template
-
-## Dreamhost Affiliate Rewrite
-<IfModule mod_rewrite.c>
- Options +FollowSymlinks
- RewriteEngine On
- RewriteBase /
- RewriteCond %{REQUEST_URI} ^/hosting$ [NC]
- RewriteRule ^(.*)$ https://www.dreamhost.com/r.cgi?606408 [L]
-</IfModule>
-## End Dreamhost
+++ /dev/null
-Options Indexes Includes
-XBitHack On
-AddType text/html .template
-AddOutputFilter INCLUDES .template
-
-## Dreamhost Affiliate Rewrite
-<IfModule mod_rewrite.c>
- Options +FollowSymlinks
- RewriteEngine On
- RewriteBase /
- RewriteCond %{REQUEST_URI} ^/hosting$ [NC]
- RewriteRule ^(.*)$ https://www.dreamhost.com/r.cgi?606408 [L]
-</IfModule>
-## End Dreamhost
<link href="/twitter.css" type="text/css" rel="stylesheet" />
<link href="/Images/favicon.png" rel="icon" type="image/png" />
<meta name="generator" content="SXEmacs, see: www.sxemacs.org" />
<link href="/twitter.css" type="text/css" rel="stylesheet" />
<link href="/Images/favicon.png" rel="icon" type="image/png" />
<meta name="generator" content="SXEmacs, see: www.sxemacs.org" />
- <!--#if expr='"$DOCUMENT_URI" = "/index.html"' -->
+ <!--#if expr='"%{DOCUMENT_URI}" == "/index.html"' -->
<!--#include virtual="/templates/top-meta.template" -->
<!--#include virtual="/templates/top-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/amazon.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/amazon.html"' -->
<!--#include virtual="/templates/amazon-meta.template" -->
<!--#include virtual="/templates/amazon-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/store.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/store.html"' -->
<!--#include virtual="/templates/store-meta.template" -->
<!--#include virtual="/templates/store-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/changes/changes.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/changes/changes.html"' -->
<!--#include virtual="/templates/changes-meta.template" -->
<!--#include virtual="/templates/changes-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/docs/index.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/docs/index.html"' -->
<!--#include virtual="/templates/docs-meta.template" -->
<!--#include virtual="/templates/docs-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/download.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/download.html"' -->
<!--#include virtual="/templates/download-meta.template" -->
<!--#include virtual="/templates/download-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/screenshots.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/screenshots.html"' -->
<!--#include virtual="/templates/screenshots-meta.template" -->
<!--#include virtual="/templates/screenshots-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/irc.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/irc.html"' -->
<!--#include virtual="/templates/irc-meta.template" -->
<!--#include virtual="/templates/irc-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/lists.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/lists.html"' -->
<!--#include virtual="/templates/lists-meta.template" -->
<!--#include virtual="/templates/lists-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/news.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/news.html"' -->
<!--#include virtual="/templates/news-meta.template" -->
<!--#include virtual="/templates/news-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/people.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/people.html"' -->
<!--#include virtual="/templates/people-meta.template" -->
<!--#include virtual="/templates/people-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/people/hroptatyr.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/people/hroptatyr.html"' -->
<!--#include virtual="/templates/hroptatyr-meta.template" -->
<!--#include virtual="/templates/hroptatyr-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/people/lg.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/people/lg.html"' -->
<!--#include virtual="/templates/lg-meta.template" -->
<!--#include virtual="/templates/lg-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/people/njsf.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/people/njsf.html"' -->
<!--#include virtual="/templates/njsf-meta.template" -->
<!--#include virtual="/templates/njsf-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/people/steve.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/people/steve.html"' -->
<!--#include virtual="/templates/steve-meta.template" -->
<!--#include virtual="/templates/steve-meta.template" -->
- <!--#elif expr='"$DOCUMENT_URI" = "/thanks.html"' -->
+ <!--#elif expr='"%{DOCUMENT_URI}" == "/thanks.html"' -->
<!--#include virtual="/templates/thanks-meta.template" -->
<!--#endif -->
<title><!--#echo var="title" --></title>
<!--#include virtual="/templates/thanks-meta.template" -->
<!--#endif -->
<title><!--#echo var="title" --></title>