fixed apache configs and the like

This commit is contained in:
Niels G. W. Serup 2014-08-01 18:07:15 +02:00
parent 8064807933
commit f70b4ac0b1
9 changed files with 56 additions and 111 deletions

View File

@ -1,43 +1,39 @@
<VirtualHost *:80>
ServerName hvy.metanohi.name
ServerAlias www.hvy.metanohi.name hvy.lcl
ServerAlias www.hvy.metanohi.name
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/heavy
<Directory /home/niels/www/meta/heavy/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/hvy.metanohi.name-error.log
CustomLog /var/log/apache2/hvy.metanohi.name-access.log combined
ErrorLog /var/log/httpd/hvy.metanohi.name-error.log
CustomLog /var/log/httpd/hvy.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
ServerName hvy.metanohi.name
ServerAlias www.hvy.metanohi.name hvy.lcl
ServerAlias www.hvy.metanohi.name
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/heavy
<Directory /home/niels/www/meta/heavy/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/hvy.metanohi.name-error.log
CustomLog /var/log/apache2/hvy.metanohi.name-access.log combined
ErrorLog /var/log/httpd/hvy.metanohi.name-error.log
CustomLog /var/log/httpd/hvy.metanohi.name-access.log combined
SSLEngine on
SSLCertificateFile /home/niels/www/meta/metanohi_server.pem
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>

View File

@ -1,6 +1,6 @@
<VirtualHost *:80>
ServerName natur.metanohi.name
ServerAlias www.natur.metanohi.name nature.metanohi.name www.nature.metanohi.name natur.lcl
ServerAlias www.natur.metanohi.name nature.metanohi.name www.nature.metanohi.name
ServerAdmin ngws@metanohi.name
Alias /vid /home/niels/www/meta/heavy/naturefilms
@ -9,19 +9,23 @@
<Directory /home/niels/www/meta/subsites/natur/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
<Directory /home/niels/www/meta/heavy/naturefilms/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/natur.metanohi.name-error.log
CustomLog /var/log/apache2/natur.metanohi.name-access.log combined
ErrorLog /var/log/httpd/natur.metanohi.name-error.log
CustomLog /var/log/httpd/natur.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
ServerName natur.metanohi.name
ServerAlias www.natur.metanohi.name nature.metanohi.name www.nature.metanohi.name natur.lcl
ServerAlias www.natur.metanohi.name nature.metanohi.name www.nature.metanohi.name
ServerAdmin ngws@metanohi.name
Alias /vid /home/niels/www/meta/heavy/naturefilms
@ -30,18 +34,22 @@
<Directory /home/niels/www/meta/subsites/natur/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
<Directory /home/niels/www/meta/heavy/naturefilms/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/natur.metanohi.name-error.log
CustomLog /var/log/apache2/natur.metanohi.name-access.log combined
ErrorLog /var/log/httpd/natur.metanohi.name-error.log
CustomLog /var/log/httpd/natur.metanohi.name-access.log combined
SSLEngine on
SSLCertificateFile /home/niels/www/meta/metanohi_server.pem
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>

View File

@ -2,7 +2,7 @@
$u = $_SERVER['REQUEST_URI'];
if (substr($u, strlen($u)-1) == '/') {
$u = substr($u, 0, strlen($u)-1);
header("Location: $u");
//header("Location: $u");
}
$u = explode('/', $u);
$u = $u[sizeof($u)-1];

View File

@ -7,14 +7,12 @@
<Directory /home/niels/www/meta/subsites/nohix/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/nohix.metanohi.name-error.log
CustomLog /var/log/apache2/nohix.metanohi.name-access.log combined
ErrorLog /var/log/httpd/nohix.metanohi.name-error.log
CustomLog /var/log/httpd/nohix.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
@ -26,18 +24,16 @@
<Directory /home/niels/www/meta/subsites/nohix/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/nohix.metanohi.name-error.log
CustomLog /var/log/apache2/nohix.metanohi.name-access.log combined
ErrorLog /var/log/httpd/nohix.metanohi.name-error.log
CustomLog /var/log/httpd/nohix.metanohi.name-access.log combined
SSLEngine on
SSLCertificateFile /home/niels/www/meta/metanohi_server.pem
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>

View File

