GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-01-29 09:01:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

kvmd-nginx-mkconf: Render nginx config with kvmd settings

Browse Source
This commit is contained in:
Maxim Devaev
2024-02-03 16:11:34 +02:00
parent 272e3bf5e9
commit 8d702f8cc2
15 changed files with 160 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/nginx/listen-http.conf
View File

@@ -1,2 +0,0 @@
listen 80;
listen [::]:80;

3
configs/nginx/listen-https.conf
View File

@@ -1,3 +0,0 @@
listen 443 ssl;
listen [::]:443 ssl;
http2 on;

35
configs/nginx/nginx.conf → configs/nginx/nginx.conf.mako
View File

@@ -36,16 +36,45 @@ http {
include /etc/kvmd/nginx/kvmd.ctx-http.conf;
include /usr/share/kvmd/extras/*/nginx.ctx-http.conf;
% if https_enabled:
server {
include /etc/kvmd/nginx/listen-http.conf;
listen ${http_port};
% if ipv6_enabled:
listen [::]:${http_port};
% endif
include /etc/kvmd/nginx/certbot.ctx-server.conf;
include /etc/kvmd/nginx/redirect-to-https.conf;
location / {
% if https_port == 443:
return 301 https://$host$request_uri;
% else:
return 301 https://$host:${https_port}$request_uri;
% endif
}
}
server {
include /etc/kvmd/nginx/listen-https.conf;
listen ${https_port} ssl;
% if ipv6_enabled:
listen [::]:${https_port} ssl;
% endif
http2 on;
include /etc/kvmd/nginx/ssl.conf;
include /etc/kvmd/nginx/kvmd.ctx-server.conf;
include /usr/share/kvmd/extras/*/nginx.ctx-server.conf;
}
% else:
server {
listen ${http_port};
% if ipv6_enabled:
listen [::]:${http_port};
% endif
include /etc/kvmd/nginx/certbot.ctx-server.conf;
include /etc/kvmd/nginx/kvmd.ctx-server.conf;
include /usr/share/kvmd/extras/*/nginx.ctx-server.conf;
}
% endif
}

3
configs/nginx/redirect-to-https.conf
View File

@@ -1,3 +0,0 @@
location / {
return 301 https://$host$request_uri;
}

5
configs/os/services/kvmd-nginx.service
View File

@@ -10,8 +10,9 @@ SyslogLevel=err
Restart=always
RestartSec=3
ExecStart=/usr/sbin/nginx -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf -g 'pid /run/kvmd/nginx.pid; user kvmd-nginx; error_log stderr;'
ExecReload=/usr/sbin/nginx -s reload -p /etc/kvmd/nginx -c /etc/kvmd/nginx/nginx.conf -g 'pid /run/kvmd/nginx.pid; user kvmd-nginx; error_log stderr;'
ExecStartPre=/usr/bin/kvmd-nginx-mkconf /etc/kvmd/nginx/nginx.conf.mako /run/kvmd/nginx.conf
ExecStart=/usr/sbin/nginx -p /etc/kvmd/nginx -c /run/kvmd/nginx.conf -g 'pid /run/kvmd/nginx.pid; user kvmd-nginx; error_log stderr;'
ExecReload=/usr/sbin/nginx -s reload -p /etc/kvmd/nginx -c /run/kvmd/nginx.conf -g 'pid /run/kvmd/nginx.pid; user kvmd-nginx; error_log stderr;'
KillSignal=SIGQUIT
KillMode=mixed
TimeoutStopSec=3