Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mailinabox
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mailinabox
Commits
7024b428
Commit
7024b428
authored
Aug 13, 2014
by
jkaberg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
increased timeouts so that owncloud properly loads with larger db
parent
d03bc0ce
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
nginx.conf
conf/nginx.conf
+6
-1
owncloud.sh
setup/owncloud.sh
+3
-1
No files found.
conf/nginx.conf
View file @
7024b428
...
@@ -31,10 +31,12 @@ server {
...
@@ -31,10 +31,12 @@ server {
index
index.php
;
index
index.php
;
alias
/usr/local/lib/roundcubemail/
;
alias
/usr/local/lib/roundcubemail/
;
}
}
location
~
/mail/config/.*
{
location
~
/mail/config/.*
{
# A ~-style location is needed to give this precedence over the next block.
# A ~-style location is needed to give this precedence over the next block.
return
403
;
return
403
;
}
}
location
~
/mail/.*\.php
{
location
~
/mail/.*\.php
{
# note: ~ has precendence over a regular location block
# note: ~ has precendence over a regular location block
include
fastcgi_params
;
include
fastcgi_params
;
...
@@ -62,6 +64,7 @@ server {
...
@@ -62,6 +64,7 @@ server {
fastcgi_param
SCRIPT_NAME
$1$2
;
fastcgi_param
SCRIPT_NAME
$1$2
;
fastcgi_param
PATH_INFO
$3
;
fastcgi_param
PATH_INFO
$3
;
fastcgi_param
MOD_X_ACCEL_REDIRECT_ENABLED
on
;
fastcgi_param
MOD_X_ACCEL_REDIRECT_ENABLED
on
;
fastcgi_read_timeout
630
;
fastcgi_pass
php-fpm
;
fastcgi_pass
php-fpm
;
error_page
403
/cloud/core/templates/403.php
;
error_page
403
/cloud/core/templates/403.php
;
error_page
404
/cloud/core/templates/404.php
;
error_page
404
/cloud/core/templates/404.php
;
...
@@ -73,6 +76,7 @@ server {
...
@@ -73,6 +76,7 @@ server {
# Properly proxying like this seems to work fine.
# Properly proxying like this seems to work fine.
proxy_pass
https://
$HOSTNAME
/cloud/remote.php/
$1
;
proxy_pass
https://
$HOSTNAME
/cloud/remote.php/
$1
;
}
}
rewrite
^/.well-known/host-meta
/cloud/public.php?service=host-meta
last
;
rewrite
^/.well-known/host-meta
/cloud/public.php?service=host-meta
last
;
rewrite
^/.well-known/host-meta.json
/cloud/public.php?service=host-meta-json
last
;
rewrite
^/.well-known/host-meta.json
/cloud/public.php?service=host-meta-json
last
;
rewrite
^/.well-known/carddav
/cloud/remote.php/carddav/
redirect
;
rewrite
^/.well-known/carddav
/cloud/remote.php/carddav/
redirect
;
...
@@ -96,6 +100,7 @@ server {
...
@@ -96,6 +100,7 @@ server {
location
/Microsoft-Server-ActiveSync
{
location
/Microsoft-Server-ActiveSync
{
include
/etc/nginx/fastcgi_params
;
include
/etc/nginx/fastcgi_params
;
fastcgi_param
SCRIPT_FILENAME
/usr/local/lib/z-push/index.php
;
fastcgi_param
SCRIPT_FILENAME
/usr/local/lib/z-push/index.php
;
fastcgi_read_timeout
630
;
fastcgi_pass
php-fpm
;
fastcgi_pass
php-fpm
;
}
}
...
...
setup/owncloud.sh
View file @
7024b428
...
@@ -77,7 +77,9 @@ tools/editconf.py /etc/php5/fpm/php.ini \
...
@@ -77,7 +77,9 @@ tools/editconf.py /etc/php5/fpm/php.ini \
upload_max_filesize
=
16G
\
upload_max_filesize
=
16G
\
post_max_size
=
16G
\
post_max_size
=
16G
\
output_buffering
=
16384
\
output_buffering
=
16384
\
memory_limit
=
512M
memory_limit
=
512M
\
max_execution_time
=
600
\
short_open_tag
=
On
# Download and install the mail app
# Download and install the mail app
# TODO: enable mail app in ownCloud config, not exposed afaik?
# TODO: enable mail app in ownCloud config, not exposed afaik?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment