Fix this a better way. Drop using the vpn for some backups and merge all back into main inventory

25 files changed, 15 insertions, 20 deletions

diff --git a/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org b/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org
deleted file mode 100644
index 7f2910202..000000000
--- a/backups/inventory/host_vars/copr-be.cloud.fedoraproject.org
+++ /dev/null
@@ -1,3 +0,0 @@
----
-# backup these directories
-host_backup_targets: ['/var/lib/copr/public_html/results']
diff --git a/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org b/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
deleted file mode 100644
index 149ad66fb..000000000
--- a/backups/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-host_backup_targets: ['/backups']
diff --git a/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org
deleted file mode 100644
index 149ad66fb..000000000
--- a/backups/inventory/host_vars/db-koji01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-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
deleted file mode 100644
index 149ad66fb..000000000
--- a/backups/inventory/host_vars/db-qa01.qa.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-host_backup_targets: ['/backups']
diff --git a/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org b/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org
deleted file mode 100644
index fbc082615..000000000
--- a/backups/inventory/host_vars/hosted04.vpn.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-host_backup_targets: ['/srv']
diff --git a/backups/inventory/host_vars/log01.phx2.fedoraproject.org b/backups/inventory/host_vars/log01.phx2.fedoraproject.org
deleted file mode 100644
index d2ecc7e6f..000000000
--- a/backups/inventory/host_vars/log01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-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
deleted file mode 100644
index b9b4978c6..000000000
--- a/backups/inventory/host_vars/people03.vpn.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-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
deleted file mode 100644
index fbc082615..000000000
--- a/backups/inventory/host_vars/pkgs01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-host_backup_targets: ['/srv']
diff --git a/backups/inventory/host_vars/value01.phx2.fedoraproject.org b/backups/inventory/host_vars/value01.phx2.fedoraproject.org
deleted file mode 100644
index 902372091..000000000
--- a/backups/inventory/host_vars/value01.phx2.fedoraproject.org
+++ /dev/null
@@ -1,2 +0,0 @@
----
-host_backup_targets: ['/srv', '/var/lib/zodbot']
diff --git a/files/rdiff-backup/run-rdiff-backups b/files/rdiff-backup/run-rdiff-backups
index c70ee9acb..ec6ebf358 100644
--- a/files/rdiff-backup/run-rdiff-backups
+++ b/files/rdiff-backup/run-rdiff-backups
@@ -6,4 +6,4 @@ TMPDIR=`mktemp -d /tmp/backups.XXXX`
 
 cd $TMPDIR
 git clone https://infrastructure.fedoraproject.org/infra/ansible.git
-ansible-playbook -i ansible/backups/inventory ansible/playbooks/rdiff-backup.yml 
+ansible-playbook -i ansible/inventory ansible/playbooks/rdiff-backup.yml 
diff --git a/backups/inventory/inventory b/inventory/backups
index c5f7cb398..c5f7cb398 100644
--- a/backups/inventory/inventory
+++ b/inventory/backups
diff --git a/backups/inventory/host_vars/collab04.vpn.fedoraproject.org b/inventory/host_vars/collab04.fedoraproject.org
index fbc082615..fbc082615 100644
--- a/backups/inventory/host_vars/collab04.vpn.fedoraproject.org
+++ b/inventory/host_vars/collab04.fedoraproject.org
diff --git a/inventory/host_vars/copr-be.cloud.fedoraproject.org b/inventory/host_vars/copr-be.cloud.fedoraproject.org
index 375988eb0..fb706f25c 100644
--- a/inventory/host_vars/copr-be.cloud.fedoraproject.org
+++ b/inventory/host_vars/copr-be.cloud.fedoraproject.org
@@ -26,3 +26,5 @@ fedmsg_certs:
 # Copr vars
 
 copr_hostbase: copr-be
+
+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 a240e64fb..84b1ad7b4 100644
--- a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
+++ b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org
@@ -26,3 +26,5 @@ fas_client_groups: sysadmin-dba,sysadmin-noc
 
 # kernel SHMMAX value
 kernel_shmmax: 68719476736
+
+host_backup_targets: ['/backups']
diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org
index 176c7bbd5..c045a1d5d 100644
--- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org
+++ b/inventory/host_vars/db-koji01.phx2.fedoraproject.org
@@ -37,3 +37,5 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.125.59 --dport 5432 -j ACCEPT',
 # 
 nrpe_procs_warn: 400
 nrpe_procs_crit: 500
