ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-07-01 15:47:23 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'NginxProxyManager:develop' into stream-ssl

Browse Source
This commit is contained in:
jbowring
2024-12-02 21:29:22 +00:00
parent d3526debe6 2f9e062718
commit e4c10131f0
178 changed files with 7895 additions and 5240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/rootfs/etc/logrotate.d/nginx-proxy-manager
View File

@ -8,7 +8,7 @@
compress
sharedscripts
postrotate
/bin/kill -USR1 `cat /run/nginx.pid 2>/dev/null` 2>/dev/null || true
kill -USR1 `cat /run/nginx/nginx.pid 2>/dev/null` 2>/dev/null || true
endscript
}
@ -22,6 +22,6 @@
compress
sharedscripts
postrotate
/bin/kill -USR1 `cat /run/nginx.pid 2>/dev/null` 2>/dev/null || true
kill -USR1 `cat /run/nginx/nginx.pid 2>/dev/null` 2>/dev/null || true
endscript
}
}

2
docker/rootfs/var/www/html/index.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Default Site</title>
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet">
<style>
.jumbotron { margin-top: 50px; }
</style>