Download as
Browse Code »

Commit c3f9623104bd30048e1bc6976478da21661a88e7

Authored by Antonio Terceiro
1 parent ff7b3a78
Exists in master and in 90 other branches 3.x, add_sisp_to_chef, add_super_archives_plugin, api_for_colab, automates_core_packing, backup, 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

Rename development environment

Showing 8 changed files with 73 additions and 73 deletions   Show diff stats
config/dev/config.yaml 0 → 100644
  Diff comments   View file @c3f9623
... ... @@ -0,0 +1,15 @@
  1 +admins:
  2 + - ["Paulo Meirelles", "paulo@softwarelivre.org"]
  3 +external_hostname: dev.softwarepublico.gov.br
  4 +external_ip: 189.9.151.16
  5 +site_url: https://dev.softwarepublico.gov.br
  6 +colab_from_address: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>'
  7 +server_email: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>'
  8 +email_subject_prefix: '[spb|dev]'
  9 +lists_hostname: listas.dev.softwarepublico.gov.br
  10 +lists_admin: paulo@softwarelivre.org
  11 +relay_hostname: relay.dev.softwarepublico.gov.br
  12 +from_address: noreply@dev.softwarepublico.gov.br
  13 +relay_hostname: relay.dev.softwarepublico.gov.br
  14 +relay_ip: 189.9.151.44
  15 +external_outgoing_mail_relay: 189.9.150.53
... ...
config/dev/ips.yaml 0 → 100644
  Diff comments   View file @c3f9623
... ... @@ -0,0 +1,5 @@
  1 +reverseproxy: 10.18.0.15
  2 +database: 10.18.0.16
  3 +social: 10.18.0.17
  4 +email: 10.18.0.18
  5 +integration: 10.18.0.19
... ...
config/dev/iptables-filter-rules 0 → 100644
  Diff comments   View file @c3f9623
... ... @@ -0,0 +1,23 @@
  1 +
  2 +-A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
  3 +-A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 5432 -j ACCEPT
  4 +-A INPUT -s 200.198.196.192/26 -p icmp --icmp-type 8 -j ACCEPT
  5 +-A INPUT -s 200.198.196.201/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT
  6 +-A INPUT -s 200.198.196.206/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT
  7 +
  8 +-A INPUT -s 189.9.150.85/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
  9 +
  10 +
  11 +# UnB
  12 +-A INPUT -s 164.41.86.12/32 -p tcp -m state --state NEW -m multiport --dports 22,80,443 -j ACCEPT
  13 +-A INPUT -s 164.41.9.36/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
  14 +
  15 +
  16 +# Sergio Oliveira
  17 +-A INPUT -s 179.111.229.232/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
  18 +
  19 +
  20 +-A INPUT -s 10.18.0.0/16 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
  21 +-A INPUT -s 10.18.0.0/16 -p icmp --icmp-type 8 -j ACCEPT
  22 +-A INPUT -s 189.9.137.239/32 -p tcp -m state --state NEW -m tcp --dport 10050 -j ACCEPT
  23 +-A INPUT -s 189.9.137.239/32 -p icmp --icmp-type 8 -j ACCEPT
... ...
config/dev/ssh_config 0 → 100644
  Diff comments   View file @c3f9623
... ... @@ -0,0 +1,30 @@
  1 +Host *
  2 + ForwardAgent yes
  3 +
  4 +Host reverseproxy
  5 + Hostname 189.9.151.16
  6 + User spb
  7 +
  8 +Host database
  9 + Hostname 10.18.0.16
  10 + User spb
  11 + # connect via reverseproxy host
  12 + ProxyCommand ssh spb@189.9.151.16 nc %h %p
  13 +
  14 +Host social
  15 + Hostname 10.18.0.17
  16 + User spb
  17 + # connect via reverseproxy host
  18 + ProxyCommand ssh spb@189.9.151.16 nc %h %p
  19 +
  20 +Host email
  21 + Hostname 10.18.0.18
  22 + User spb
  23 + # connect via reverseproxy host
  24 + ProxyCommand ssh spb@189.9.151.16 nc %h %p
  25 +
  26 +Host integration
  27 + Hostname 10.18.0.19
  28 + User spb
  29 + # connect via reverseproxy host
  30 + ProxyCommand ssh spb@189.9.151.16 nc %h %p
