From 192b69b11a05adee52e09d434bab004e0b0d07d1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 5 May 2018 08:38:20 +0200 Subject: update nginx conf to address issue #1155 --- install/sample-nginx.conf | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'install') diff --git a/install/sample-nginx.conf b/install/sample-nginx.conf index 4121ff2ec..839f208ae 100644 --- a/install/sample-nginx.conf +++ b/install/sample-nginx.conf @@ -73,29 +73,32 @@ server { client_max_body_size 20m; client_body_buffer_size 128k; + include mime.types; + # rewrite to front controller as default rule location / { - if ($is_args != "") { - rewrite ^/(.*) /index.php?q=$uri&$args last; + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?q=$1; } - rewrite ^/(.*) /index.php?q=$uri last; } # make sure webfinger and other well known services aren't blocked # by denying dot files and rewrite request to the front controller location ^~ /.well-known/ { allow all; - rewrite ^/(.*) /index.php?q=$uri&$args last; + if (!-e $request_filename) { + rewrite ^(.*)$ /index.php?q=$1; + } } # statically serve these file types when possible # otherwise fall back to front controller # allow browser to cache them # added .htm for advanced source code editor library - location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ { - expires 30d; - try_files $uri /index.php?q=$uri&$args; - } + # location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|map|ttf|woff|woff2|svg)$ { + # expires 30d; + # try_files $uri /index.php?q=$uri&$args; + # } # block these file types location ~* \.(tpl|md|tgz|log|out)$ { -- cgit v1.2.3 From 55e1026c986f1c2c7e2a0376579b01111a93ab5d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 20 May 2018 20:48:52 +0200 Subject: improve abconfig queries --- install/schema_mysql.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'install') diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 1e91619e3..9bf91fc51 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -7,8 +7,7 @@ CREATE TABLE IF NOT EXISTS `abconfig` ( `k` char(191) NOT NULL DEFAULT '', `v` mediumtext NOT NULL, PRIMARY KEY (`id`), - KEY `chan` (`chan`), - KEY `xchan` (`xchan`), + KEY `chan_xchan` (`chan`, `xchan`), KEY `cat` (`cat`), KEY `k` (`k`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -- cgit v1.2.3 From 469809183d232761b8984848c133f9f11f5e7cea Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 20 May 2018 22:42:47 +0200 Subject: update oauth related tables to use bigint/int(10) for user_id column. this is to be more consistent with the rest of the tables and fixes issue #1180 --- install/schema_mysql.sql | 8 ++++---- install/schema_postgres.sql | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'install') diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 9bf91fc51..9685a878e 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -1606,14 +1606,14 @@ CREATE TABLE if not exists oauth_clients ( redirect_uri VARCHAR(2000), grant_types VARCHAR(80), scope VARCHAR(4000), - user_id VARCHAR(80), + user_id int(10) unsigned NOT NULL DEFAULT 0, PRIMARY KEY (client_id) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE if not exists oauth_access_tokens ( access_token VARCHAR(40) NOT NULL, client_id VARCHAR(80) NOT NULL, - user_id VARCHAR(255), + user_id int(10) unsigned NOT NULL DEFAULT 0, expires TIMESTAMP NOT NULL, scope VARCHAR(4000), PRIMARY KEY (access_token) @@ -1622,7 +1622,7 @@ CREATE TABLE if not exists oauth_access_tokens ( CREATE TABLE if not exists oauth_authorization_codes ( authorization_code VARCHAR(40) NOT NULL, client_id VARCHAR(80) NOT NULL, - user_id VARCHAR(255), + user_id int(10) unsigned NOT NULL DEFAULT 0, redirect_uri VARCHAR(2000), expires TIMESTAMP NOT NULL, scope VARCHAR(4000), @@ -1633,7 +1633,7 @@ CREATE TABLE if not exists oauth_authorization_codes ( CREATE TABLE if not exists oauth_refresh_tokens ( refresh_token VARCHAR(40) NOT NULL, client_id VARCHAR(80) NOT NULL, - user_id VARCHAR(255), + user_id int(10) unsigned NOT NULL DEFAULT 0, expires TIMESTAMP NOT NULL, scope VARCHAR(4000), PRIMARY KEY (refresh_token) diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index fb845ce9d..d4ffed130 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -1620,14 +1620,14 @@ CREATE TABLE oauth_clients ( redirect_uri VARCHAR(2000), grant_types VARCHAR(80), scope VARCHAR(4000), - user_id VARCHAR(80), + user_id bigint NOT NULL DEFAULT '0', PRIMARY KEY (client_id) ); CREATE TABLE oauth_access_tokens ( access_token VARCHAR(40) NOT NULL, client_id VARCHAR(80) NOT NULL, - user_id VARCHAR(255), + user_id bigint NOT NULL DEFAULT '0', expires TIMESTAMP NOT NULL, scope VARCHAR(4000), PRIMARY KEY (access_token) @@ -1636,7 +1636,7 @@ CREATE TABLE oauth_access_tokens ( CREATE TABLE oauth_authorization_codes ( authorization_code VARCHAR(40) NOT NULL, client_id VARCHAR(80) NOT NULL, - user_id VARCHAR(255), + user_id bigint NOT NULL DEFAULT '0', redirect_uri VARCHAR(2000), expires TIMESTAMP NOT NULL, scope VARCHAR(4000), @@ -1647,7 +1647,7 @@ CREATE TABLE oauth_authorization_codes ( CREATE TABLE oauth_refresh_tokens ( refresh_token VARCHAR(40) NOT NULL, client_id VARCHAR(80) NOT NULL, - user_id VARCHAR(255), + user_id bigint NOT NULL DEFAULT '0', expires TIMESTAMP NOT NULL, scope VARCHAR(4000), PRIMARY KEY (refresh_token) -- cgit v1.2.3 From 9ffb10c0e6107edc08d4e0d1333676eb326151f1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 6 Jun 2018 22:11:55 +0200 Subject: update install instructions --- install/INSTALL.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'install') diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 88269f032..c39c8ad8b 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -16,14 +16,14 @@ be able to support Hubzilla. Many will - but please review the requirements and confirm these with your hosting provider prior to installation. (And preferably before entering into a long-term contract.) -If you encounter installation issues, please let us know via the Github issue -tracker where you downloaded the software. Please be as clear as -you can about your operating environment and provide as much detail as possible -about any error messages you may see, so that we can prevent it from happening -in the future. Due to the large variety of operating systems and PHP platforms -in existence we may have only limited ability to debug your PHP installation -or acquire any missing modules - but we will do our best to solve any general -code issues. +If you encounter installation issues, please let us know via the issue +tracker at https://framagit.org/hubzilla where you downloaded the software. +Please be as clear as you can about your operating environment and provide as +much detail as possible about any error messages you may see, so that we can +prevent it from happening in the future. Due to the large variety of operating +systems and PHP platforms in existence we may have only limited ability to +debug your PHP installation or acquire any missing modules - but we will do +our best to solve any general code issues. @@ -113,7 +113,7 @@ web server platforms. software much easier to update. The Linux command to clone the repository into a directory "mywebsite" would be - git clone https://github.com/redmatrix/hubzilla.git mywebsite + git clone https://framagit.org/hubzilla/core.git mywebsite - and then you can pick up the latest changes at any time with @@ -144,7 +144,7 @@ web server platforms. a nickname of 'hzaddons'. You can pull in other hubzilla addon repositories by giving them different nicknames. - util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git hzaddons + util/add_addon_repo https://framagit.org/hubzilla/addons.git hzaddons - For keeping the addon tree updated, you should be on your top level website directory and issue an update command for that repository. -- cgit v1.2.3