diff --git a/nohix/apache.conf b/nohix/apache.conf
index e84290d..86523dd 100644
--- a/nohix/apache.conf
+++ b/nohix/apache.conf
@@ -1,39 +1,16 @@
ServerName nohix.metanohi.name
- ServerAlias www.nohix.metanohi.name nohix.lcl
+ ServerAlias www.nohix.metanohi.name
ServerAdmin ngws@metanohi.name
- DocumentRoot /home/niels/www/meta/subsites/nohix
-
+ DocumentRoot /home/niels/prog/metanohi-misc-subsites/nohix
+
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Require all granted
LogLevel warn
- ErrorLog /var/log/httpd/nohix.metanohi.name-error.log
- CustomLog /var/log/httpd/nohix.metanohi.name-access.log combined
-
-
-
- ServerName nohix.metanohi.name
- ServerAlias www.nohix.metanohi.name nohix.lcl
- ServerAdmin ngws@metanohi.name
-
- DocumentRoot /home/niels/www/meta/subsites/nohix
-
- Options Indexes Includes FollowSymLinks MultiViews
- AllowOverride All
- Require all granted
-
-
- LogLevel warn
- 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
+ ErrorLog ${APACHE_LOG_DIR}/error-nohix.metanohi.name.log
+ CustomLog ${APACHE_LOG_DIR}/access-nohix.metanohi.name.log combined
diff --git a/old-projects/.htaccess b/old-projects/.htaccess
deleted file mode 100644
index 29a2a6a..0000000
--- a/old-projects/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-ErrorDocument 404 /.redirect.php
diff --git a/old-projects/.redirect.php b/old-projects/.redirect.php
deleted file mode 100644
index 3682b5b..0000000
--- a/old-projects/.redirect.php
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/old-projects/apache.conf b/old-projects/apache.conf
index 5be4d2b..20769dd 100644
--- a/old-projects/apache.conf
+++ b/old-projects/apache.conf
@@ -3,37 +3,14 @@
ServerAlias www.old-projects.metanohi.name projects.metanohi.name www.projects.metanohi.name
ServerAdmin ngws@metanohi.name
- DocumentRoot /home/niels/www/meta/subsites/projects
-
+ DocumentRoot /home/niels/prog/metanohi-misc-subsites/old-projects
+
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride All
Require all granted
- LogLevel warn
- 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
- ServerAdmin ngws@metanohi.name
-
- DocumentRoot /home/niels/www/meta/subsites/projects
-
- Options Indexes Includes FollowSymLinks MultiViews
- AllowOverride All
- Require all granted
-
-
- LogLevel warn
- 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
+ LogLevel warn
+ ErrorLog ${APACHE_LOG_DIR}/error-old-projects.metanohi.name.log
+ CustomLog ${APACHE_LOG_DIR}/access-old-projects.metanohi.name.log combined
diff --git a/old-projects/view.php b/old-projects/view.php
deleted file mode 100644
index 94027e8..0000000
--- a/old-projects/view.php
+++ /dev/null
@@ -1,7 +0,0 @@
-