Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
f9e97d97ac
@ -6,8 +6,9 @@
|
|||||||
# /etc/nginx/sites-available
|
# /etc/nginx/sites-available
|
||||||
#
|
#
|
||||||
# Then customize to your needs. To enable the configuration
|
# Then customize to your needs. To enable the configuration
|
||||||
# symlink it to /etc/nginx/sites-enabled and reload Nginx
|
# symlink it to /etc/nginx/sites-enabled and reload Nginx using
|
||||||
# using /etc/init.d/nginx reload
|
#
|
||||||
|
# service nginx reload
|
||||||
##
|
##
|
||||||
|
|
||||||
##
|
##
|
||||||
@ -29,7 +30,9 @@
|
|||||||
##
|
##
|
||||||
|
|
||||||
server {
|
server {
|
||||||
|
listen 80;
|
||||||
server_name red.example.net;
|
server_name red.example.net;
|
||||||
|
|
||||||
index index.php;
|
index index.php;
|
||||||
root /var/www/red;
|
root /var/www/red;
|
||||||
rewrite ^ https://red.example.net$request_uri? permanent;
|
rewrite ^ https://red.example.net$request_uri? permanent;
|
||||||
@ -45,22 +48,21 @@ server {
|
|||||||
##
|
##
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 80;
|
|
||||||
listen 443 ssl;
|
listen 443 ssl;
|
||||||
ssl on;
|
|
||||||
server_name red.example.net;
|
server_name red.example.net;
|
||||||
|
|
||||||
|
ssl on;
|
||||||
ssl_certificate /etc/nginx/ssl/red.example.net.chain.pem;
|
ssl_certificate /etc/nginx/ssl/red.example.net.chain.pem;
|
||||||
ssl_certificate_key /etc/nginx/ssl/example.net.key;
|
ssl_certificate_key /etc/nginx/ssl/example.net.key;
|
||||||
ssl_session_timeout 5m;
|
ssl_session_timeout 5m;
|
||||||
ssl_protocols SSLv3 TLSv1;
|
ssl_protocols SSLv3 TLSv1;
|
||||||
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
|
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
|
||||||
ssl_prefer_server_ciphers on;
|
ssl_prefer_server_ciphers on;
|
||||||
|
|
||||||
|
|
||||||
index index.php;
|
index index.php;
|
||||||
charset utf-8;
|
charset utf-8;
|
||||||
root /var/www/red;
|
root /var/www/red;
|
||||||
access_log /var/log/nginx/red.log main;
|
access_log /var/log/nginx/red.log;
|
||||||
#Uncomment the following line to include a standard configuration file
|
#Uncomment the following line to include a standard configuration file
|
||||||
#include standard.conf
|
#include standard.conf
|
||||||
# allow uploads up to 20MB in size
|
# allow uploads up to 20MB in size
|
||||||
@ -94,6 +96,7 @@ server {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
|
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
|
||||||
|
# or a unix socket
|
||||||
location ~* \.php$ {
|
location ~* \.php$ {
|
||||||
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
fastcgi_split_path_info ^(.+\.php)(/.+)$;
|
||||||
# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
|
# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini
|
||||||
|
Reference in New Issue
Block a user