From 2b54f094893b8fa8bf59ead489b188df3b727aed Mon Sep 17 00:00:00 2001 From: David Carlos Date: Mon, 24 Aug 2015 16:00:48 -0300 Subject: [PATCH] Change environment name from dev to lappis. --- config/dev-lappis/config.yaml | 15 --------------- config/dev-lappis/ips.yaml | 5 ----- config/dev-lappis/iptables-filter-rules | 0 config/dev-lappis/ssh_config | 29 ----------------------------- config/lappis/config.yaml | 15 +++++++++++++++ config/lappis/ips.yaml | 5 +++++ config/lappis/iptables-filter-rules | 0 config/lappis/ssh_config | 29 +++++++++++++++++++++++++++++ 8 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 config/dev-lappis/config.yaml delete mode 100644 config/dev-lappis/ips.yaml delete mode 100644 config/dev-lappis/iptables-filter-rules delete mode 100644 config/dev-lappis/ssh_config create mode 100644 config/lappis/config.yaml create mode 100644 config/lappis/ips.yaml create mode 100644 config/lappis/iptables-filter-rules create mode 100644 config/lappis/ssh_config diff --git a/config/dev-lappis/config.yaml b/config/dev-lappis/config.yaml deleted file mode 100644 index 7fac6ce..0000000 --- a/config/dev-lappis/config.yaml +++ /dev/null @@ -1,15 +0,0 @@ -admins: - - ["Paulo Meirelles", "paulo@softwarelivre.org"] -site_url: https://softwarepublico.dev -external_hostname: softwarepublico.dev -external_ip: 10.0.0.11 -colab_from_address: '"Portal do Software Publico" ' -server_email: '"Portal do Software Publico" ' -email_subject_prefix: '[spb]' -lists_hostname: listas.softwarepublico.dev -lists_admin: paulo@softwarelivre.org -relay_hostname: relay.softwarepublico.dev -relay_ip: 10.0.0.15 -alt_ssh_port: 5555 -from_address: noreply@softwarepublico.dev - diff --git a/config/dev-lappis/ips.yaml b/config/dev-lappis/ips.yaml deleted file mode 100644 index dcab37c..0000000 --- a/config/dev-lappis/ips.yaml +++ /dev/null @@ -1,5 +0,0 @@ -reverseproxy: 10.0.0.11 -database: 10.0.0.13 -social: 10.0.0.14 -email: 10.0.0.15 -integration: 10.0.0.12 diff --git a/config/dev-lappis/iptables-filter-rules b/config/dev-lappis/iptables-filter-rules deleted file mode 100644 index e69de29..0000000 --- a/config/dev-lappis/iptables-filter-rules +++ /dev/null diff --git a/config/dev-lappis/ssh_config b/config/dev-lappis/ssh_config deleted file mode 100644 index a63f900..0000000 --- a/config/dev-lappis/ssh_config +++ /dev/null @@ -1,29 +0,0 @@ -Host * - ForwardAgent yes - -Host reverseproxy.unconfigured - Hostname 10.0.0.11 - -Host reverseproxy - Hostname 10.0.0.11 - Port 5555 - ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p - -Host database - Hostname 10.0.0.13 - # connect via reverseproxy host - ProxyCommand ssh 10.0.0.11 nc %h %p - -Host social - Hostname 10.0.0.14 - # connect via reverseproxy host - ProxyCommand ssh 10.0.0.11 nc %h %p - -Host email - Hostname 10.0.0.15 - # connect via reverseproxy host - ProxyCommand ssh 10.0.0.11 nc %h %p - -Host integration - Hostname 10.0.0.11 - # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand diff --git a/config/lappis/config.yaml b/config/lappis/config.yaml new file mode 100644 index 0000000..fbaf138 --- /dev/null +++ b/config/lappis/config.yaml @@ -0,0 +1,15 @@ +admins: + - ["Paulo Meirelles", "paulo@softwarelivre.org"] +site_url: https://softwarepublico.lappis +external_hostname: softwarepublico.lappis +external_ip: 10.0.0.11 +colab_from_address: '"Portal do Software Publico" ' +server_email: '"Portal do Software Publico" ' +email_subject_prefix: '[spb]' +lists_hostname: listas.softwarepublico.lappis +lists_admin: paulo@softwarelivre.org +relay_hostname: relay.softwarepublico.lappis +relay_ip: 10.0.0.15 +alt_ssh_port: 5555 +from_address: noreply@softwarepublico.lappis + diff --git a/config/lappis/ips.yaml b/config/lappis/ips.yaml new file mode 100644 index 0000000..dcab37c --- /dev/null +++ b/config/lappis/ips.yaml @@ -0,0 +1,5 @@ +reverseproxy: 10.0.0.11 +database: 10.0.0.13 +social: 10.0.0.14 +email: 10.0.0.15 +integration: 10.0.0.12 diff --git a/config/lappis/iptables-filter-rules b/config/lappis/iptables-filter-rules new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/config/lappis/iptables-filter-rules diff --git a/config/lappis/ssh_config b/config/lappis/ssh_config new file mode 100644 index 0000000..81b4358 --- /dev/null +++ b/config/lappis/ssh_config @@ -0,0 +1,29 @@ +Host * + ForwardAgent yes + +Host reverseproxy.unconfigured + Hostname 10.0.0.11 + +Host reverseproxy + Hostname 10.0.0.11 + Port 5555 + ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p + +Host database + Hostname 10.0.0.13 + # connect via reverseproxy host + ProxyCommand ssh 10.0.0.11 nc %h %p + +Host social + Hostname 10.0.0.14 + # connect via reverseproxy host + ProxyCommand ssh 10.0.0.11 nc %h %p + +Host email + Hostname 10.0.0.15 + # connect via reverseproxy host + ProxyCommand ssh 10.0.0.11 nc %h %p + +Host integration + Hostname 10.0.0.11 + # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand -- libgit2 0.21.2