diff --git a/cookbooks/colab/templates/colab.conf.erb b/cookbooks/colab/templates/colab.conf.erb index 1c92f71..046af6d 100644 --- a/cookbooks/colab/templates/colab.conf.erb +++ b/cookbooks/colab/templates/colab.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/logo\.[^.]+\.svg$ { alias /var/lib/colab-assets/spb/logo.svg; diff --git a/cookbooks/gitlab/templates/nginx.conf.erb b/cookbooks/gitlab/templates/nginx.conf.erb index 0adf13b..c4763a2 100644 --- a/cookbooks/gitlab/templates/nginx.conf.erb +++ b/cookbooks/gitlab/templates/nginx.conf.erb @@ -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/; diff --git a/cookbooks/noosfero/files/noosfero.yml b/cookbooks/noosfero/files/noosfero.yml index 4c0e86f..d1434f0 100644 --- a/cookbooks/noosfero/files/noosfero.yml +++ b/cookbooks/noosfero/files/noosfero.yml @@ -1,17 +1,2 @@ -development: - #mail_enabled: true - #webmail_url: "http://localhost.localdomain/" - #addthis_enabled: true - #addthis_pub: your-user-name - #addthis_logo: http://localhost:3000/images/logo-200x50.png - #addthis_options: favorites, email, digg, delicious, technorati, slashdot, twitter, more - #gravatar: mm - #googlemaps_initial_zoom: 4 - #exception_recipients: [admin@example.com] - #max_upload_size: 5MB - #hours_until_user_activation_check: 72 - -test: - production: max_upload_size: 150MB diff --git a/cookbooks/noosfero/recipes/default.rb b/cookbooks/noosfero/recipes/default.rb index 485a77d..fed28c6 100644 --- a/cookbooks/noosfero/recipes/default.rb +++ b/cookbooks/noosfero/recipes/default.rb @@ -67,10 +67,9 @@ template '/etc/nginx/conf.d/noosfero.conf' do notifies :restart, 'service[nginx]' end -cookbook_file '/user/lib/noosfero/config/noosfero.yml' do +cookbook_file '/usr/lib/noosfero/config/noosfero.yml' do owner 'root'; group 'root'; mode 0644 source 'noosfero.yml' - action :create_if_missing notifies :restart, 'service[noosfero]' end ############################################### diff --git a/cookbooks/noosfero/templates/nginx.conf.erb b/cookbooks/noosfero/templates/nginx.conf.erb index f24dace..c32bf68 100644 --- a/cookbooks/noosfero/templates/nginx.conf.erb +++ b/cookbooks/noosfero/templates/nginx.conf.erb @@ -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/ { diff --git a/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb b/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb index 2b4cb54..e83c419 100644 --- a/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb +++ b/cookbooks/reverse_proxy/templates/reverse_proxy.conf.erb @@ -13,6 +13,7 @@ server { listen *:443 ssl; server_name <%= node['config']['external_hostname'] %>; + client_max_body_size 150m; ssl on; -- libgit2 0.21.2