aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-11-05 15:01:06 -0800
committerfriendica <info@friendica.com>2013-11-05 15:01:06 -0800
commitf9e97d97acbdc0588a1b161924f81a300d2f39d6 (patch)
treed6253c68029b89e553abb2c71fbca3ca9eaa1284
parent93a63abcd64d069be126f46e49089112153315a3 (diff)
parent2bed0f30a9042421b585c37413adecc7fd7dc525 (diff)
downloadvolse-hubzilla-f9e97d97acbdc0588a1b161924f81a300d2f39d6.tar.gz
volse-hubzilla-f9e97d97acbdc0588a1b161924f81a300d2f39d6.tar.bz2
volse-hubzilla-f9e97d97acbdc0588a1b161924f81a300d2f39d6.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--doc/install/sample-nginx.conf17
1 files changed, 10 insertions, 7 deletions
diff --git a/doc/install/sample-nginx.conf b/doc/install/sample-nginx.conf
index 718524ee3..57a0e63b5 100644
--- a/doc/install/sample-nginx.conf
+++ b/doc/install/sample-nginx.conf
@@ -6,8 +6,9 @@
# /etc/nginx/sites-available
#
# Then customize to your needs. To enable the configuration
-# symlink it to /etc/nginx/sites-enabled and reload Nginx
-# using /etc/init.d/nginx reload
+# symlink it to /etc/nginx/sites-enabled and reload Nginx using
+#
+# service nginx reload
##
##
@@ -29,7 +30,9 @@
##
server {
+ listen 80;
server_name red.example.net;
+
index index.php;
root /var/www/red;
rewrite ^ https://red.example.net$request_uri? permanent;
@@ -45,22 +48,21 @@ server {
##
server {
- listen 80;
listen 443 ssl;
- ssl on;
server_name red.example.net;
+
+ ssl on;
ssl_certificate /etc/nginx/ssl/red.example.net.chain.pem;
ssl_certificate_key /etc/nginx/ssl/example.net.key;
ssl_session_timeout 5m;
ssl_protocols SSLv3 TLSv1;
ssl_ciphers ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv3:+EXP;
ssl_prefer_server_ciphers on;
-
-
+
index index.php;
charset utf-8;
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
#include standard.conf
# 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
+ # or a unix socket
location ~* \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
# NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini