diff --git a/cookbooks/colab/templates/colab.conf.erb b/cookbooks/colab/templates/colab.conf.erb index 71ed34b..13613d1 100644 --- a/cookbooks/colab/templates/colab.conf.erb +++ b/cookbooks/colab/templates/colab.conf.erb @@ -5,7 +5,7 @@ upstream colab { server { listen *:80; - server_name <%= node['config']['external_hostname'] %> softwarepublico.dev; + server_name <%= node['config']['external_hostname'] %>; access_log /var/log/nginx/colab.access.log; error_log /var/log/nginx/colab.error.log; diff --git a/cookbooks/colab/templates/settings.yaml.erb b/cookbooks/colab/templates/settings.yaml.erb index 203bcb9..faf2935 100644 --- a/cookbooks/colab/templates/settings.yaml.erb +++ b/cookbooks/colab/templates/settings.yaml.erb @@ -35,7 +35,6 @@ BROWSERID_AUDIENCES: - <%= node['config']['site_url'].sub('https:', 'http:') %> ALLOWED_HOSTS: - - softwarepublico.dev # for development/tests - <%= node['config']['external_hostname'] %> ## Disable indexing diff --git a/nodes.yaml b/nodes.yaml index d7605a6..d6d13df 100644 --- a/nodes.yaml +++ b/nodes.yaml @@ -7,10 +7,10 @@ vagrant@integration: - - Paulo Meirelles - paulo@softwarelivre.org - external_hostname: beta.softwarepublico.gov.br - site_url: https://beta.softwarepublico.gov.br - colab_from_address: '"Portal do Software Publico" ' - server_email: '"Portal do Software Publico" ' + external_hostname: softwarepublico.dev + site_url: https://softwarepublico.dev + colab_from_address: '"Portal do Software Publico" ' + server_email: '"Portal do Software Publico" ' email_subject_prefix: '[spb]' peers: &PEERS integration: 10.10.10.2 -- libgit2 0.21.2