natur fix

This commit is contained in:
Niels G. W. Serup 2016-09-03 15:16:39 +02:00
parent 020cca6871
commit 47848fa1b6
4 changed files with 31 additions and 55 deletions

View File

@ -1,55 +0,0 @@
<VirtualHost *:80>
ServerName natur.metanohi.name
ServerAlias www.natur.metanohi.name nature.metanohi.name www.nature.metanohi.name
ServerAdmin ngws@metanohi.name
Alias /vid /home/niels/www/meta/heavy/naturefilms
DocumentRoot /home/niels/www/meta/subsites/natur
<Directory /home/niels/www/meta/subsites/natur/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride 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/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
ServerAdmin ngws@metanohi.name
Alias /vid /home/niels/www/meta/heavy/naturefilms
DocumentRoot /home/niels/www/meta/subsites/natur
<Directory /home/niels/www/meta/subsites/natur/>
Options Indexes Includes FollowSymLinks MultiViews
AllowOverride 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/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>

11
natur/nginx/base.conf Normal file
View File

@ -0,0 +1,11 @@
server_name natur.metanohi.name www.natur.metanohi.name nature.metanohi.name www.nature.metanohi.name;
root /home/niels/prog/metanohi-misc-subsites/natur;
index index.html index.php;
location ~ \.php$ {
include snippets/fastcgi-php.conf;
fastcgi_pass unix:/run/php/php7.0-fpm.sock;
}
error_page 404 /index.php;

19
natur/nginx/site.conf Normal file
View File

@ -0,0 +1,19 @@
server {
listen 80;
listen [::]:80;
include /etc/nginx/snippets/letsencrypt.conf;
include /etc/nginx/basics/niels/natur.metanohi.name.conf;
}
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
ssl_certificate /etc/letsencrypt/live/natur.metanohi.name/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/natur.metanohi.name/privkey.pem;
ssl_trusted_certificate /etc/letsencrypt/live/natur.metanohi.name/fullchain.pem;
include /etc/nginx/snippets/ssl.conf;
include /etc/nginx/basics/niels/natur.metanohi.name.conf;
}

1
natur/vid Symbolic link
View File

@ -0,0 +1 @@
/home/niels/prog/media/extern/natur3/