#1 Versuch FHEM nach myhome zu verschieben

Отворени
hmetzner заяви обединяване на 8 ревизии от hmetzner/fhem2myhome във hmetzner/master

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+/logs/*

+ 4 - 4
reverseproxy-compose.yml

@@ -18,8 +18,8 @@ services:
       - ./nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
       - ./logs:/var/log/nginx
     environment:
-      - VIRTUAL_HOST=wiki.metzner.selfhost.bz,fhem.metzner.selfhost.bz,cloud.metzner.selfhost.bz
-      - LETSENCRYPT_HOST=wiki.metzner.selfhost.bz,fhem.metzner.selfhost.bz,cloud.metzner.selfhost.bz
+      - VIRTUAL_HOST=cloud.metzner.selfhost.bz
+      - LETSENCRYPT_HOST=cloud.metzner.selfhost.bz
       - LETSENCRYPT_EMAIL=h.metzner@gmx.de
   myhomeproxy:
     image: nginx
@@ -38,8 +38,8 @@ services:
       - ./nginx.conf:/etc/nginx/conf.d/nginx.conf:ro
       - ./logs:/var/log/nginx
     environment:
-      - VIRTUAL_HOST=www.metzner.myhome-server.de
-      - LETSENCRYPT_HOST=www.metzner.myhome-server.de
+      - VIRTUAL_HOST=www.metzner.myhome-server.de,fhem.metzner.myhome-server.de,wiki.metzner.myhome-server.de,audio.metzner.myhome-server.de,fhem-dev.metzner.myhome-server.de
+      - LETSENCRYPT_HOST=www.metzner.myhome-server.de,fhem.metzner.myhome-server.de,wiki.metzner.myhome-server.de,audio.metzner.myhome-server.de,fhem-dev.metzner.myhome-server.de
       - LETSENCRYPT_EMAIL=h.metzner@gmx.de
 
 networks:

+ 22 - 0
sites-available/audio.nginx

@@ -0,0 +1,22 @@
+# Dokuwiki server configuration
+server {
+		listen 80;
+		server_name audio.metzner.myhome-server.de;
+		client_max_body_size      25M;
+
+		access_log            /var/log/nginx/audio.metzner.access.log;
+		error_log            /var/log/nginx/audio.metzner.error.log;
+
+		location / {
+			proxy_set_header        X-Forwarded-Host $host;
+			proxy_set_header        X-Forwarded-Server $host;
+	#		proxy_set_header        Host $host;
+			proxy_set_header        X-Real-IP $remote_addr;
+			proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+	#		proxy_set_header        X-Forwarded-Proto $scheme;
+
+			proxy_pass          http://192.168.1.37:8800/;
+			proxy_read_timeout  90;
+
+	}
+}

+ 29 - 0
sites-available/fhem-dev.nginx

@@ -0,0 +1,29 @@
+# Fhem server configuration
+server {
+		listen 80;
+		server_name fhem-dev.metzner.myhome-server.de;
+
+		access_log            /var/log/nginx/fhem-dev.metzner.access.log;
+		error_log            /var/log/nginx/fhem-dev.metzner.error.log;
+
+		location / {
+                        set $myHttpUpgrade "";
+                        set $myConnection "Connection";
+
+			proxy_set_header        Host $host;
+			proxy_set_header        X-Real-IP $remote_addr;
+			proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
+			proxy_set_header        X-Forwarded-Proto $scheme;
+                        proxy_http_version      1.1;
+
+                        if ($http_upgrade = "websocket") {
+                          set $myHttpUpgrade $http_upgrade;
+                          set $myConnection "upgrade";
+                        }
+
+                        proxy_set_header Upgrade $myHttpUpgrade;
+                        proxy_set_header Connection $myConnection;
+                        proxy_pass          http://192.168.1.146:8083;
+			#proxy_read_timeout  90;
+		}
+	}

+ 2 - 2
sites-available/fhem.nginx

@@ -1,7 +1,7 @@
 # Fhem server configuration
 server {
 		listen 80;
-		server_name fhem.metzner.selfhost.bz;
+		server_name fhem.metzner.myhome-server.de;
 
 		access_log            /var/log/nginx/fhem.metzner.access.log;
 		error_log            /var/log/nginx/fhem.metzner.error.log;
@@ -12,7 +12,7 @@ server {
 			proxy_set_header        X-Real-IP $remote_addr;
 			proxy_set_header        X-Forwarded-For $proxy_add_x_forwarded_for;
 			proxy_set_header        X-Forwarded-Proto $scheme;
-	  	proxy_pass          http://192.168.1.59:8083;
+	                proxy_pass              http://192.168.1.59:8083;
 			proxy_read_timeout  90;
 		}
 		location /fhem {

+ 1 - 1
sites-available/wiki.nginx

@@ -1,7 +1,7 @@
 # Dokuwiki server configuration
 server {
 		listen 80;
-		server_name wiki.metzner.selfhost.bz;
+		server_name wiki.metzner.myhome-server.de;
 		client_max_body_size      25M;
 
 		access_log            /var/log/nginx/wiki.metzner.access.log;

+ 1 - 0
sites-myhome/audio.myhome.nginx

@@ -0,0 +1 @@
+../sites-available/audio.nginx

+ 1 - 0
sites-myhome/fhem-dev.nginx

@@ -0,0 +1 @@
+../sites-available/fhem-dev.nginx

sites-selfhost/fhem.selfhost.nginx → sites-myhome/fhem.selfhost.nginx


sites-selfhost/wiki.selfhost.nginx → sites-myhome/wiki.selfhost.nginx