Download as
Browse Code »

Commit 3fe37b633123bab79e996addef51cb54e076df7c

Authored by Antonio Terceiro
2 parents bb54d68e f6283f42
Exists in master and in 89 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, cdtc_configuration, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, design_validation, dev-lappis, dev_env_minimal, disable_email_dev, docs, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_api, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, focus_search_field_theme, gov-user-refactoring, gov-user-refactoring-rails4, header_fix, institution_modal_on_rating, kalibro-conf-refactoring, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, performance, prezento, r3, refactor_download_block, refactor_software_communities, refactor_software_for_sisp, register_page, release-process, release-process-v2, remove-unused-images, remove_backup_emails, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, removing_super_archives_email, review_message, scope2method, signals_user_noosfero, sisp_catalog_header, sisp_colab_config, sisp_dev, sisp_dev_master, sisp_simple_version, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_minimal_env, spb_to_rails4, spec_refactor, stable-4.1, stable-4.2, stable-4.x, stable-devel, support_docs, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, 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 14 external_outgoing_mail_relay: 189.9.150.53
15 15 alt_ssh_port: 55555
16 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 15 relay_ip: 189.9.151.66
16 16 external_outgoing_mail_relay: 189.9.150.53
17 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 15 relay_ip: 189.9.151.68
16 16 external_outgoing_mail_relay: 189.9.150.53
17 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 43  
44 44 ## Set URL of Colab home
45 45 COLAB_HOME_URL: '/social'
  46 +
  47 +GOOGLE_ANALYTICS_TRACKING_ID: '<%= node['config']['google_analytics_id'] %>'
... ...