Merge branch 'update_upload_size' into 'master'

Update upload size See merge request !33

Merge branch 'update_upload_size' into 'master'
Update upload size See merge request !33
Antonio Terceiro
2 parents cd74d278 c4f1425e
Showing 6 changed files with 12 additions and 1 deletions Show diff stats
cookbooks/colab/templates/colab.conf.erb
cookbooks/gitlab/templates/nginx.conf.erb
cookbooks/noosfero/files/noosfero.yml
cookbooks/noosfero/recipes/default.rb
cookbooks/noosfero/templates/nginx.conf.erb
cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
@@ -9,6 +9,7 @@ server {
  
   access_log            /var/log/nginx/colab.access.log;
   error_log             /var/log/nginx/colab.error.log;
+  client_max_body_size  150m;
  
   location ~ ^/static/img/fav\.[^.]+\.ico$ {
     alias /var/lib/colab-assets/spb/fav.ico;
@@ -6,9 +6,10 @@ server {
   listen                *:81;
  
   server_name           <%= node['config']['external_hostname'] %>;
-  underscores_in_headers  on; 
+  underscores_in_headers  on;
   access_log            /var/log/nginx/gitlab.access.log;
   error_log             /var/log/nginx/gitlab.error.log;
+  client_max_body_size  20m;
  
   location /gitlab/assets/ {
     alias /usr/lib/gitlab/public/assets/;
@@ -0,0 +1,2 @@
+production:
+  max_upload_size: 150MB
@@ -103,6 +103,11 @@ template &#39;/etc/nginx/conf.d/noosfero.conf&#39; do
   notifies :restart, 'service[nginx]'
 end
  
+cookbook_file '/usr/lib/noosfero/config/noosfero.yml' do
+  owner 'root'; group 'root'; mode 0644
+  source 'noosfero.yml'
+  notifies :restart, 'service[noosfero]'
+end
 ###############################################
 #  SELinux: permission to access static files noosfero
 ################################################
@@ -12,6 +12,7 @@ server {
   underscores_in_headers  on;
   access_log            /var/log/nginx/noosfero.access.log;
   error_log             /var/log/nginx/noosfero.error.log;
+  client_max_body_size  150m;
  
   root /usr/lib/noosfero/public;
   location /social/ {
@@ -13,6 +13,7 @@ server {
   listen                *:443 ssl;
  
   server_name           <%= node['config']['external_hostname'] %>;
+  client_max_body_size  150m;
  
   ssl on;
...	...	@@ -9,6 +9,7 @@ server {
9	9
10	10	access_log /var/log/nginx/colab.access.log;
11	11	error_log /var/log/nginx/colab.error.log;
	12	+ client_max_body_size 150m;
12	13
13	14	location ~ ^/static/img/fav\.[^.]+\.ico$ {
14	15	alias /var/lib/colab-assets/spb/fav.ico;
...	...
...	...	@@ -6,9 +6,10 @@ server {
6	6	listen *:81;
7	7
8	8	server_name <%= node['config']['external_hostname'] %>;
9		- underscores_in_headers on;
	9	+ underscores_in_headers on;
10	10	access_log /var/log/nginx/gitlab.access.log;
11	11	error_log /var/log/nginx/gitlab.error.log;
	12	+ client_max_body_size 20m;
12	13
13	14	location /gitlab/assets/ {
14	15	alias /usr/lib/gitlab/public/assets/;
...	...
...	...	@@ -0,0 +1,2 @@
	1	+production:
	2	+ max_upload_size: 150MB
...	...
...	...	@@ -103,6 +103,11 @@ template '/etc/nginx/conf.d/noosfero.conf' do
103	103	notifies :restart, 'service[nginx]'
104	104	end
105	105
	106	+cookbook_file '/usr/lib/noosfero/config/noosfero.yml' do
	107	+ owner 'root'; group 'root'; mode 0644
	108	+ source 'noosfero.yml'
	109	+ notifies :restart, 'service[noosfero]'
	110	+end
106	111	###############################################
107	112	# SELinux: permission to access static files noosfero
108	113	################################################
...	...
...	...	@@ -12,6 +12,7 @@ server {
12	12	underscores_in_headers on;
13	13	access_log /var/log/nginx/noosfero.access.log;
14	14	error_log /var/log/nginx/noosfero.error.log;
	15	+ client_max_body_size 150m;
15	16
16	17	root /usr/lib/noosfero/public;
17	18	location /social/ {
...	...
...	...	@@ -13,6 +13,7 @@ server {
13	13	listen *:443 ssl;
14	14
15	15	server_name <%= node['config']['external_hostname'] %>;
	16	+ client_max_body_size 150m;
16	17
17	18	ssl on;
18	19
...	...