Commit 2b54f094893b8fa8bf59ead489b188df3b727aed

Authored by David Silva
1 parent bf0582c7
Exists in master and in 86 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup_not_prod, 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, 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, syslog, temp_soft_comm_refactoring, theme_header, theme_javascript_refactory, thread_dropdown, thread_page, update_search_by_categories, update_software_api, update_softwares_boxes

Change environment name from dev to lappis.

Signed-off-by: Alessandro Caetano <alessandro.caetanob@gmail.com>
config/dev-lappis/config.yaml
@@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
1 -admins:  
2 - - ["Paulo Meirelles", "paulo@softwarelivre.org"]  
3 -site_url: https://softwarepublico.dev  
4 -external_hostname: softwarepublico.dev  
5 -external_ip: 10.0.0.11  
6 -colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.dev>'  
7 -server_email: '"Portal do Software Publico" <noreply@softwarepublico.dev>'  
8 -email_subject_prefix: '[spb]'  
9 -lists_hostname: listas.softwarepublico.dev  
10 -lists_admin: paulo@softwarelivre.org  
11 -relay_hostname: relay.softwarepublico.dev  
12 -relay_ip: 10.0.0.15  
13 -alt_ssh_port: 5555  
14 -from_address: noreply@softwarepublico.dev  
15 -  
config/dev-lappis/ips.yaml
@@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
1 -reverseproxy: 10.0.0.11  
2 -database: 10.0.0.13  
3 -social: 10.0.0.14  
4 -email: 10.0.0.15  
5 -integration: 10.0.0.12  
config/dev-lappis/iptables-filter-rules
config/dev-lappis/ssh_config
@@ -1,29 +0,0 @@ @@ -1,29 +0,0 @@
1 -Host *  
2 - ForwardAgent yes  
3 -  
4 -Host reverseproxy.unconfigured  
5 - Hostname 10.0.0.11  
6 -  
7 -Host reverseproxy  
8 - Hostname 10.0.0.11  
9 - Port 5555  
10 - ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p  
11 -  
12 -Host database  
13 - Hostname 10.0.0.13  
14 - # connect via reverseproxy host  
15 - ProxyCommand ssh 10.0.0.11 nc %h %p  
16 -  
17 -Host social  
18 - Hostname 10.0.0.14  
19 - # connect via reverseproxy host  
20 - ProxyCommand ssh 10.0.0.11 nc %h %p  
21 -  
22 -Host email  
23 - Hostname 10.0.0.15  
24 - # connect via reverseproxy host  
25 - ProxyCommand ssh 10.0.0.11 nc %h %p  
26 -  
27 -Host integration  
28 - Hostname 10.0.0.11  
29 - # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand  
config/lappis/config.yaml 0 → 100644
@@ -0,0 +1,15 @@ @@ -0,0 +1,15 @@
  1 +admins:
  2 + - ["Paulo Meirelles", "paulo@softwarelivre.org"]
  3 +site_url: https://softwarepublico.lappis
  4 +external_hostname: softwarepublico.lappis
  5 +external_ip: 10.0.0.11
  6 +colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
  7 +server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
  8 +email_subject_prefix: '[spb]'
  9 +lists_hostname: listas.softwarepublico.lappis
  10 +lists_admin: paulo@softwarelivre.org
  11 +relay_hostname: relay.softwarepublico.lappis
  12 +relay_ip: 10.0.0.15
  13 +alt_ssh_port: 5555
  14 +from_address: noreply@softwarepublico.lappis
  15 +
config/lappis/ips.yaml 0 → 100644
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
  1 +reverseproxy: 10.0.0.11
  2 +database: 10.0.0.13
  3 +social: 10.0.0.14
  4 +email: 10.0.0.15
  5 +integration: 10.0.0.12
config/lappis/iptables-filter-rules 0 → 100644
config/lappis/ssh_config 0 → 100644
@@ -0,0 +1,29 @@ @@ -0,0 +1,29 @@
  1 +Host *
  2 + ForwardAgent yes
  3 +
  4 +Host reverseproxy.unconfigured
  5 + Hostname 10.0.0.11
  6 +
  7 +Host reverseproxy
  8 + Hostname 10.0.0.11
  9 + Port 5555
  10 + ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p
  11 +
  12 +Host database
  13 + Hostname 10.0.0.13
  14 + # connect via reverseproxy host
  15 + ProxyCommand ssh 10.0.0.11 nc %h %p
  16 +
  17 +Host social
  18 + Hostname 10.0.0.14
  19 + # connect via reverseproxy host
  20 + ProxyCommand ssh 10.0.0.11 nc %h %p
  21 +
  22 +Host email
  23 + Hostname 10.0.0.15
  24 + # connect via reverseproxy host
  25 + ProxyCommand ssh 10.0.0.11 nc %h %p
  26 +
  27 +Host integration
  28 + Hostname 10.0.0.11
  29 + # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand