From e603c0e666efef1c94306f5684043a0751566f61 Mon Sep 17 00:00:00 2001
From: kpcyrd <git@rxv.cc>
Date: Fri, 14 Nov 2014 23:50:14 +0000
Subject: [PATCH] Revert "This should work"

This reverts commit 8a848b349e6e4b2c6ed636e36e92bd7fe713ddd9.
---
 sites-available/default_ffhh      | 1 +
 sites-available/formular_ffhh     | 1 +
 sites-available/graph_ffhh        | 1 +
 sites-available/mail              | 4 ++--
 sites-available/meta_ffhh         | 1 +
 sites-available/monitor_ffhh      | 2 +-
 sites-available/opkg_ffhh         | 1 +
 sites-available/postfixadmin_ffhh | 2 ++
 sites-available/start_ffhh        | 1 +
 sites-available/wordpress_ffhh    | 6 ++++--
 10 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/sites-available/default_ffhh b/sites-available/default_ffhh
index 910d18d..f449b36 100644
--- a/sites-available/default_ffhh
+++ b/sites-available/default_ffhh
@@ -1,4 +1,5 @@
 server {
+	listen 80 default_server;
         listen [::]:80 default_server;
 
 	root /var/www/wordpress; #/usr/share/nginx/html;
diff --git a/sites-available/formular_ffhh b/sites-available/formular_ffhh
index 844ee16..847c19e 100644
--- a/sites-available/formular_ffhh
+++ b/sites-available/formular_ffhh
@@ -1,4 +1,5 @@
 server {
+	listen   80;
 	listen   [::]:80;
 	server_name formular.hamburg.freifunk.net formular.services.ffhh formular.ffhh;
 
diff --git a/sites-available/graph_ffhh b/sites-available/graph_ffhh
index c294924..bb01f6e 100644
--- a/sites-available/graph_ffhh
+++ b/sites-available/graph_ffhh
@@ -1,4 +1,5 @@
 server {
+	listen			80;
 	listen			[::]:80;
 	server_name		graph.hamburg.freifunk.net knotengraph.ffhh;
 
diff --git a/sites-available/mail b/sites-available/mail
index 7cf4ed8..952826b 100644
--- a/sites-available/mail
+++ b/sites-available/mail
@@ -1,5 +1,5 @@
 server {
-	listen [::]:80;
+	listen 80;
 
 	server_name _;
 
@@ -13,7 +13,7 @@ server {
 }
 
 server {
-	listen [::]:443;
+	listen 443;
 
 	server_name _;
 
diff --git a/sites-available/meta_ffhh b/sites-available/meta_ffhh
index b2b6f71..ddfe1b8 100644
--- a/sites-available/meta_ffhh
+++ b/sites-available/meta_ffhh
@@ -1,4 +1,5 @@
 server {
+	listen   80;
 	listen   [::]:80; 
 	server_name meta.hamburg.freifunk.net;
 
diff --git a/sites-available/monitor_ffhh b/sites-available/monitor_ffhh
index 473c591..adb4074 100644
--- a/sites-available/monitor_ffhh
+++ b/sites-available/monitor_ffhh
@@ -1,5 +1,5 @@
 server {
-    listen [::]:80;
+    listen 80;
     server_name dev.hamburg.freifunk.net;
    
     access_log off; # Bitte nicht aktivieren. Wir wollen ja nicht die IPs unserer Visitor loggen.
diff --git a/sites-available/opkg_ffhh b/sites-available/opkg_ffhh
index 4a5ffb5..41e4d40 100644
--- a/sites-available/opkg_ffhh
+++ b/sites-available/opkg_ffhh
@@ -1,4 +1,5 @@
 server {
+	#listen   80;
 	listen   [::]:80;
 	server_name opkg.services.ffhh;
 
diff --git a/sites-available/postfixadmin_ffhh b/sites-available/postfixadmin_ffhh
index 5523e05..13005af 100644
--- a/sites-available/postfixadmin_ffhh
+++ b/sites-available/postfixadmin_ffhh
@@ -1,6 +1,7 @@
 # HTTP redirect to HTTPS
 
 server {
+	listen		80;
         listen [::]:80;
 #        listen          443; 
 	server_name	postmaster.hamburg.freifunk.net postmaster.services.ffhh;
@@ -17,6 +18,7 @@ server {
 # HTTPS server
 
 server {
+	listen                      	443;
 	listen                      	[::]443;
 	server_name			postmaster.hamburg.freifunk.net postmaster.services.ffhh;
 	access_log off; # Bitte nicht aktivieren. Wir wollen ja nicht die IPs unserer Visitor loggen.
diff --git a/sites-available/start_ffhh b/sites-available/start_ffhh
index b1038d9..32e2870 100644
--- a/sites-available/start_ffhh
+++ b/sites-available/start_ffhh
@@ -1,4 +1,5 @@
 server {
+	listen   80;
 	listen   [::]:80;
 	server_name start.hamburg.freifunk.net start.ffhh;
 
diff --git a/sites-available/wordpress_ffhh b/sites-available/wordpress_ffhh
index 1baa9a8..da385cb 100644
--- a/sites-available/wordpress_ffhh
+++ b/sites-available/wordpress_ffhh
@@ -1,5 +1,6 @@
 server {
-	listen				[::]:80;
+	listen				80;		# ipv4 http
+	listen				[::]:80;	# ipv6 http
 
 	server_name			hamburg.freifunk.net www.hamburg.freifunk.net freifunk.ffhh;
     access_log off; # Bitte nicht aktivieren. Wir wollen ja nicht die IPs unserer Visitor loggen.
@@ -8,7 +9,8 @@ server {
 }
 
 server {
-	listen				[::]:443 ssl;
+	listen				443 ssl;	# ipv4 https
+	listen				[::]:443 ssl;	# ipv6 https
 
 	server_name			hamburg.freifunk.net www.hamburg.freifunk.net freifunk.ffhh;