YunoHost-Apps/friendica_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/friendica_ynh.git synced 2024-09-03 18:36:14 +02:00
Code Issues Activity Actions

Merge pull request #2 from Josue-T/patch-2

Browse source 
Force https
This commit is contained in:
anmol26s 2018-03-21 19:45:28 +05:30 committed by GitHub
commit 2871df65a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 64 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
conf/nginx.conf
View file

@ -29,20 +29,22 @@
# You have Friendica installed in /var/www/friendica # You have Friendica installed in /var/www/friendica
## ##
location __PATH__ { location __PATH__ {
alias __FINALPATH__/; alias __FINALPATH__/;
rewrite ^ https://$server_name$request_uri? permanent; if ($scheme = http) {
rewrite ^ https://$server_name$request_uri? permanent;
}
#allow uploads up to 20MB in size #allow uploads up to 20MB in size
client_max_body_size 20m; client_max_body_size 20m;
client_body_buffer_size 128k; client_body_buffer_size 128k;
#Default indexes and catch-all #Default indexes and catch-all
index index.php; index index.php;
try_files $uri $uri/ /index.php?$args; try_files $uri $uri/ /index.php?$args;
#Prevent useless logs #Prevent useless logs
location = /favicon.ico { location = /favicon.ico {
log_not_found off; log_not_found off;
access_log off; access_log off;
@ -54,28 +56,28 @@ rewrite ^ https://$server_name$request_uri? permanent;
access_log off; access_log off;
} }
# make sure webfinger and other well known services aren't blocked # make sure webfinger and other well known services aren't blocked
# by denying dot files and rewrite request to the front controller # by denying dot files and rewrite request to the front controller
location ^~ /.well-known/ { location ^~ /.well-known/ {
allow all; allow all;
rewrite ^/(.*) /index.php?pagename=$uri&$args last; rewrite ^/(.*) /index.php?pagename=$request_uri&$args last;
} }
#statically serve these file types when possible #statically serve these file types when possible
#otherwise fall back to front controller #otherwise fall back to front controller
#allow browser to cache them #allow browser to cache them
#added .htm for advanced source code editor library #added .htm for advanced source code editor library
location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ { location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
expires 30d; expires 30d;
try_files $uri /index.php?pagename=$uri&$args; try_files $uri /index.php?pagename=$request_uri&$args;
} }
#block these file types #block these file types
location ~* \.(tpl|md|tgz|log|out)$ { location ~* \.(tpl|md|tgz|log|out)$ {
deny all; deny all;
} }
#Execute and serve PHP files #Execute and serve PHP files
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {
fastcgi_split_path_info ^(.+?\.php)(/.*)$; fastcgi_split_path_info ^(.+?\.php)(/.*)$;
fastcgi_pass unix:/var/run/php5-fpm.sock; fastcgi_pass unix:/var/run/php5-fpm.sock;
@ -87,10 +89,14 @@ rewrite ^ https://$server_name$request_uri? permanent;
} }
#.htaccess file from Friendica converted using http://winginx.com/en/htaccess #.htaccess file from Friendica converted using http://winginx.com/en/htaccess
location ~ "(^|/)\.git" { return 403;} location ~ "(^|/)\.git" {
autoindex off; return 403;
location / { if (!-e $request_filename) { rewrite ^(.*)$ /index.php?pagename=$1;}
} }
autoindex off;
if (!-e $request_filename) {
rewrite ^(.*)$ /index.php?pagename=$1;
}
#deny access to all dot files #deny access to all dot files
location ~ /\. { location ~ /\. {
@ -99,4 +105,4 @@ rewrite ^ https://$server_name$request_uri? permanent;
#Include SSOWAT user panel. #Include SSOWAT user panel.
include conf.d/yunohost_panel.conf.inc; include conf.d/yunohost_panel.conf.inc;
} }