From 47848fa1b6f2d400afd52e80048f00724d149fe1 Mon Sep 17 00:00:00 2001 From: "Niels G. W. Serup" Date: Sat, 3 Sep 2016 15:16:39 +0200 Subject: [PATCH] natur fix --- natur/apache.conf | 55 ------------------------------------------- natur/nginx/base.conf | 11 +++++++++ natur/nginx/site.conf | 19 +++++++++++++++ natur/vid | 1 + 4 files changed, 31 insertions(+), 55 deletions(-) delete mode 100644 natur/apache.conf create mode 100644 natur/nginx/base.conf create mode 100644 natur/nginx/site.conf create mode 120000 natur/vid diff --git a/natur/apache.conf b/natur/apache.conf deleted file mode 100644 index 02845e8..0000000 --- a/natur/apache.conf +++ /dev/null @@ -1,55 +0,0 @@ - - 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 - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - - - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - - - LogLevel warn - 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 - ServerAdmin ngws@metanohi.name - - Alias /vid /home/niels/www/meta/heavy/naturefilms - - DocumentRoot /home/niels/www/meta/subsites/natur - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - - - - Options Indexes Includes FollowSymLinks MultiViews - AllowOverride All - Require all granted - - - 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 - diff --git a/natur/nginx/base.conf b/natur/nginx/base.conf new file mode 100644 index 0000000..c76fa13 --- /dev/null +++ b/natur/nginx/base.conf @@ -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; diff --git a/natur/nginx/site.conf b/natur/nginx/site.conf new file mode 100644 index 0000000..089d11b --- /dev/null +++ b/natur/nginx/site.conf @@ -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; +} diff --git a/natur/vid b/natur/vid new file mode 120000 index 0000000..0602803 --- /dev/null +++ b/natur/vid @@ -0,0 +1 @@ +/home/niels/prog/media/extern/natur3/ \ No newline at end of file