@ -137,12 +137,12 @@
<h2>About</h2>
<ul>
<li><p>This website is <a href="http://metanohi.org/about/niels"><em>Niels</em></a>' playground.</p></li>
<li><p>It contains mainly JavaScript tests.</p></li>
<li><p><em>Niels</em> is not that fond of JavaScript, but he can't help but play with it. He thinks it's a disease.</p></li>
<li><p>The logo (<a href="media/nohix-logo.svg">also available in SVG<a/>) is licensed under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Attribution-Share Alike 3.0 Unported license</a>. Niels is the author.</p></li>
<li><p>The PHP source code is available <a href="http://metanohi.org/:nohix/index.php">here<a/>.</p></li>
<li><p>You might not also want to check out <a href="http://projects.metanohi.name/x/">this<a/>, which was the inspiration for nohiX.</p></li>
<li>This website is <a href="http://metanohi.name/about/niels"><em>Niels</em></a>' playground. <b>[OLD]</b></li>
<li>It contains mainly JavaScript tests.</li>
<li><em>Niels</em> is not that fond of JavaScript, but he can't help but play with it. He thinks it's a disease.</li>
<li>The logo (<a href="media/nohix-logo.svg">also available in SVG<a/>) is free under the <a href="http://wtfpl.net">Do What The Fuck You Want To Public License, Version 2</a>. Niels is the author.</li>
<li>The PHP source code is available in the git repo described <a href="http://metanohi.name/about/">here<a/>.</li>
<li>You might not also want to check out <a href="http://projects.metanohi.name/x/">this<a/>, which was the inspiration for nohiX.</li>
</ul>
<div>

View File

@ -1,43 +0,0 @@
<VirtualHost *:80>
ServerName old.projects.metanohi.name
ServerAlias www.old.projects.metanohi.name old.projects.lcl
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/subsites/oldsites
<Directory /home/niels/www/meta/subsites/oldsites/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/old.projects.metanohi.name-error.log
CustomLog /var/log/apache2/old.projects.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
ServerName old.projects.metanohi.name
ServerAlias www.old.projects.metanohi.name old.projects.lcl
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/subsites/oldsites
<Directory /home/niels/www/meta/subsites/oldsites/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/old.projects.metanohi.name-error.log
CustomLog /var/log/apache2/old.projects.metanohi.name-access.log combined
SSLEngine on
SSLCertificateFile /home/niels/www/meta/metanohi_server.pem
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>

View File

@ -1,45 +1,39 @@
<VirtualHost *:80>
ServerName projects.metanohi.name
ServerAlias www.projects.metanohi.name projects.lcl
ServerAlias www.projects.metanohi.name
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/subsites/projects
<Directory /home/niels/www/meta/subsites/projects/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/projects.metanohi.name-error.log
CustomLog /var/log/apache2/projects.metanohi.name-access.log combined
ErrorLog /var/log/httpd/projects.metanohi.name-error.log
CustomLog /var/log/httpd/projects.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
ServerName projects.metanohi.name
ServerAlias www.projects.metanohi.name projects.lcl
ServerAlias www.projects.metanohi.name
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/subsites/projects
<Directory /home/niels/www/meta/subsites/projects/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/projects.metanohi.name-error.log
CustomLog /var/log/apache2/projects.metanohi.name-access.log combined
ErrorLog /var/log/httpd/projects.metanohi.name-error.log
CustomLog /var/log/httpd/projects.metanohi.name-access.log combined
SSLEngine on
SSLCertificateFile /home/niels/www/meta/metanohi_server.pem
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>

View File

@ -13,7 +13,6 @@
LogLevel warn
ErrorLog /var/log/httpd/suum.metanohi.name-error.log
CustomLog /var/log/httpd/suum.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
@ -37,5 +36,4 @@
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>

View File

@ -1,20 +1,18 @@
<VirtualHost *:80>
ServerName words.metanohi.name
ServerAlias www.words.metanohi.name words.lcl
ServerAlias www.words.metanohi.name
ServerAdmin ngws@metanohi.name
DocumentRoot /home/niels/www/meta/subsites/words
<Directory /home/niels/www/meta/subsites/words/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/words.metanohi.name-error.log
CustomLog /var/log/apache2/words.metanohi.name-access.log combined
ErrorLog /var/log/httpd/words.metanohi.name-error.log
CustomLog /var/log/httpd/words.metanohi.name-access.log combined
</VirtualHost>
<VirtualHost *:443>
@ -26,18 +24,16 @@
<Directory /home/niels/www/meta/subsites/words/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Order allow,deny
allow from all
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/words.metanohi.name-error.log
CustomLog /var/log/apache2/words.metanohi.name-access.log combined
ErrorLog /var/log/httpd/words.metanohi.name-error.log
CustomLog /var/log/httpd/words.metanohi.name-access.log combined
SSLEngine on
SSLCertificateFile /home/niels/www/meta/metanohi_server.pem
SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem
SSLCipherSuite HIGH
SSLProtocol all -SSLv2
</VirtualHost>