Download as
Browse Code »

Commit 3fe37b633123bab79e996addef51cb54e076df7c

Authored by Antonio Terceiro
2 parents bb54d68e f6283f42
Exists in master and in 66 other branches 3.x, add_you_are_here_breadcrumbs_label, api_for_colab, backup_not_prod, button_suspension_points_remove, cdtc_configuration, create_institution_bootstrap_modal, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, 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, 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_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, support_docs, syslog, temp_soft_comm_refactoring, thread_dropdown, thread_page, update_software_api, update_softwares_boxes

Merge branch 'analytics' into 'master' 

Analytics

Include Google Analytics code to dev, prod and homolog environment

See merge request !35
Showing 4 changed files with 5 additions and 0 deletions   Show diff stats
config/dev/config.yaml
  Diff comments   View file @3fe37b6
@@ -14,3 +14,4 @@ relay_ip: 189.9.151.44 @@ -14,3 +14,4 @@ relay_ip: 189.9.151.44
14 external_outgoing_mail_relay: 189.9.150.53 14 external_outgoing_mail_relay: 189.9.150.53
15 alt_ssh_port: 55555 15 alt_ssh_port: 55555
16 external_outgoing_mail_domain: serpro.gov.br 16 external_outgoing_mail_domain: serpro.gov.br
  17 +google_analytics_id: 'UA-64206731-2'
config/homologa/config.yaml
  Diff comments   View file @3fe37b6
@@ -15,3 +15,4 @@ relay_hostname: relay.homologa.softwarepublico.gov.br @@ -15,3 +15,4 @@ relay_hostname: relay.homologa.softwarepublico.gov.br
15 relay_ip: 189.9.151.66 15 relay_ip: 189.9.151.66
16 external_outgoing_mail_relay: 189.9.150.53 16 external_outgoing_mail_relay: 189.9.150.53
17 external_outgoing_mail_domain: serpro.gov.br 17 external_outgoing_mail_domain: serpro.gov.br
  18 +google_analytics_id: 'UA-64206731-3'
config/prod/config.yaml
  Diff comments   View file @3fe37b6
@@ -15,3 +15,4 @@ relay_hostname: relay.softwarepublico.gov.br @@ -15,3 +15,4 @@ relay_hostname: relay.softwarepublico.gov.br
15 relay_ip: 189.9.151.68 15 relay_ip: 189.9.151.68
16 external_outgoing_mail_relay: 189.9.150.53 16 external_outgoing_mail_relay: 189.9.150.53
17 external_outgoing_mail_domain: serpro.gov.br 17 external_outgoing_mail_domain: serpro.gov.br
  18 +google_analytics_id: 'UA-64206731-1'
cookbooks/colab/templates/settings.yaml.erb
  Diff comments   View file @3fe37b6
@@ -43,3 +43,5 @@ FEEDZILLA_ENABLED: false @@ -43,3 +43,5 @@ FEEDZILLA_ENABLED: false
43 43
44 ## Set URL of Colab home 44 ## Set URL of Colab home
45 COLAB_HOME_URL: '/social' 45 COLAB_HOME_URL: '/social'
  46 +
  47 +GOOGLE_ANALYTICS_TRACKING_ID: '<%= node['config']['google_analytics_id'] %>'