diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-22 03:51:58 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-22 03:51:58 -0700 |
| commit | 1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d (patch) | |
| tree | 30f9100f61e54bd800d859af3dc45dcab56e5cee /install | |
| parent | 36a960adec9f216463890640340324d6d37a65d0 (diff) | |
| parent | 50e9d024581ddf57f37a6302bc089a88237657bb (diff) | |
| download | volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.gz volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.bz2 volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'install')
| -rw-r--r-- | install/sample-nginx.conf | 2 | ||||
| -rw-r--r-- | install/update.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/install/sample-nginx.conf b/install/sample-nginx.conf index 85178596a..4121ff2ec 100644 --- a/install/sample-nginx.conf +++ b/install/sample-nginx.conf @@ -56,7 +56,7 @@ server { ssl_certificate_key /etc/nginx/ssl/example.net.key; ssl_session_timeout 5m; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-DSS-AES128-SHA256:DHE-DSS-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:!DHE-RSA-AES128-GCM-SHA256:!DHE-RSA-AES256-GCM-SHA384:!DHE-RSA-AES128-SHA256:!DHE-RSA-AES256-SHA:!DHE-RSA-AES128-SHA:!DHE-RSA-AES256-SHA256:!DHE-RSA-CAMELLIA128-SHA:!DHE-RSA-CAMELLIA256-SHA; + ssl_ciphers ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS; ssl_prefer_server_ciphers on; fastcgi_param HTTPS on; diff --git a/install/update.php b/install/update.php index affdb6ffb..06084a422 100644 --- a/install/update.php +++ b/install/update.php @@ -2533,7 +2533,7 @@ function update_r1189() { } function update_r1190() { - $r1 = q("alter table abook add abook_not_here int(11) not null default '0' "); + $r1 = q("alter table abook add abook_not_here smallint not null default 0 "); $r2 = q("create index abook_not_here on abook (abook_not_here)"); |