Download as
Browse Code »

Commit 3193675cc487964f4ec135e1e8a986d87c3f17e5

Authored by Alexandre Barbosa
1 parent 798b43ca
Exists in master and in 45 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, 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_merge_request_url, fix_models_translations, fix_no_license, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories

Config SISP url in Colab settings 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Showing 2 changed files with 4 additions and 0 deletions   Show diff stats
cookbooks/colab/templates/00-custom_settings.py.erb
  Diff comments   View file @3193675
@@ -28,6 +28,9 @@ SECRET_KEY = &quot;&lt;%= File.read(&#39;/etc/colab/secret.key&#39;).strip %&gt;&quot; @@ -28,6 +28,9 @@ SECRET_KEY = &quot;&lt;%= File.read(&#39;/etc/colab/secret.key&#39;).strip %&gt;&quot;
28 28
29 SITE_URL = "<%= node['config']['site_url'] %>" 29 SITE_URL = "<%= node['config']['site_url'] %>"
30 30
  31 +SPB_HOST = "<%= node['config']['external_hostname'] %>"
  32 +SISP_HOST = "<%= node['config']['sisp_external_hostname'] %>"
  33 +
31 ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>", 34 ALLOWED_HOSTS = ["<%= node['config']['external_hostname'] %>",
32 "<%= node['config']['sisp_external_hostname'] %>"] 35 "<%= node['config']['sisp_external_hostname'] %>"]
33 36
cookbooks/colab/templates/spb.py.erb
  Diff comments   View file @3193675
@@ -5,6 +5,7 @@ name = &quot;colab_spb&quot; @@ -5,6 +5,7 @@ name = &quot;colab_spb&quot;
5 verbose_name = "SPB Plugin" 5 verbose_name = "SPB Plugin"
6 6
7 middlewares = ['colab_spb.middleware.ForceLangMiddleware'] 7 middlewares = ['colab_spb.middleware.ForceLangMiddleware']
  8 +context_processors = ['colab_spb.context_processors.multiportal_url']
8 9
9 urls = { 10 urls = {
10 "include":"colab_spb.urls", 11 "include":"colab_spb.urls",