diff --git a/config/local/config.yaml b/config/local/config.yaml index 6501497..3eeed78 100644 --- a/config/local/config.yaml +++ b/config/local/config.yaml @@ -17,3 +17,4 @@ relay_ip: 10.10.10.3 alt_ssh_port: 5555 from_address: noreply@softwarepublico.dev raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19 +colab_http_workers: 1 diff --git a/config/prod/config.yaml b/config/prod/config.yaml index 4cc4049..2ee4dcb 100644 --- a/config/prod/config.yaml +++ b/config/prod/config.yaml @@ -23,3 +23,4 @@ external_outgoing_mail_domain: serpro.gov.br raven_dsn: https://4418146896924efe9b73d557f803f047:8a59f39b5f584ff589ecf3dd47faaead@sentry.tracy.com.br/13 google_analytics_id: 'UA-64206731-1' munin_master: 10.21.0.10 +colab_http_workers: 32 diff --git a/cookbooks/colab/recipes/default.rb b/cookbooks/colab/recipes/default.rb index 7de49c3..e978a57 100644 --- a/cookbooks/colab/recipes/default.rb +++ b/cookbooks/colab/recipes/default.rb @@ -46,10 +46,7 @@ execute 'secret-key' do notifies :create, 'template[/etc/colab/settings.d/00-custom_settings.py]' end -template '/etc/sysconfig/colab' do - owner 'root' - group 'root' - mode '0640' +template '/etc/colab/gunicorn.py' do notifies :restart, 'service[colab]' end diff --git a/cookbooks/colab/templates/colab.erb b/cookbooks/colab/templates/colab.erb deleted file mode 100644 index 06e8491..0000000 --- a/cookbooks/colab/templates/colab.erb +++ /dev/null @@ -1 +0,0 @@ -WEB_CONCURRENCY=<%= `nproc`.to_i * 4 %> diff --git a/cookbooks/colab/templates/gunicorn.py.erb b/cookbooks/colab/templates/gunicorn.py.erb new file mode 100644 index 0000000..fa3c964 --- /dev/null +++ b/cookbooks/colab/templates/gunicorn.py.erb @@ -0,0 +1,6 @@ +import multiprocessing + +bind = "127.0.0.1:8001" +workers = <%= node['config']['colab_http_workers'] || 'multiprocessing.cpu_count() * 2 + 1' %> +syslog = True +proc_name = "colab" -- libgit2 0.21.2