From f70b4ac0b1e1e3e722ff01eaca76ca9c2c84d8c2 Mon Sep 17 00:00:00 2001 From: "Niels G. W. Serup" Date: Fri, 1 Aug 2014 18:07:15 +0200 Subject: [PATCH] fixed apache configs and the like --- subsites/hvy-apache | 20 ++++++++----------- subsites/natur-apache | 32 +++++++++++++++++++----------- subsites/natur/index.php | 2 +- subsites/nohix-apache | 16 ++++++--------- subsites/nohix/index.php | 12 +++++------ subsites/oldsites-apache | 43 ---------------------------------------- subsites/projects-apache | 22 ++++++++------------ subsites/suum-apache | 2 -- subsites/words-apache | 18 +++++++---------- 9 files changed, 56 insertions(+), 111 deletions(-) delete mode 100644 subsites/oldsites-apache diff --git a/subsites/hvy-apache b/subsites/hvy-apache index 57bc2c7..b16a3a8 100644 --- a/subsites/hvy-apache +++ b/subsites/hvy-apache @@ -1,43 +1,39 @@ 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 Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 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 Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 - diff --git a/subsites/natur-apache b/subsites/natur-apache index ac906af..02845e8 100644 --- a/subsites/natur-apache +++ b/subsites/natur-apache @@ -1,6 +1,6 @@ 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 @@ Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted + + + + Options Indexes Includes FollowSymLinks MultiViews + AllowOverride All + Require all granted 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 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 @@ Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted + + + + Options Indexes Includes FollowSymLinks MultiViews + AllowOverride All + Require all granted 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 - diff --git a/subsites/natur/index.php b/subsites/natur/index.php index 538d8b1..4f1748d 100644 --- a/subsites/natur/index.php +++ b/subsites/natur/index.php @@ -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]; diff --git a/subsites/nohix-apache b/subsites/nohix-apache index 0a8c085..e84290d 100644 --- a/subsites/nohix-apache +++ b/subsites/nohix-apache @@ -7,14 +7,12 @@ Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 @@ -26,18 +24,16 @@ Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 - diff --git a/subsites/nohix/index.php b/subsites/nohix/index.php index 72a81f1..6a3fe4b 100644 --- a/subsites/nohix/index.php +++ b/subsites/nohix/index.php @@ -137,12 +137,12 @@

About

diff --git a/subsites/oldsites-apache b/subsites/oldsites-apache deleted file mode 100644 index 5afe3b7..0000000 --- a/subsites/oldsites-apache +++ /dev/null @@ -1,43 +0,0 @@ - - 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 - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Order allow,deny - allow from all - - - LogLevel warn - ErrorLog /var/log/apache2/old.projects.metanohi.name-error.log - CustomLog /var/log/apache2/old.projects.metanohi.name-access.log combined - - - - - 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 - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Order allow,deny - allow from all - - - 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 - - diff --git a/subsites/projects-apache b/subsites/projects-apache index dcfb141..0115ce4 100644 --- a/subsites/projects-apache +++ b/subsites/projects-apache @@ -1,45 +1,39 @@ - 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 Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 - 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 Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 - diff --git a/subsites/suum-apache b/subsites/suum-apache index f4c5850..9b1870c 100644 --- a/subsites/suum-apache +++ b/subsites/suum-apache @@ -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 - @@ -37,5 +36,4 @@ SSLCertificateKeyFile /home/niels/www/meta/metanohi_privatekey.pem SSLCipherSuite HIGH SSLProtocol all -SSLv2 - diff --git a/subsites/words-apache b/subsites/words-apache index cca77cb..1720be8 100644 --- a/subsites/words-apache +++ b/subsites/words-apache @@ -1,20 +1,18 @@ 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 Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 @@ -26,18 +24,16 @@ Options Indexes Includes FollowSymLinks MultiViews AllowOverride All - Order allow,deny - allow from all + Require all granted 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 -