Download as
Browse Code »

Commit 18d71e71b2234739225fefa992f0d911b2bf6cb8

Authored by Antonio Terceiro
2 parents cd74d278 c4f1425e
Exists in master and in 36 other branches add_super_archives_plugin, automates_core_packing, changes_in_buttons_on_content_panel, colab_fix_automatic_group_creation_bug, gitlab-8.x, gov-user-refactoring, gov-user-refactoring-rails4, gov-user-to-organization, high_contrast, high_contrast_style, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, mezuro_spb, packaging_colab_plugins, performance, refactor_software_communities, refactor_software_communities_rails4, refactor_software_for_sisp, refactor_software_info_to_software, register_page, remove-unused-images, removing_super_archives_email, restore, signals_user_noosfero, software_as_organization, spb_minimal_env, stable-4.1, stable-4.2, stable-4.x, stable-5.0, stable-5.1, stable-devel, temp_soft_comm_refactoring, theme_header, thread_page

Merge branch 'update_upload_size' into 'master' 

Update upload size

See merge request !33
Showing 6 changed files with 12 additions and 1 deletions   Show diff stats
cookbooks/colab/templates/colab.conf.erb
  Diff comments   View file @18d71e7
... ... @@ -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;
... ...
cookbooks/gitlab/templates/nginx.conf.erb
  Diff comments   View file @18d71e7
... ... @@ -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/;
... ...
cookbooks/noosfero/files/noosfero.yml 0 → 100644
  Diff comments   View file @18d71e7
... ... @@ -0,0 +1,2 @@
  1 +production:
  2 + max_upload_size: 150MB
... ...
cookbooks/noosfero/recipes/default.rb
  Diff comments   View file @18d71e7
... ... @@ -103,6 +103,11 @@ template &#39;/etc/nginx/conf.d/noosfero.conf&#39; 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 ################################################
... ...
cookbooks/noosfero/templates/nginx.conf.erb
  Diff comments   View file @18d71e7
... ... @@ -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/ {
... ...
cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
  Diff comments   View file @18d71e7
... ... @@ -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  
... ...