浏览代码

Limits inside of locations

Bob Mottram 8 年前
父节点
当前提交
4ffbae098b

+ 6
- 4
src/freedombone-app-blog 查看文件

@@ -418,8 +418,6 @@ function install_blog_website {
418 418
     echo '    index index.php;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
419 419
     echo '    charset utf-8;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
420 420
     echo '    proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
421
-    function_check nginx_limits
422
-    nginx_limits $FULLBLOG_DOMAIN_NAME
423 421
     function_check nginx_ssl
424 422
     nginx_ssl $FULLBLOG_DOMAIN_NAME
425 423
     function_check nginx_disable_sniffing
@@ -428,6 +426,8 @@ function install_blog_website {
428 426
     echo '' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
429 427
     echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
430 428
     echo '    location / {' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
429
+    function_check nginx_limits
430
+    nginx_limits $FULLBLOG_DOMAIN_NAME
431 431
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
432 432
     echo '    }' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
433 433
     echo '' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
@@ -501,14 +501,14 @@ function install_blog_website_onion {
501 501
     echo '    index index.php;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
502 502
     echo '    charset utf-8;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
503 503
     echo '    proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
504
-    function_check nginx_limits
505
-    nginx_limits $FULLBLOG_DOMAIN_NAME
506 504
     function_check nginx_disable_sniffing
507 505
     nginx_disable_sniffing $FULLBLOG_DOMAIN_NAME
508 506
     echo '    add_header Strict-Transport-Security "max-age=0;";' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
509 507
     echo '' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
510 508
     echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
511 509
     echo '    location / {' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
510
+    function_check nginx_limits
511
+    nginx_limits $FULLBLOG_DOMAIN_NAME
512 512
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
513 513
     echo '    }' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
514 514
     echo '' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
@@ -535,6 +535,8 @@ function install_blog_website_onion {
535 535
     echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
536 536
     echo '    # or a unix socket' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
537 537
     echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
538
+    function_check nginx_limits
539
+    nginx_limits $FULLBLOG_DOMAIN_NAME
538 540
     echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
539 541
     echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME
540 542
     echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$FULLBLOG_DOMAIN_NAME

+ 4
- 4
src/freedombone-app-gnusocial 查看文件

@@ -449,8 +449,6 @@ function install_gnusocial_main {
449 449
         function_check nginx_disable_sniffing
450 450
         nginx_disable_sniffing $MICROBLOG_DOMAIN_NAME
451 451
 
452
-        function_check nginx_limits
453
-        nginx_limits $MICROBLOG_DOMAIN_NAME '15m'
454 452
         echo '  add_header Strict-Transport-Security max-age=15768000;' >> $microblog_nginx_site
455 453
         echo '' >> $microblog_nginx_site
456 454
         echo '  # Logs' >> $microblog_nginx_site
@@ -471,6 +469,8 @@ function install_gnusocial_main {
471 469
         echo '' >> $microblog_nginx_site
472 470
         echo '  # Location' >> $microblog_nginx_site
473 471
         echo '  location / {' >> $microblog_nginx_site
472
+        function_check nginx_limits
473
+        nginx_limits $MICROBLOG_DOMAIN_NAME '15m'
474 474
         echo '    try_files $uri $uri/ @gnusocial;' >> $microblog_nginx_site
475 475
         echo '  }' >> $microblog_nginx_site
476 476
         echo '' >> $microblog_nginx_site
@@ -493,8 +493,6 @@ function install_gnusocial_main {
493 493
     echo '' >> $microblog_nginx_site
494 494
     function_check nginx_disable_sniffing
495 495
     nginx_disable_sniffing $MICROBLOG_DOMAIN_NAME
496
-    function_check nginx_limits
497
-    nginx_limits $MICROBLOG_DOMAIN_NAME '15m'
498 496
     echo '' >> $microblog_nginx_site
499 497
     echo '  # Logs' >> $microblog_nginx_site
500 498
     echo '  access_log off;' >> $microblog_nginx_site
@@ -514,6 +512,8 @@ function install_gnusocial_main {
514 512
     echo '' >> $microblog_nginx_site
515 513
     echo '  # Location' >> $microblog_nginx_site
516 514
     echo '  location / {' >> $microblog_nginx_site
515
+    function_check nginx_limits
516
+    nginx_limits $MICROBLOG_DOMAIN_NAME '15m'
517 517
     echo '    try_files $uri $uri/ @gnusocial;' >> $microblog_nginx_site
518 518
     echo '  }' >> $microblog_nginx_site
519 519
     echo '' >> $microblog_nginx_site

+ 4
- 4
src/freedombone-app-gogs 查看文件

@@ -583,8 +583,6 @@ function install_gogs {
583 583
         echo '    access_log off;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
584 584
         echo "    error_log /var/log/nginx/${GIT_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
585 585
         echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
586
-        function_check nginx_limits
587
-        nginx_limits $GIT_DOMAIN_NAME '10G'
588 586
         function_check nginx_ssl
589 587
         nginx_ssl $GIT_DOMAIN_NAME
590 588
         function_check nginx_disable_sniffing
@@ -592,6 +590,8 @@ function install_gogs {
592 590
         echo '    add_header Strict-Transport-Security max-age=0;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
593 591
         echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
594 592
         echo '    location / {' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
593
+        function_check nginx_limits
594
+        nginx_limits $GIT_DOMAIN_NAME '10G'
595 595
         echo '        proxy_pass http://localhost:3000;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
596 596
         echo '    }' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
597 597
         echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
@@ -617,13 +617,13 @@ function install_gogs {
617 617
     echo '    access_log off;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
618 618
     echo "    error_log /var/log/nginx/${GIT_DOMAIN_NAME}_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
619 619
     echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
620
-    function_check nginx_limits
621
-    nginx_limits $GIT_DOMAIN_NAME '10G'
622 620
     function_check nginx_disable_sniffing
623 621
     nginx_disable_sniffing $GIT_DOMAIN_NAME
624 622
     echo '    add_header Strict-Transport-Security max-age=0;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
625 623
     echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
626 624
     echo '    location / {' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
625
+    function_check nginx_limits
626
+    nginx_limits $GIT_DOMAIN_NAME '10G'
627 627
     echo '        proxy_pass http://localhost:3000;' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
628 628
     echo '    }' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME
629 629
     echo '' >> /etc/nginx/sites-available/$GIT_DOMAIN_NAME

+ 8
- 4
src/freedombone-app-hubzilla 查看文件

@@ -482,8 +482,6 @@ function install_hubzilla {
482 482
         echo '    index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
483 483
         echo '    charset utf-8;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
484 484
         echo '    access_log off;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
485
-        function_check nginx_limits
486
-        nginx_limits $HUBZILLA_DOMAIN_NAME
487 485
         function_check nginx_ssl
488 486
         nginx_ssl $HUBZILLA_DOMAIN_NAME
489 487
         function_check nginx_disable_sniffing
@@ -492,6 +490,8 @@ function install_hubzilla {
492 490
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
493 491
         echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
494 492
         echo '    location / {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
493
+        function_check nginx_limits
494
+        nginx_limits $HUBZILLA_DOMAIN_NAME
495 495
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
496 496
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
497 497
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
@@ -519,6 +519,8 @@ function install_hubzilla {
519 519
         echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
520 520
         echo '    # or a unix socket' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
521 521
         echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
522
+        function_check nginx_limits
523
+        nginx_limits $HUBZILLA_DOMAIN_NAME
522 524
         echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
523 525
         echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
524 526
         echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
@@ -557,12 +559,12 @@ function install_hubzilla {
557 559
         echo '    index index.php;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
558 560
         echo '    charset utf-8;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
559 561
         echo '    access_log off;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
560
-        nginx_limits $HUBZILLA_DOMAIN_NAME
561
-        nginx_disable_sniffing $HUBZILLA_DOMAIN_NAME
562 562
         echo '    add_header Strict-Transport-Security max-age=15768000;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
563 563
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
564 564
         echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
565 565
         echo '    location / {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
566
+        nginx_limits $HUBZILLA_DOMAIN_NAME
567
+        nginx_disable_sniffing $HUBZILLA_DOMAIN_NAME
566 568
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
567 569
         echo '    }' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
568 570
         echo '' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
@@ -590,6 +592,8 @@ function install_hubzilla {
590 592
         echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
591 593
         echo '    # or a unix socket' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
592 594
         echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
595
+        nginx_limits $HUBZILLA_DOMAIN_NAME
596
+        nginx_disable_sniffing $HUBZILLA_DOMAIN_NAME
593 597
         echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
594 598
         echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME
595 599
         echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$HUBZILLA_DOMAIN_NAME

+ 20
- 4
src/freedombone-app-mediagoblin 查看文件

@@ -385,8 +385,6 @@ function install_mediagoblin {
385 385
         echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
386 386
         echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
387 387
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
388
-        function_check nginx_limits
389
-        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
390 388
         function_check nginx_ssl
391 389
         nginx_ssl $MEDIAGOBLIN_DOMAIN_NAME
392 390
         function_check nginx_disable_sniffing
@@ -409,26 +407,36 @@ function install_mediagoblin {
409 407
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
410 408
         echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
411 409
         echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
410
+        function_check nginx_limits
411
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
412 412
         echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
413 413
         echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
414 414
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
415 415
         echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
416 416
         echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
417
+        function_check nginx_limits
418
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
417 419
         echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
418 420
         echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
419 421
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
420 422
         echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
421 423
         echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
424
+        function_check nginx_limits
425
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
422 426
         echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
423 427
         echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
424 428
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
425 429
         echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
426 430
         echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
431
+        function_check nginx_limits
432
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
427 433
         echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
428 434
         echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
429 435
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
430 436
         echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
431 437
         echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
438
+        function_check nginx_limits
439
+        nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
432 440
         echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
433 441
         echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
434 442
         echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
@@ -454,8 +462,6 @@ function install_mediagoblin {
454 462
     echo '  default_type  application/octet-stream;' >> $MEDIAGOBLIN_VIRTUAL_HOST
455 463
     echo '  sendfile on;' >> $MEDIAGOBLIN_VIRTUAL_HOST
456 464
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
457
-    function_check nginx_limits
458
-    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
459 465
     function_check nginx_disable_sniffing
460 466
     nginx_disable_sniffing $MEDIAGOBLIN_DOMAIN_NAME
461 467
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
@@ -476,26 +482,36 @@ function install_mediagoblin {
476 482
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
477 483
     echo '  # MediaGoblins stock static files: CSS, JS, etc.' >> $MEDIAGOBLIN_VIRTUAL_HOST
478 484
     echo '  location /mgoblin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
485
+    function_check nginx_limits
486
+    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
479 487
     echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/mediagoblin/static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
480 488
     echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
481 489
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
482 490
     echo '  # Instance specific media:' >> $MEDIAGOBLIN_VIRTUAL_HOST
483 491
     echo '  location /mgoblin_media/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
492
+    function_check nginx_limits
493
+    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
484 494
     echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/media/public/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
485 495
     echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
486 496
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
487 497
     echo '  # Theme static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
488 498
     echo '  location /theme_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
499
+    function_check nginx_limits
500
+    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
489 501
     echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/theme_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
490 502
     echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
491 503
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
492 504
     echo '  # Plugin static files (usually symlinked in)' >> $MEDIAGOBLIN_VIRTUAL_HOST
493 505
     echo '  location /plugin_static/ {' >> $MEDIAGOBLIN_VIRTUAL_HOST
506
+    function_check nginx_limits
507
+    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
494 508
     echo "    alias $MEDIAGOBLIN_WORKING_DIRECTORY/user_dev/plugin_static/;" >> $MEDIAGOBLIN_VIRTUAL_HOST
495 509
     echo '  }' >> $MEDIAGOBLIN_VIRTUAL_HOST
496 510
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST
497 511
     echo '  # Mounting MediaGoblin itself via FastCGI.' >> $MEDIAGOBLIN_VIRTUAL_HOST
498 512
     echo '  location / {' >> $MEDIAGOBLIN_VIRTUAL_HOST
513
+    function_check nginx_limits
514
+    nginx_limits $MEDIAGOBLIN_DOMAIN_NAME '20m'
499 515
     echo '    fastcgi_pass 127.0.0.1:26543;' >> $MEDIAGOBLIN_VIRTUAL_HOST
500 516
     echo '    include /etc/nginx/fastcgi_params;' >> $MEDIAGOBLIN_VIRTUAL_HOST
501 517
     echo '' >> $MEDIAGOBLIN_VIRTUAL_HOST

+ 2
- 2
src/freedombone-app-searx 查看文件

@@ -214,13 +214,13 @@ function install_searx {
214 214
     echo '    access_log off;' >> /etc/nginx/sites-available/searx
215 215
     echo "    error_log /var/log/searx_error.log $WEBSERVER_LOG_LEVEL;" >> /etc/nginx/sites-available/searx
216 216
     echo '' >> /etc/nginx/sites-available/searx
217
-    function_check nginx_limits
218
-    nginx_limits searx '1M'
219 217
     function_check nginx_disable_sniffing
220 218
     nginx_disable_sniffing searx
221 219
     echo '    add_header Strict-Transport-Security max-age=0;' >> /etc/nginx/sites-available/searx
222 220
     echo '' >> /etc/nginx/sites-available/searx
223 221
     echo '    location / {' >> /etc/nginx/sites-available/searx
222
+    function_check nginx_limits
223
+    nginx_limits searx '1M'
224 224
     echo '        proxy_pass http://localhost:8888;' >> /etc/nginx/sites-available/searx
225 225
     echo '        proxy_set_header Host $host;' >> /etc/nginx/sites-available/searx
226 226
     echo '        proxy_set_header X-Real-IP $remote_addr;' >> /etc/nginx/sites-available/searx

+ 14
- 6
src/freedombone-app-wiki 查看文件

@@ -384,10 +384,10 @@ function install_wiki {
384 384
         echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
385 385
         function_check nginx_disable_sniffing
386 386
         nginx_disable_sniffing $WIKI_DOMAIN_NAME
387
-        function_check nginx_limits
388
-        nginx_limits $WIKI_DOMAIN_NAME
389 387
         echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
390 388
         echo '    location / {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
389
+        function_check nginx_limits
390
+        nginx_limits $WIKI_DOMAIN_NAME
391 391
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
392 392
         echo '    }' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
393 393
         echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -414,6 +414,8 @@ function install_wiki {
414 414
         echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
415 415
         echo '    # or a unix socket' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
416 416
         echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
417
+        function_check nginx_limits
418
+        nginx_limits $WIKI_DOMAIN_NAME
417 419
         echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
418 420
         echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
419 421
         echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -458,8 +460,6 @@ function install_wiki {
458 460
         echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
459 461
         echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
460 462
         echo '    proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
461
-        function_check nginx_limits
462
-        nginx_limits $WIKI_DOMAIN_NAME
463 463
         function_check nginx_ssl
464 464
         nginx_ssl $WIKI_DOMAIN_NAME
465 465
         function_check nginx_disable_sniffing
@@ -468,12 +468,16 @@ function install_wiki {
468 468
         echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
469 469
         echo '    # webmail' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
470 470
         echo '    location /webmail {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
471
+        function_check nginx_limits
472
+        nginx_limits $WIKI_DOMAIN_NAME
471 473
         echo '        rewrite ^/(.*) /webmail/index.php last;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
472 474
         echo '        rewrite ^/(.*) /webmail/installer/index.php last;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
473 475
         echo '    }' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
474 476
         echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
475 477
         echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
476 478
         echo '    location / {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
479
+        function_check nginx_limits
480
+        nginx_limits $WIKI_DOMAIN_NAME
477 481
         echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
478 482
         echo '    }' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
479 483
         echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -500,6 +504,8 @@ function install_wiki {
500 504
         echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
501 505
         echo '    # or a unix socket' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
502 506
         echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
507
+        function_check nginx_limits
508
+        nginx_limits $WIKI_DOMAIN_NAME
503 509
         echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
504 510
         echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
505 511
         echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -547,14 +553,14 @@ function install_wiki {
547 553
     echo '    index index.php;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
548 554
     echo '    charset utf-8;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
549 555
     echo '    proxy_read_timeout 86400s;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
550
-    function_check nginx_limits
551
-    nginx_limits $WIKI_DOMAIN_NAME
552 556
     function_check nginx_disable_sniffing
553 557
     nginx_disable_sniffing $WIKI_DOMAIN_NAME
554 558
     echo '    add_header Strict-Transport-Security "max-age=0;";' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
555 559
     echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
556 560
     echo '    # rewrite to front controller as default rule' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
557 561
     echo '    location / {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
562
+    function_check nginx_limits
563
+    nginx_limits $WIKI_DOMAIN_NAME
558 564
     echo '        rewrite ^/(.*) /index.php?q=$uri&$args last;' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
559 565
     echo '    }' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
560 566
     echo '' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
@@ -581,6 +587,8 @@ function install_wiki {
581 587
     echo '    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
582 588
     echo '    # or a unix socket' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
583 589
     echo '    location ~* \.php$ {' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
590
+    function_check nginx_limits
591
+    nginx_limits $WIKI_DOMAIN_NAME
584 592
     echo '        # Zero-day exploit defense.' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
585 593
     echo '        # http://forum.nginx.org/read.php?2,88845,page=3' >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME
586 594
     echo "        # Won't work properly (404 error) if the file is not stored on this" >> /etc/nginx/sites-available/$WIKI_DOMAIN_NAME