+
+host_backup_targets: ['/backups']
diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org
index 71a3957ec..03cee8ac1 100644
--- a/inventory/host_vars/db-qa01.qa.fedoraproject.org
+++ b/inventory/host_vars/db-qa01.qa.fedoraproject.org
@@ -35,3 +35,5 @@ fas_client_groups: sysadmin-qa,sysadmin-noc
 
 # kernel SHMMAX value
 kernel_shmmax: 68719476736
+
+host_backup_targets: ['/backups']
diff --git a/backups/inventory/host_vars/db01.phx2.fedoraproject.org b/inventory/host_vars/db01.phx2.fedoraproject.org
index 149ad66fb..149ad66fb 100644
--- a/backups/inventory/host_vars/db01.phx2.fedoraproject.org
+++ b/inventory/host_vars/db01.phx2.fedoraproject.org
diff --git a/inventory/host_vars/hosted-lists01.fedoraproject.org b/inventory/host_vars/hosted-lists01.fedoraproject.org
index 0c147cba1..5d8ad1822 100644
--- a/inventory/host_vars/hosted-lists01.fedoraproject.org
+++ b/inventory/host_vars/hosted-lists01.fedoraproject.org
@@ -1,3 +1,4 @@
 ---
 freezes: false
 datacenter: internetx
+host_backup_targets: ['/srv']
diff --git a/backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org b/inventory/host_vars/hosted04.fedoraproject.org
index fbc082615..fbc082615 100644
--- a/backups/inventory/host_vars/hosted-lists01.vpn.fedoraproject.org
+++ b/inventory/host_vars/hosted04.fedoraproject.org
diff --git a/backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org b/inventory/host_vars/lockbox01.phx2.fedoraproject.org
index 7a27ef001..7a27ef001 100644
--- a/backups/inventory/host_vars/lockbox01.phx2.fedoraproject.org
+++ b/inventory/host_vars/lockbox01.phx2.fedoraproject.org
diff --git a/inventory/host_vars/log01.phx2.fedoraproject.org b/inventory/host_vars/log01.phx2.fedoraproject.org
index 0da7cb0e6..9628c5567 100644
--- a/inventory/host_vars/log01.phx2.fedoraproject.org
+++ b/inventory/host_vars/log01.phx2.fedoraproject.org
@@ -20,3 +20,5 @@ mem_size: 16384
 num_cpus: 16
 
 fas_client_groups: fi-apprentice,sysadmin-logs,sysadmin-noc
+
+host_backup_targets: ['/var/log']
diff --git a/inventory/host_vars/people03.fedoraproject.org b/inventory/host_vars/people03.fedoraproject.org
index b4c8e0341..2aed12094 100644
--- a/inventory/host_vars/people03.fedoraproject.org
+++ b/inventory/host_vars/people03.fedoraproject.org
@@ -1,3 +1,4 @@
 ---
 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 6ea7ea14e..0bf61a683 100644
--- a/inventory/host_vars/pkgs01.phx2.fedoraproject.org
+++ b/inventory/host_vars/pkgs01.phx2.fedoraproject.org
@@ -1,3 +1,4 @@
 ---
 nm: 255.255.255.0
 eth1_ip: 10.5.127.67
+host_backup_targets: ['/srv']
diff --git a/backups/inventory/host_vars/qadevel.cloud.fedoraproject.org b/inventory/host_vars/qadevel.cloud.fedoraproject.org
index 6bf9e9dad..6bf9e9dad 100644
--- a/backups/inventory/host_vars/qadevel.cloud.fedoraproject.org
+++ b/inventory/host_vars/qadevel.cloud.fedoraproject.org
diff --git a/inventory/host_vars/value01.phx2.fedoraproject.org b/inventory/host_vars/value01.phx2.fedoraproject.org
index e099110b9..e909e2ccc 100644
--- a/inventory/host_vars/value01.phx2.fedoraproject.org
+++ b/inventory/host_vars/value01.phx2.fedoraproject.org
@@ -8,3 +8,4 @@ volgroup: /dev/vg_virthost03
 eth0_ip: 10.5.126.49
 vmhost: virthost03.phx2.fedoraproject.org
 datacenter: phx2
+host_backup_targets: ['/srv', '/var/lib/zodbot']