diff --git a/inventory/host_vars/collab04.vpn.fedoraproject.org b/backups/inventory/host_vars/collab04.vpn.fedoraproject.org similarity index 100% rename from inventory/host_vars/collab04.vpn.fedoraproject.org rename to backups/inventory/host_vars/collab04.vpn.fedoraproject.org diff --git a/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org b/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org new file mode 100644 index 0000000000..7f29102021 --- /dev/null +++ b/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -0,0 +1,3 @@ +--- +# backup these directories +host_backup_targets: ['/var/lib/copr/public_html/results'] diff --git a/inventory/host_vars/db01.phx2.fedoraproject.org b/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org similarity index 100% rename from inventory/host_vars/db01.phx2.fedoraproject.org rename to backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org diff --git a/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org new file mode 100644 index 0000000000..149ad66fbd --- /dev/null +++ b/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/backups'] diff --git a/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org b/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org new file mode 100644 index 0000000000..149ad66fbd --- /dev/null +++ b/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/backups'] diff --git a/backups/inventory/host_vars/db01.phx2.fedoraproject.org b/backups/inventory/host_vars/db01.phx2.fedoraproject.org new file mode 100644 index 0000000000..149ad66fbd --- /dev/null +++ b/backups/inventory/host_vars/db01.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/backups'] diff --git a/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org b/backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org similarity index 100% rename from inventory/host_vars/hosted-lists01.vpn.fedoraproject.org rename to backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org diff --git a/inventory/host_vars/hosted04.vpn.fedoraproject.org b/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org similarity index 100% rename from inventory/host_vars/hosted04.vpn.fedoraproject.org rename to backups/inventory/host_vars/hosted04.vpn.fedoraproject.org diff --git a/inventory/host_vars/lockbox01.phx2.fedoraproject.org b/backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org similarity index 100% rename from inventory/host_vars/lockbox01.phx2.fedoraproject.org rename to backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org diff --git a/backups/inventory/host_vars/log01.phx2.fedoraproject.org b/backups/inventory/host_vars/log01.phx2.fedoraproject.org new file mode 100644 index 0000000000..d2ecc7e6f2 --- /dev/null +++ b/backups/inventory/host_vars/log01.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/var/log'] diff --git a/backups/inventory/host_vars/people03.vpn.fedoraproject.org b/backups/inventory/host_vars/people03.vpn.fedoraproject.org new file mode 100644 index 0000000000..b9b4978c6a --- /dev/null +++ b/backups/inventory/host_vars/people03.vpn.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/srv/web'] diff --git a/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org b/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org new file mode 100644 index 0000000000..fbc0826155 --- /dev/null +++ b/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/srv'] diff --git a/inventory/host_vars/qadevel.cloud.fedoraproject.org b/backups/inventory/host_vars/qadevel.cloud.fedoraproject.org similarity index 100% rename from inventory/host_vars/qadevel.cloud.fedoraproject.org rename to backups/inventory/host_vars/qadevel.cloud.fedoraproject.org diff --git a/backups/inventory/host_vars/value01.phx2.fedoraproject.org b/backups/inventory/host_vars/value01.phx2.fedoraproject.org new file mode 100644 index 0000000000..9023720911 --- /dev/null +++ b/backups/inventory/host_vars/value01.phx2.fedoraproject.org @@ -0,0 +1,2 @@ +--- +host_backup_targets: ['/srv', '/var/lib/zodbot'] diff --git a/backups/inventory b/backups/inventory/inventory similarity index 94% rename from backups/inventory rename to backups/inventory/inventory index d59d7c4d9b..c5f7cb3985 100644 --- a/backups/inventory +++ b/backups/inventory/inventory @@ -15,3 +15,4 @@ qadevel.cloud.fedoraproject.org db-qa01.qa.fedoraproject.org db-koji01.phx2.fedoraproject.org copr-be.cloud.fedoraproject.org +value01.phx2.fedoraproject.org diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org index 6154227485..375988eb0a 100644 --- a/inventory/host_vars/copr-be.cloud.fedoraproject.org +++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org @@ -26,6 +26,3 @@ fedmsg_certs: # Copr vars copr_hostbase: copr-be - -# backup these directories -host_backup_targets: ['/var/lib/copr/public_html/results'] diff --git a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org index 57562e1369..a240e64fb5 100644 --- a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org +++ b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org @@ -17,8 +17,6 @@ databases: dbs_to_backup: - datanommer -host_backup_targets: ['/backups'] - # These are normally group variables, but in this case db servers are often different lvm_size: 300000 mem_size: 16384 diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org index c8c07fcb6a..176c7bbd56 100644 --- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org +++ b/inventory/host_vars/db-koji01.phx2.fedoraproject.org @@ -18,8 +18,6 @@ databases: dbs_to_backup: - koji -host_backup_targets: ['/backups'] - # These are normally group variables, but in this case db servers are often different lvm_size: 300000 mem_size: 25165 diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org index 732b2d69ee..71a3957ec5 100644 --- a/inventory/host_vars/db-qa01.qa.fedoraproject.org +++ b/inventory/host_vars/db-qa01.qa.fedoraproject.org @@ -26,8 +26,6 @@ dbs_to_backup: - resultsdb_stg - resultsdb_dev -host_backup_targets: ['/backups'] - # These are normally group variables, but in this case db servers are often different lvm_size: 300000 mem_size: 8192 diff --git a/inventory/host_vars/log01.phx2.fedoraproject.org b/inventory/host_vars/log01.phx2.fedoraproject.org index f76de796d8..0da7cb0e6d 100644 --- a/inventory/host_vars/log01.phx2.fedoraproject.org +++ b/inventory/host_vars/log01.phx2.fedoraproject.org @@ -19,5 +19,4 @@ lvm_size: 32768 mem_size: 16384 num_cpus: 16 -host_backup_targets: ['/var/log'] fas_client_groups: fi-apprentice,sysadmin-logs,sysadmin-noc diff --git a/inventory/host_vars/people03.fedoraproject.org b/inventory/host_vars/people03.fedoraproject.org index 2aed120946..b4c8e03414 100644 --- a/inventory/host_vars/people03.fedoraproject.org +++ b/inventory/host_vars/people03.fedoraproject.org @@ -1,4 +1,3 @@ --- freezes: false datacenter: ibiblio -host_backup_targets: ['/srv/web'] diff --git a/inventory/host_vars/pkgs01.phx2.fedoraproject.org b/inventory/host_vars/pkgs01.phx2.fedoraproject.org index be260f621c..6ea7ea14e1 100644 --- a/inventory/host_vars/pkgs01.phx2.fedoraproject.org +++ b/inventory/host_vars/pkgs01.phx2.fedoraproject.org @@ -1,5 +1,3 @@ --- -host_backup_targets: ['/srv'] - nm: 255.255.255.0 eth1_ip: 10.5.127.67 diff --git a/inventory/host_vars/value01.phx2.fedoraproject.org b/inventory/host_vars/value01.phx2.fedoraproject.org index 958f483d86..e099110b9c 100644 --- a/inventory/host_vars/value01.phx2.fedoraproject.org +++ b/inventory/host_vars/value01.phx2.fedoraproject.org @@ -8,6 +8,3 @@ volgroup: /dev/vg_virthost03 eth0_ip: 10.5.126.49 vmhost: virthost03.phx2.fedoraproject.org datacenter: phx2 - -host_backup_targets: ['/srv'] -host_backup_targets: ['/var/lib/zodbot'] diff --git a/master.yml b/master.yml index 05e4891dcd..3d528a1254 100644 --- a/master.yml +++ b/master.yml @@ -55,7 +55,7 @@ - include: /srv/web/infra/ansible/playbooks/groups/nuancier.yml - include: /srv/web/infra/ansible/playbooks/groups/packages.yml - include: /srv/web/infra/ansible/playbooks/groups/paste.yml -- include: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml +#- include: /srv/web/infra/ansible/playbooks/groups/pkgdb.yml - include: /srv/web/infra/ansible/playbooks/groups/pkgs.yml - include: /srv/web/infra/ansible/playbooks/groups/postgresl-server.yml - include: /srv/web/infra/ansible/playbooks/groups/qadevel.yml