Download as
Browse Code »

Commit b6f65282483b354d4fe11452f67ddf33c802e7e4

Authored by Sergio Oliveira
1 parent a3f8f787
Exists in master and in 59 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, create_institution_bootstrap_modal, design_validation, dev_env_minimal, disable_email_dev, fix_edit_institution, fix_edit_software_with_another_license, fix_list_style_inside_article, fix_members_pagination, fix_models_translations, fix_no_license, 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, mailinglist_page_title, margin_fix, mezuro_cookbook, organization_rating_style_changes, prezento, r3, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_secondary_email_from_user, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_catalog_style_fixes, spb_minimal_env, spec_refactor, stable-4.x, stable-devel, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Redirect alternatives domains to main 

Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
Showing 3 changed files with 35 additions and 0 deletions   Show diff stats
config/local/config.yaml
  Diff comments   View file @b6f6528
@@ -2,6 +2,10 @@ admins: @@ -2,6 +2,10 @@ admins:
2 - ["Paulo Meirelles", "paulo@softwarelivre.org"] 2 - ["Paulo Meirelles", "paulo@softwarelivre.org"]
3 site_url: https://softwarepublico.dev 3 site_url: https://softwarepublico.dev
4 external_hostname: softwarepublico.dev 4 external_hostname: softwarepublico.dev
  5 +alternative_hostnames:
  6 + - www.softwarepublico.dev
  7 + - beta.softwarepublico.dev
  8 + - portal.softwarepublico.dev
5 external_ip: 10.10.10.6 9 external_ip: 10.10.10.6
6 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.dev>' 10 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.dev>'
7 server_email: '"Portal do Software Publico" <noreply@softwarepublico.dev>' 11 server_email: '"Portal do Software Publico" <noreply@softwarepublico.dev>'
cookbooks/reverse_proxy/recipes/default.rb
  Diff comments   View file @b6f6528
@@ -29,3 +29,17 @@ template &#39;/etc/nginx/conf.d/reverse_proxy.conf&#39; do @@ -29,3 +29,17 @@ template &#39;/etc/nginx/conf.d/reverse_proxy.conf&#39; do
29 mode 0644 29 mode 0644
30 notifies :restart, 'service[nginx]' 30 notifies :restart, 'service[nginx]'
31 end 31 end
  32 +
  33 +template '/etc/nginx/conf.d/redirect.conf' do
  34 + owner 'root'
  35 + group 'root'
  36 + mode 0644
  37 + notifies :restart, 'service[nginx]'
  38 + only_if { node['config']['alternative_hostnames'] }
  39 +end
  40 +
  41 +file '/etc/nginx/conf.d/redirect.conf' do
  42 + action :delete
  43 + notifies :restart, 'service[nginx]'
  44 + not_if { node['config']['alternative_hostnames'] }
  45 +end
cookbooks/reverse_proxy/templates/redirect.conf.erb 0 → 100644
  Diff comments   View file @b6f6528
@@ -0,0 +1,17 @@ @@ -0,0 +1,17 @@
  1 +
  2 +server {
  3 + listen *:80;
  4 + listen *:443 ssl;
  5 +
  6 + server_name <% node['config']['alternative_hostnames'].each do |hostname| -%><%= hostname %> <% end %>;
  7 +
  8 + ssl_certificate /etc/nginx/<%= node['config']['external_hostname'] %>.crt;
  9 + ssl_certificate_key /etc/nginx/<%= node['config']['external_hostname'] %>.key;
  10 + ssl_session_cache shared:SSL:10m;
  11 + ssl_session_timeout 5m;
  12 + ssl_protocols SSLv3 TLSv1 TLSv1.1 TLSv1.2;
  13 + ssl_ciphers HIGH:!aNULL:!MD5;
  14 + ssl_prefer_server_ciphers on;
  15 +
  16 + rewrite ^ <%= node['config']['site_url']%>$request_uri?;
  17 +}