From 7488d2003ee5be53d4658b39d0fadbce38e07d7a Mon Sep 17 00:00:00 2001
From: Andrea Veri <averi@fedoraproject.org>
Date: Mon, 20 Aug 2018 21:08:38 +0000
Subject: [PATCH] GNOME Backups: drop git.gnome.org (superseded by gitlab.g.o)
 and land oscp-master01

---
 roles/gnome_backups/files/backup.sh  | 4 ++--
 roles/gnome_backups/files/ssh_config | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/roles/gnome_backups/files/backup.sh b/roles/gnome_backups/files/backup.sh
index 94381b64cd..d41ebd3142 100644
--- a/roles/gnome_backups/files/backup.sh
+++ b/roles/gnome_backups/files/backup.sh
@@ -9,7 +9,6 @@ MACHINES='signal.gnome.org
           webapps2.gnome.org
           blogs.gnome.org
           palette.gnome.org 
-          git.gnome.org
           webapps.gnome.org
           cloud.gnome.org
           bastion.gnome.org
@@ -31,7 +30,8 @@ MACHINES='signal.gnome.org
           scale.gnome.org
           sdkbuilder.gnome.org
           webapps3.gnome.org
-          gitlab.gnome.org'
+          gitlab.gnome.org
+          oscp-master01.gnome.org'
 
 BACKUP_DIR='/gnome_backups'
 
diff --git a/roles/gnome_backups/files/ssh_config b/roles/gnome_backups/files/ssh_config
index e6ed7f9d59..630a6521c1 100644
--- a/roles/gnome_backups/files/ssh_config
+++ b/roles/gnome_backups/files/ssh_config
@@ -3,6 +3,11 @@ Host puppetmaster01.gnome.org cloud.gnome.org webapps3.gnome.org
      IdentityFile /usr/local/etc/gnome_backup_id.rsa
      ProxyCommand ssh -W %h:%p bastion.gnome.org -F /usr/local/etc/gnome_ssh_config
 
+Host oscp-master01.gnome.org 
+     User root
+     IdentityFile /usr/local/etc/gnome_backup_id.rsa
+     ProxyCommand ssh -W %h:%p gesture.gnome.org -F /usr/local/etc/gnome_ssh_config
+
 Host *.gnome.org pentagon.gimp.org
      User root
      IdentityFile /usr/local/etc/gnome_backup_id.rsa