From c3f9623104bd30048e1bc6976478da21661a88e7 Mon Sep 17 00:00:00 2001 From: Antonio Terceiro Date: Thu, 21 May 2015 17:39:11 -0300 Subject: [PATCH] Rename development environment --- config/dev/config.yaml | 15 +++++++++++++++ config/dev/ips.yaml | 5 +++++ config/dev/iptables-filter-rules | 23 +++++++++++++++++++++++ config/dev/ssh_config | 30 ++++++++++++++++++++++++++++++ config/development/config.yaml | 15 --------------- config/development/ips.yaml | 5 ----- config/development/iptables-filter-rules | 23 ----------------------- config/development/ssh_config | 30 ------------------------------ 8 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 config/dev/config.yaml create mode 100644 config/dev/ips.yaml create mode 100644 config/dev/iptables-filter-rules create mode 100644 config/dev/ssh_config delete mode 100644 config/development/config.yaml delete mode 100644 config/development/ips.yaml delete mode 100644 config/development/iptables-filter-rules delete mode 100644 config/development/ssh_config diff --git a/config/dev/config.yaml b/config/dev/config.yaml new file mode 100644 index 0000000..0b90e42 --- /dev/null +++ b/config/dev/config.yaml @@ -0,0 +1,15 @@ +admins: + - ["Paulo Meirelles", "paulo@softwarelivre.org"] +external_hostname: dev.softwarepublico.gov.br +external_ip: 189.9.151.16 +site_url: https://dev.softwarepublico.gov.br +colab_from_address: '"Portal do Software Publico (dev)" ' +server_email: '"Portal do Software Publico (dev)" ' +email_subject_prefix: '[spb|dev]' +lists_hostname: listas.dev.softwarepublico.gov.br +lists_admin: paulo@softwarelivre.org +relay_hostname: relay.dev.softwarepublico.gov.br +from_address: noreply@dev.softwarepublico.gov.br +relay_hostname: relay.dev.softwarepublico.gov.br +relay_ip: 189.9.151.44 +external_outgoing_mail_relay: 189.9.150.53 diff --git a/config/dev/ips.yaml b/config/dev/ips.yaml new file mode 100644 index 0000000..93a0204 --- /dev/null +++ b/config/dev/ips.yaml @@ -0,0 +1,5 @@ +reverseproxy: 10.18.0.15 +database: 10.18.0.16 +social: 10.18.0.17 +email: 10.18.0.18 +integration: 10.18.0.19 diff --git a/config/dev/iptables-filter-rules b/config/dev/iptables-filter-rules new file mode 100644 index 0000000..095f11c --- /dev/null +++ b/config/dev/iptables-filter-rules @@ -0,0 +1,23 @@ + +-A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT +-A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 5432 -j ACCEPT +-A INPUT -s 200.198.196.192/26 -p icmp --icmp-type 8 -j ACCEPT +-A INPUT -s 200.198.196.201/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT +-A INPUT -s 200.198.196.206/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT + +-A INPUT -s 189.9.150.85/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT + + +# UnB +-A INPUT -s 164.41.86.12/32 -p tcp -m state --state NEW -m multiport --dports 22,80,443 -j ACCEPT +-A INPUT -s 164.41.9.36/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT + + +# Sergio Oliveira +-A INPUT -s 179.111.229.232/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT + + +-A INPUT -s 10.18.0.0/16 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT +-A INPUT -s 10.18.0.0/16 -p icmp --icmp-type 8 -j ACCEPT +-A INPUT -s 189.9.137.239/32 -p tcp -m state --state NEW -m tcp --dport 10050 -j ACCEPT +-A INPUT -s 189.9.137.239/32 -p icmp --icmp-type 8 -j ACCEPT diff --git a/config/dev/ssh_config b/config/dev/ssh_config new file mode 100644 index 0000000..e45f6cd --- /dev/null +++ b/config/dev/ssh_config @@ -0,0 +1,30 @@ +Host * + ForwardAgent yes + +Host reverseproxy + Hostname 189.9.151.16 + User spb + +Host database + Hostname 10.18.0.16 + User spb + # connect via reverseproxy host + ProxyCommand ssh spb@189.9.151.16 nc %h %p + +Host social + Hostname 10.18.0.17 + User spb + # connect via reverseproxy host + ProxyCommand ssh spb@189.9.151.16 nc %h %p + +Host email + Hostname 10.18.0.18 + User spb + # connect via reverseproxy host + ProxyCommand ssh spb@189.9.151.16 nc %h %p + +Host integration + Hostname 10.18.0.19 + User spb + # connect via reverseproxy host + ProxyCommand ssh spb@189.9.151.16 nc %h %p diff --git a/config/development/config.yaml b/config/development/config.yaml deleted file mode 100644 index 0b90e42..0000000 --- a/config/development/config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -admins: - - ["Paulo Meirelles", "paulo@softwarelivre.org"] -external_hostname: dev.softwarepublico.gov.br -external_ip: 189.9.151.16 -site_url: https://dev.softwarepublico.gov.br -colab_from_address: '"Portal do Software Publico (dev)" ' -server_email: '"Portal do Software Publico (dev)" ' -email_subject_prefix: '[spb|dev]' -lists_hostname: listas.dev.softwarepublico.gov.br -lists_admin: paulo@softwarelivre.org -relay_hostname: relay.dev.softwarepublico.gov.br -from_address: noreply@dev.softwarepublico.gov.br -relay_hostname: relay.dev.softwarepublico.gov.br -relay_ip: 189.9.151.44 -external_outgoing_mail_relay: 189.9.150.53 diff --git a/config/development/ips.yaml b/config/development/ips.yaml deleted file mode 100644 index 93a0204..0000000 --- a/config/development/ips.yaml +++ /dev/null @@ -1,5 +0,0 @@ -reverseproxy: 10.18.0.15 -database: 10.18.0.16 -social: 10.18.0.17 -email: 10.18.0.18 -integration: 10.18.0.19 diff --git a/config/development/iptables-filter-rules b/config/development/iptables-filter-rules deleted file mode 100644 index 095f11c..0000000 --- a/config/development/iptables-filter-rules +++ /dev/null @@ -1,23 +0,0 @@ - --A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 80 -j ACCEPT --A INPUT -s 200.198.196.192/26 -p tcp -m state --state NEW -m tcp --dport 5432 -j ACCEPT --A INPUT -s 200.198.196.192/26 -p icmp --icmp-type 8 -j ACCEPT --A INPUT -s 200.198.196.201/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT --A INPUT -s 200.198.196.206/32 -p tcp -m state --state NEW -m tcp --dport 22 -j ACCEPT - --A INPUT -s 189.9.150.85/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT - - -# UnB --A INPUT -s 164.41.86.12/32 -p tcp -m state --state NEW -m multiport --dports 22,80,443 -j ACCEPT --A INPUT -s 164.41.9.36/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT - - -# Sergio Oliveira --A INPUT -s 179.111.229.232/32 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT - - --A INPUT -s 10.18.0.0/16 -p tcp -m state --state NEW -m multiport --dports 22,80,5432 -j ACCEPT --A INPUT -s 10.18.0.0/16 -p icmp --icmp-type 8 -j ACCEPT --A INPUT -s 189.9.137.239/32 -p tcp -m state --state NEW -m tcp --dport 10050 -j ACCEPT --A INPUT -s 189.9.137.239/32 -p icmp --icmp-type 8 -j ACCEPT diff --git a/config/development/ssh_config b/config/development/ssh_config deleted file mode 100644 index e45f6cd..0000000 --- a/config/development/ssh_config +++ /dev/null @@ -1,30 +0,0 @@ -Host * - ForwardAgent yes - -Host reverseproxy - Hostname 189.9.151.16 - User spb - -Host database - Hostname 10.18.0.16 - User spb - # connect via reverseproxy host - ProxyCommand ssh spb@189.9.151.16 nc %h %p - -Host social - Hostname 10.18.0.17 - User spb - # connect via reverseproxy host - ProxyCommand ssh spb@189.9.151.16 nc %h %p - -Host email - Hostname 10.18.0.18 - User spb - # connect via reverseproxy host - ProxyCommand ssh spb@189.9.151.16 nc %h %p - -Host integration - Hostname 10.18.0.19 - User spb - # connect via reverseproxy host - ProxyCommand ssh spb@189.9.151.16 nc %h %p -- libgit2 0.21.2