Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9bfa7bd0c7 | |||
| d8620ef4f2 | |||
| d4b9c4af48 |
+2
-2
@@ -1099,7 +1099,7 @@ class Bot
|
|||||||
|
|
||||||
$t = file_get_contents('/config/nginx_default.conf');
|
$t = file_get_contents('/config/nginx_default.conf');
|
||||||
if (!empty($json['pac']['domain'])) {
|
if (!empty($json['pac']['domain'])) {
|
||||||
$t = preg_replace('/server_name([^\n]+)?/', "server_name {$json['pac']['domain']};", $t);
|
$t = preg_replace('/server_name ([^\n]+)?/', "server_name {$json['pac']['domain']};", $t);
|
||||||
preg_match_all('~#-domain.+?#-domain~s', $t, $m);
|
preg_match_all('~#-domain.+?#-domain~s', $t, $m);
|
||||||
foreach ($m[0] as $k => $v) {
|
foreach ($m[0] as $k => $v) {
|
||||||
$t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
|
$t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
|
||||||
@@ -1402,7 +1402,7 @@ class Bot
|
|||||||
$conf = $this->getPacConf();
|
$conf = $this->getPacConf();
|
||||||
$conf['domain'] = idn_to_ascii($domain);
|
$conf['domain'] = idn_to_ascii($domain);
|
||||||
$nginx = file_get_contents('/config/nginx.conf');
|
$nginx = file_get_contents('/config/nginx.conf');
|
||||||
$t = preg_replace('/server_name([^\n]+)?/', "server_name {$conf['domain']};", $nginx);
|
$t = preg_replace('/server_name ([^\n]+)?/', "server_name {$conf['domain']};", $nginx);
|
||||||
preg_match_all('~#-domain.+?#-domain~s', $t, $m);
|
preg_match_all('~#-domain.+?#-domain~s', $t, $m);
|
||||||
foreach ($m[0] as $k => $v) {
|
foreach ($m[0] as $k => $v) {
|
||||||
$t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
|
$t = preg_replace('~#-domain.+?#-domain~s', $this->uncomment($v, 'domain'), $t, 1);
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ events {
|
|||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
|
server_names_hash_bucket_size 64;
|
||||||
include include.conf;
|
include include.conf;
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ events {
|
|||||||
}
|
}
|
||||||
|
|
||||||
http {
|
http {
|
||||||
|
server_names_hash_bucket_size 64;
|
||||||
include include.conf;
|
include include.conf;
|
||||||
include /etc/nginx/mime.types;
|
include /etc/nginx/mime.types;
|
||||||
default_type application/octet-stream;
|
default_type application/octet-stream;
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
01.03.2024 фикс установки домена с длинным названием
|
||||||
|
- <code>make update</code>
|
||||||
29.02.2024 образы теперь будут скачиваться с docker hub
|
29.02.2024 образы теперь будут скачиваться с docker hub
|
||||||
- <code>git pull && make d cleanall u</code>
|
- <code>git pull && make d cleanall u</code>
|
||||||
28.02.2024 v1.1 добавлен раздел "зеркало"
|
28.02.2024 v1.1 добавлен раздел "зеркало"
|
||||||
|
|||||||
Reference in New Issue
Block a user