package fixes

3 files changed, 20 insertions, 20 deletions

diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf
index abc8c256..8cfde430 100644
--- a/configs/nginx/nginx.conf
+++ b/configs/nginx/nginx.conf
@@ -1,7 +1,7 @@
 user http;
 worker_processes 4;
 
-# error_log /tmp/nginx.error.log;
+# error_log /tmp/kvmd-nginx.error.log;
 error_log stderr;
 
 include /usr/share/kvmd/extras/*/nginx.ctx-main.conf;
@@ -15,7 +15,7 @@ events {
 http {
 	access_log off;
 
-	include /etc/nginx/mime-types.conf;
+	include /etc/kvmd/nginx/mime-types.conf;
 	default_type application/octet-stream;
 	charset utf-8;
 
@@ -28,11 +28,11 @@ http {
 	keepalive_timeout 10;
 	client_max_body_size 4k;
 
-	client_body_temp_path	/tmp/nginx.client_body_temp;
-	fastcgi_temp_path		/tmp/nginx.fastcgi_temp;
-	proxy_temp_path			/tmp/nginx.proxy_temp;
-	scgi_temp_path			/tmp/nginx.scgi_temp;
-	uwsgi_temp_path			/tmp/nginx.uwsgi_temp;
+	client_body_temp_path	/tmp/kvmd-nginx.client_body_temp;
+	fastcgi_temp_path		/tmp/kvmd-nginx.fastcgi_temp;
+	proxy_temp_path			/tmp/kvmd-nginx.proxy_temp;
+	scgi_temp_path			/tmp/kvmd-nginx.scgi_temp;
+	uwsgi_temp_path			/tmp/kvmd-nginx.uwsgi_temp;
 
 	upstream kvmd {
 		server 127.0.0.1:8081 fail_timeout=0s max_fails=0;
@@ -53,7 +53,7 @@ http {
 	server {
 #PROD		listen 443 ssl http2;
 		server_name localhost;
-#PROD		include /etc/nginx/ssl.conf;
+#PROD		include /etc/kvmd/nginx/ssl.conf;
 
 		auth_request /auth;
 
@@ -67,8 +67,8 @@ http {
 
 		location / {
 			root /usr/share/kvmd/web;
-			include /etc/nginx/loc-login.conf;
-			include /etc/nginx/loc-nocache.conf;
+			include /etc/kvmd/nginx/loc-login.conf;
+			include /etc/kvmd/nginx/loc-nocache.conf;
 		}
 
 		location @login {
@@ -99,8 +99,8 @@ http {
 			rewrite ^/kvmd/ws$ /ws break;
 			rewrite ^/kvmd/ws\?(.*)$ /ws?$1 break;
 			proxy_pass http://kvmd;
-			include /etc/nginx/loc-proxy.conf;
-			include /etc/nginx/loc-websocket.conf;
+			include /etc/kvmd/nginx/loc-proxy.conf;
+			include /etc/kvmd/nginx/loc-websocket.conf;
 			auth_request off;
 		}
 
@@ -108,7 +108,7 @@ http {
 			rewrite ^/kvmd/msd/write$ /msd/write break;
 			rewrite ^/kvmd/msd/write\?(.*)$ /msd/write?$1 break;
 			proxy_pass http://kvmd;
-			include /etc/nginx/loc-proxy.conf;
+			include /etc/kvmd/nginx/loc-proxy.conf;
 			limit_rate 6250k;
 			limit_rate_after 50k;
 			client_max_body_size 0;
@@ -120,7 +120,7 @@ http {
 			rewrite ^/kvmd/log$ /log break;
 			rewrite ^/kvmd/log\?(.*)$ /log?$1 break;
 			proxy_pass http://kvmd;
-			include /etc/nginx/loc-proxy.conf;
+			include /etc/kvmd/nginx/loc-proxy.conf;
 			proxy_read_timeout 7d;
 			postpone_output 0;
 			proxy_buffering off;
@@ -132,7 +132,7 @@ http {
 			rewrite ^/kvmd$ / break;
 			rewrite ^/kvmd/(.*)$ /$1 break;
 			proxy_pass http://kvmd;
-			include /etc/nginx/loc-proxy.conf;
+			include /etc/kvmd/nginx/loc-proxy.conf;
 			auth_request off;
 		}
 
@@ -141,7 +141,7 @@ http {
 			rewrite ^/streamer\?(.*)$ ?$1 break;
 			rewrite ^/streamer/(.*)$ /$1 break;
 			proxy_pass http://ustreamer;
-			include /etc/nginx/loc-proxy.conf;
+			include /etc/kvmd/nginx/loc-proxy.conf;
 			postpone_output 0;
 			proxy_buffering off;
 			proxy_ignore_headers X-Accel-Buffering;
diff --git a/configs/nginx/ssl.conf b/configs/nginx/ssl.conf
index 3b24ade1..9bcb7d0d 100644
--- a/configs/nginx/ssl.conf
+++ b/configs/nginx/ssl.conf
@@ -1,5 +1,5 @@
 ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
-ssl_certificate /etc/nginx/ssl/server.crt;
-ssl_certificate_key /etc/nginx/ssl/server.key;
+ssl_certificate /etc/kvmd/nginx/ssl/server.crt;
+ssl_certificate_key /etc/kvmd/nginx/ssl/server.key;
 add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
diff --git a/configs/os/systemd/kvmd-nginx.service b/configs/os/systemd/kvmd-nginx.service
index ab223488..6b318598 100644
--- a/configs/os/systemd/kvmd-nginx.service
+++ b/configs/os/systemd/kvmd-nginx.service
@@ -8,8 +8,8 @@ PIDFile=/run/kvmd-nginx.pid
 PrivateDevices=yes
 SyslogLevel=err
 
-ExecStart=/usr/bin/nginx -g 'pid /run/kvmd-nginx.pid; error_log stderr;'
-ExecReload=/usr/bin/nginx -s reload -p /etc/kvmd/nginx
+ExecStart=/usr/bin/nginx -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf -g 'pid /run/kvmd-nginx.pid; error_log stderr;'
+ExecReload=/usr/bin/nginx -s reload -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf
 KillSignal=SIGQUIT
 KillMode=mixed