Merged

1 files changed, 24 insertions, 7 deletions

diff --git a/resources/www.gospeladlershof.conf b/resources/www.gospeladlershof.conf
index 9643cbb..0a3ac92 100644
--- a/resources/www.gospeladlershof.conf
+++ b/resources/www.gospeladlershof.conf
@@ -1,6 +1,15 @@
 server {
 	listen 80;
-	listen 443 ssl;
+	include		snippets/letsencrypt.conf;
+        server_name 	www.gospeladlershof.de;
+
+	location / {
+		return 301 https://$server_name$request_uri;
+	}
+}
+
+server {
+	listen 443 ssl http2;
 	include		snippets/letsencrypt.conf;
         server_name 	www.gospeladlershof.de;
 	root            /var/www/gospeladlershof.de/gospeladlershof.de;
@@ -13,13 +22,17 @@ server {
 	include                 /etc/nginx/conf.d/nginx_conf/ssl_conf;
 	ssl_certificate         /var/lib/acme/live/www.gospeladlershof.de/fullchain;
 	ssl_certificate_key     /var/lib/acme/live/www.gospeladlershof.de/privkey;
-	#include		conf.d/nginx_conf/robots.conf;
+	#include			conf.d/nginx_conf/robots.conf;
 
 	error_page 404          /404.html;
 
+	# Solange wir keine ordentlichen Bilder haben wird nichts richtig gecacht.
         location ~* \.(jpe?g|png|gif|css|js|swf|txt|ico|woff2?|ttf|svg)$ {
-        #        expires         365d;
+        #       expires         365d;
                 expires         10m;
+	#	add_header 	"Access-Control-Allow-Origin" "intern.gospeladlershof.de";
+		add_header 	"Access-Control-Allow-Origin" "*";
+	#	add_header	"Vary" "Accept-Encoding";
         }
 
 
@@ -35,6 +48,11 @@ server {
 
 	location ~ ^/api/v1/{
 		rewrite ^/api/v1/([a-zA-Z]+)/? /intern/api/$1.php last;
+		location ~ \.php$ {
+			include         snippets/fastcgi-php.conf;
+			fastcgi_read_timeout 300; 
+			fastcgi_pass    unix:/var/run/php5-fpm.sock;
+		}
 	}
 
 	location /intern/api {
@@ -46,10 +64,12 @@ server {
 		}
 	}
 
+	include conf.d/nginx_conf/restrict.conf;
+
 	# pagespeed
 
-	pagespeed on;
 	include 			/etc/nginx/conf.d/nginx_conf/pagespeed.conf;
+	pagespeed off;
 
 	pagespeed EnableFilters 	remove_comments;
 	pagespeed EnableFilters 	collapse_whitespace;
@@ -80,8 +100,5 @@ server {
 	pagespeed EnableFilters		prioritize_critical_css;
 	pagespeed EnableFilters		rewrite_style_attributes_with_url;
 	pagespeed EnableFilters		sprite_images;
-
-	include conf.d/nginx_conf/restrict.conf;
-
 }