Commit 6e26576e52720902e6e7d2cfe430613c9881974f

Authored by Daniel Damasceno
2 parents c9a8f27a c62cdd2a

Merge branch 'backup_not_prod' into 'master'

Monthly backup when not in prod

Continue doing hourly, daily, weekly and monthly backup in prod env, and just monthly in other envs.

See merge request !128
config/cdtc/config.yaml
... ... @@ -13,3 +13,4 @@ relay_hostname: relay.spb.cdtc.unb.br
13 13 relay_ip: 164.41.9.48
14 14 alt_ssh_port: 55555
15 15 from_address: noreply@spb.cdtc.unb.br
  16 +dev_backup_frequency: true
... ...
config/dev/config.yaml
... ... @@ -19,3 +19,4 @@ alt_ssh_port: 55555
19 19 external_outgoing_mail_domain: serpro.gov.br
20 20 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
21 21 google_analytics_id: 'UA-64206731-2'
  22 +dev_backup_frequency: true
... ...
config/homologa/config.yaml
... ... @@ -20,3 +20,4 @@ external_outgoing_mail_relay: 189.9.150.53
20 20 external_outgoing_mail_domain: serpro.gov.br
21 21 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
22 22 google_analytics_id: 'UA-64206731-3'
  23 +dev_backup_frequency: true
... ...
config/lappis/config.yaml
... ... @@ -3,14 +3,15 @@ admins:
3 3 site_url: https://softwarepublico.lappis
4 4 external_hostname: softwarepublico.lappis
5 5 sisp_external_hostname: sisp.lappis
6   -external_ip: 10.0.0.11
  6 +external_ip: 10.0.0.54
7 7 colab_from_address: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
8 8 server_email: '"Portal do Software Publico" <noreply@softwarepublico.lappis>'
9 9 email_subject_prefix: '[spb]'
10 10 lists_hostname: listas.softwarepublico.lappis
11 11 lists_admin: paulo@softwarelivre.org
12 12 relay_hostname: relay.softwarepublico.lappis
13   -relay_ip: 10.0.0.15
  13 +relay_ip: 10.0.0.51
14 14 alt_ssh_port: 5555
15 15 from_address: noreply@softwarepublico.lappis
16   -
  16 +# define less frequent backup for dev envs
  17 +dev_backup_frequency: true
... ...
config/lappis/ips.yaml
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
  1 +reverseproxy: 10.0.0.54
  2 +database: 10.0.0.55
  3 +social: 10.0.0.53
  4 +email: 10.0.0.51
  5 +integration: 10.0.0.52
... ...
config/lappis/ssh_config
... ... @@ -2,28 +2,28 @@ Host *
2 2 ForwardAgent yes
3 3  
4 4 Host reverseproxy.unconfigured
5   - Hostname 10.0.0.11
  5 + Hostname 10.0.0.54
6 6  
7 7 Host reverseproxy
8   - Hostname 10.0.0.11
  8 + Hostname 10.0.0.54
9 9 Port 5555
10   - ProxyCommand ssh 10.0.0.11 -p 22 nc %h %p
  10 + ProxyCommand ssh 10.0.0.54 -p 22 nc %h %p
11 11  
12 12 Host database
13   - Hostname 10.0.0.13
  13 + Hostname 10.0.0.55
14 14 # connect via reverseproxy host
15   - ProxyCommand ssh 10.0.0.11 nc %h %p
  15 + ProxyCommand ssh 10.0.0.54 nc %h %p
16 16  
17 17 Host social
18   - Hostname 10.0.0.14
  18 + Hostname 10.0.0.53
19 19 # connect via reverseproxy host
20   - ProxyCommand ssh 10.0.0.11 nc %h %p
  20 + ProxyCommand ssh 10.0.0.54 nc %h %p
21 21  
22 22 Host email
23   - Hostname 10.0.0.15
  23 + Hostname 10.0.0.51
24 24 # connect via reverseproxy host
25   - ProxyCommand ssh 10.0.0.11 nc %h %p
  25 + ProxyCommand ssh 10.0.0.54 nc %h %p
26 26  
27 27 Host integration
28   - Hostname 10.0.0.11
29   - # Porta 22 de 10.0.0.11 cai aqui entao nao precisa de ProxyCommand
  28 + Hostname 10.0.0.54
  29 + # Porta 22 de 10.0.0.54 cai aqui entao nao precisa de ProxyCommand
... ...
config/local/config.yaml
... ... @@ -19,3 +19,4 @@ alt_ssh_port: 5555
19 19 from_address: noreply@softwarepublico.dev
20 20 raven_dsn: https://a5e2f92a83774dfc9de66486e0fe970b:1a9229a4e1d2483582144d302fb53115@sentry.tracy.com.br/19
21 21 colab_http_workers: 1
  22 +dev_backup_frequency: true
... ...
cookbooks/backup/files/rsnapshot-spb
... ... @@ -1,4 +0,0 @@
1   -0 */6 * * * root rsnapshot hourly
2   -59 23 * * * root rsnapshot daily
3   -40 23 * * 7 root rsnapshot weekly
4   -20 23 1 * * root rsnapshot monthly
cookbooks/backup/recipes/default.rb
... ... @@ -13,7 +13,7 @@ cookbook_file &#39;/usr/local/bin/backup_spb.sh&#39; do
13 13 mode 0755
14 14 end
15 15  
16   -cookbook_file '/etc/cron.d/rsnapshot-spb' do
  16 +template '/etc/cron.d/rsnapshot-spb' do
17 17 owner 'root'
18 18 group 'root'
19 19 mode 0644
... ...
cookbooks/backup/templates/rsnapshot-spb.erb 0 → 100644
... ... @@ -0,0 +1,8 @@
  1 +<%if node['config']['dev_backup_frequency']%>
  2 +20 23 1 * * root rsnapshot monthly
  3 +<%else%>
  4 +0 */6 * * * root rsnapshot hourly
  5 +59 23 * * * root rsnapshot daily
  6 +40 23 * * 7 root rsnapshot weekly
  7 +20 23 1 * * root rsnapshot monthly
  8 +<%end%>
... ...