diff --git a/config/beta/config.yaml b/config/beta/config.yaml new file mode 100644 index 0000000..0b2013c --- /dev/null +++ b/config/beta/config.yaml @@ -0,0 +1,14 @@ +admins: + - ["Paulo Meirelles", "paulo@softwarelivre.org"] +external_hostname: beta.softwarepublico.gov.br +external_ip: 164.41.9.49 +site_url: https://beta.softwarepublico.gov.br +colab_from_address: '"Portal do Software Publico" ' +server_email: '"Portal do Software Publico" ' +email_subject_prefix: '[spb]' +lists_hostname: listas.softwarepublico.gov.br +lists_admin: paulo@softwarelivre.org +relay_hostname: relay.softwarepublico.gov.br +relay_ip: 164.41.9.48 +alt_ssh_port: 55555 +from_address: noreply@softwarepublico.gov.br diff --git a/config/beta/ips.yaml b/config/beta/ips.yaml new file mode 100644 index 0000000..a7e7dbb --- /dev/null +++ b/config/beta/ips.yaml @@ -0,0 +1,5 @@ +reverseproxy: 10.10.40.49 +database: 10.10.40.47 +social: 10.10.40.46 +email: 10.10.40.48 +integration: 10.10.40.45 diff --git a/config/beta/iptables-filter-rules b/config/beta/iptables-filter-rules new file mode 100644 index 0000000..e97b4e4 --- /dev/null +++ b/config/beta/iptables-filter-rules @@ -0,0 +1,2 @@ + +# No environment rules diff --git a/config/beta/ssh_config b/config/beta/ssh_config new file mode 100644 index 0000000..435ab9d --- /dev/null +++ b/config/beta/ssh_config @@ -0,0 +1,28 @@ +Host * + ForwardAgent yes + +Host reverseproxy + Hostname 10.10.40.49 + Port 55555 + ProxyCommand ssh 164.41.9.49 -p 22 nc %h 55555 + +Host reverseproxy.unconfigured + Hostname 164.41.9.49 + +Host integration + Hostname 164.41.9.49 + +Host database + Hostname 10.10.40.47 + # connect via reverseproxy host + ProxyCommand ssh 164.41.9.49 -p %p nc %h 22 + +Host social + Hostname 10.10.40.46 + # connect via reverseproxy host + ProxyCommand ssh 164.41.9.49 -p %p nc %h 22 + +Host email + Hostname 10.10.40.48 + # connect via reverseproxy host + ProxyCommand ssh 164.41.9.49 -p %p nc %h 22 diff --git a/config/production/config.yaml b/config/production/config.yaml deleted file mode 100644 index 0b2013c..0000000 --- a/config/production/config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -admins: - - ["Paulo Meirelles", "paulo@softwarelivre.org"] -external_hostname: beta.softwarepublico.gov.br -external_ip: 164.41.9.49 -site_url: https://beta.softwarepublico.gov.br -colab_from_address: '"Portal do Software Publico" ' -server_email: '"Portal do Software Publico" ' -email_subject_prefix: '[spb]' -lists_hostname: listas.softwarepublico.gov.br -lists_admin: paulo@softwarelivre.org -relay_hostname: relay.softwarepublico.gov.br -relay_ip: 164.41.9.48 -alt_ssh_port: 55555 -from_address: noreply@softwarepublico.gov.br diff --git a/config/production/ips.yaml b/config/production/ips.yaml deleted file mode 100644 index a7e7dbb..0000000 --- a/config/production/ips.yaml +++ /dev/null @@ -1,5 +0,0 @@ -reverseproxy: 10.10.40.49 -database: 10.10.40.47 -social: 10.10.40.46 -email: 10.10.40.48 -integration: 10.10.40.45 diff --git a/config/production/iptables-filter-rules b/config/production/iptables-filter-rules deleted file mode 100644 index e97b4e4..0000000 --- a/config/production/iptables-filter-rules +++ /dev/null @@ -1,2 +0,0 @@ - -# No environment rules diff --git a/config/production/ssh_config b/config/production/ssh_config deleted file mode 100644 index 435ab9d..0000000 --- a/config/production/ssh_config +++ /dev/null @@ -1,28 +0,0 @@ -Host * - ForwardAgent yes - -Host reverseproxy - Hostname 10.10.40.49 - Port 55555 - ProxyCommand ssh 164.41.9.49 -p 22 nc %h 55555 - -Host reverseproxy.unconfigured - Hostname 164.41.9.49 - -Host integration - Hostname 164.41.9.49 - -Host database - Hostname 10.10.40.47 - # connect via reverseproxy host - ProxyCommand ssh 164.41.9.49 -p %p nc %h 22 - -Host social - Hostname 10.10.40.46 - # connect via reverseproxy host - ProxyCommand ssh 164.41.9.49 -p %p nc %h 22 - -Host email - Hostname 10.10.40.48 - # connect via reverseproxy host - ProxyCommand ssh 164.41.9.49 -p %p nc %h 22 -- libgit2 0.21.2