... ...
config/development/config.yaml
View file @ff7b3a7
... ... @@ -1,15 +0,0 @@
1   -admins:
2   - - ["Paulo Meirelles", "paulo@softwarelivre.org"]
3   -external_hostname: dev.softwarepublico.gov.br
4   -external_ip: 189.9.151.16
5   -site_url: https://dev.softwarepublico.gov.br
6   -colab_from_address: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>'
7   -server_email: '"Portal do Software Publico (dev)" <noreply@dev.softwarepublico.gov.br>'
8   -email_subject_prefix: '[spb|dev]'
9   -lists_hostname: listas.dev.softwarepublico.gov.br
10   -lists_admin: paulo@softwarelivre.org
11   -relay_hostname: relay.dev.softwarepublico.gov.br
12   -from_address: noreply@dev.softwarepublico.gov.br
13   -relay_hostname: relay.dev.softwarepublico.gov.br
14   -relay_ip: 189.9.151.44
15   -external_outgoing_mail_relay: 189.9.150.53
config/development/ips.yaml
View file @ff7b3a7
... ... @@ -1,5 +0,0 @@
1   -reverseproxy: 10.18.0.15
2   -database: 10.18.0.16
3   -social: 10.18.0.17
4   -email: 10.18.0.18
5   -integration: 10.18.0.19
config/development/iptables-filter-rules
View file @ff7b3a7
... ... @@ -1,23 +0,0 @@
1   -
2   --A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT
3   --A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 5432 -j ACCEPT
4   --A INPUT -s 200.198.196.192/26 -p icmp --icmp-type 8 -j ACCEPT
5   --A INPUT -s 200.198.196.201/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT
6   --A INPUT -s 200.198.196.206/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT
7   -
8   --A INPUT -s 189.9.150.85/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
9   -
10   -
11   -# UnB
12   --A INPUT -s 164.41.86.12/32 -p tcp -m state --state NEW -m multiport --dports 22,80,443 -j ACCEPT
13   --A INPUT -s 164.41.9.36/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
14   -
15   -
16   -# Sergio Oliveira
17   --A INPUT -s 179.111.229.232/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
18   -
19   -
20   --A INPUT -s 10.18.0.0/16 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT
21   --A INPUT -s 10.18.0.0/16 -p icmp --icmp-type 8 -j ACCEPT
22   --A INPUT -s 189.9.137.239/32 -p tcp -m state --state NEW -m tcp --dport 10050 -j ACCEPT
23   --A INPUT -s 189.9.137.239/32 -p icmp --icmp-type 8 -j ACCEPT
config/development/ssh_config
View file @ff7b3a7
... ... @@ -1,30 +0,0 @@
1   -Host *
2   - ForwardAgent yes
3   -
4   -Host reverseproxy
5   - Hostname 189.9.151.16
6   - User spb
7   -
8   -Host database
9   - Hostname 10.18.0.16
10   - User spb
11   - # connect via reverseproxy host
12   - ProxyCommand ssh spb@189.9.151.16 nc %h %p
13   -
14   -Host social
15   - Hostname 10.18.0.17
16   - User spb
17   - # connect via reverseproxy host
18   - ProxyCommand ssh spb@189.9.151.16 nc %h %p
19   -
20   -Host email
21   - Hostname 10.18.0.18
22   - User spb
23   - # connect via reverseproxy host
24   - ProxyCommand ssh spb@189.9.151.16 nc %h %p
25   -
26   -Host integration
27   - Hostname 10.18.0.19
28   - User spb
29   - # connect via reverseproxy host
30   - ProxyCommand ssh spb@189.9.151.16 nc %h %p