Download as
Browse Code »

Commit 18d71e71b2234739225fefa992f0d911b2bf6cb8

Authored by Antonio Terceiro
2 parents cd74d278 c4f1425e
Exists in master and in 64 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_edit_software_permission, fix_edit_software_with_another_license, fix_hover_button_whitening, fix_members_pagination, fix_models_translations, fix_software_api, fix_software_block_migration, fix_validations_and_tests, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc, margin_fix, mezuro_cookbook, organization_rating_style_changes, performance, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_community_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_improvements, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

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,6 +9,7 @@ server {
9 9
10 access_log /var/log/nginx/colab.access.log; 10 access_log /var/log/nginx/colab.access.log;
11 error_log /var/log/nginx/colab.error.log; 11 error_log /var/log/nginx/colab.error.log;
  12 + client_max_body_size 150m;
12 13
13 location ~ ^/static/img/fav\.[^.]+\.ico$ { 14 location ~ ^/static/img/fav\.[^.]+\.ico$ {
14 alias /var/lib/colab-assets/spb/fav.ico; 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,9 +6,10 @@ server {
6 listen *:81; 6 listen *:81;
7 7
8 server_name <%= node['config']['external_hostname'] %>; 8 server_name <%= node['config']['external_hostname'] %>;
9 - underscores_in_headers on; 9 + underscores_in_headers on;
10 access_log /var/log/nginx/gitlab.access.log; 10 access_log /var/log/nginx/gitlab.access.log;
11 error_log /var/log/nginx/gitlab.error.log; 11 error_log /var/log/nginx/gitlab.error.log;
  12 + client_max_body_size 20m;
12 13
13 location /gitlab/assets/ { 14 location /gitlab/assets/ {
14 alias /usr/lib/gitlab/public/assets/; 15 alias /usr/lib/gitlab/public/assets/;
cookbooks/noosfero/files/noosfero.yml 0 → 100644
  Diff comments   View file @18d71e7
@@ -0,0 +1,2 @@ @@ -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,6 +103,11 @@ template &#39;/etc/nginx/conf.d/noosfero.conf&#39; do
103 notifies :restart, 'service[nginx]' 103 notifies :restart, 'service[nginx]'
104 end 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 # SELinux: permission to access static files noosfero 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,6 +12,7 @@ server {
12 underscores_in_headers on; 12 underscores_in_headers on;
13 access_log /var/log/nginx/noosfero.access.log; 13 access_log /var/log/nginx/noosfero.access.log;
14 error_log /var/log/nginx/noosfero.error.log; 14 error_log /var/log/nginx/noosfero.error.log;
  15 + client_max_body_size 150m;
15 16
16 root /usr/lib/noosfero/public; 17 root /usr/lib/noosfero/public;
17 location /social/ { 18 location /social/ {
cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb
  Diff comments   View file @18d71e7
@@ -13,6 +13,7 @@ server { @@ -13,6 +13,7 @@ server {
13 listen *:443 ssl; 13 listen *:443 ssl;
14 14
15 server_name <%= node['config']['external_hostname'] %>; 15 server_name <%= node['config']['external_hostname'] %>;
  16 + client_max_body_size 150m;
16 17
17 ssl on; 18 ssl on;
18 19