Merge branch 'master' of github.com:github/backup-utils into mcfluffinstein-patch-1

Author: bonsohi

debian/changelog

@@ -22,51 +22,18 @@ github-backup-utils (3.3.1) UNRELEASED; urgency=medium
 
   * Fix compat issue with ghe-actions-start during maintenance mode #836
 
- -- [email protected]  Tue, 21 Dec 2021 23:38:01 +0000
+ -- Balwinder Sohi <[email protected]>  Tue, 21 Dec 2021 23:38:01 +0000
 
 github-backup-utils (3.3.0) UNRELEASED; urgency=medium
 
-
- -- [email protected]  Wed, 08 Dec 2021 03:12:53 +0000
-
-github-backup-utils (3.3.0) UNRELEASED; urgency=medium
-
-
- -- [email protected]  Wed, 08 Dec 2021 03:10:21 +0000
-
-github-backup-utils (3.3.0) UNRELEASED; urgency=medium
-
-
- -- [email protected]  Wed, 08 Dec 2021 02:56:47 +0000
-
-github-backup-utils (3.3.0) UNRELEASED; urgency=medium
-
-
- -- [email protected]  Wed, 08 Dec 2021 02:51:06 +0000
-
-github-backup-utils (3.3.0) UNRELEASED; urgency=medium
-
-
- -- [email protected]  Wed, 08 Dec 2021 02:02:25 +0000
-
-github-backup-utils (3.3.0) UNRELEASED; urgency=medium
-
-
- -- [email protected]  Wed, 08 Dec 2021 01:56:26 +0000
-
-github-backup-utils (3.3.0) UNRELEASED; urgency=medium
-
-
- -- [email protected]  Wed, 08 Dec 2021 01:25:12 +0000
+ -- Balwinder Sohi <[email protected]>  Wed, 08 Dec 2021 03:12:53 +0000
 
 github-backup-utils (3.3.0.rc1) UNRELEASED; urgency=medium
 
-
  -- Nick Iodice <[email protected]>  Tue, 09 Nov 2021 19:56:08 +0000
 
 github-backup-utils (3.2.0) UNRELEASED; urgency=medium
 
-
  -- Brett Westover <[email protected]>  Tue, 28 Sep 2021 16:50:00 +0000
 
 github-backup-utils (3.2.0.rc3) UNRELEASED; urgency=medium
@@ -100,7 +67,6 @@ github-backup-utils (3.2.0) UNRELEASED; urgency=medium
 
 github-backup-utils (3.1.0) UNRELEASED; urgency=medium
 
-
  -- Zachary Mark <[email protected]>  Thu, 03 Jun 2021 16:55:16 +0000
 
 github-backup-utils (3.1.0~rc1) UNRELEASED; urgency=medium

share/github-backup-utils/ghe-backup-settings

@@ -116,6 +116,16 @@ if ghe-ssh "$host" -- ghe-config --true app.actions.enabled; then
   backup-secret "Actions Launch service private key" "actions-launch-app-app-private-key" "secrets.launch.azp-app-private-key"
 fi
 
+if ghe-ssh "$host" -- ghe-config --true app.packages.enabled; then
+  backup-secret "Packages aws access key" "packages-aws-access-key" "secrets.packages.aws-access-key"
+  backup-secret "Packages aws secret key" "packages-aws-secret-key" "secrets.packages.aws-secret-key"
+  backup-secret "Packages s3 bucket" "packages-s3-bucket" "secrets.packages.s3-bucket"
+  backup-secret "Packages storage service url" "packages-service-url" "secrets.packages.service-url"
+  backup-secret "Packages blob storage type" "packages-blob-storage-type" "secrets.packages.blob-storage-type"
+  backup-secret "Packages azure connection string" "packages-azure-connection-string" "secrets.packages.azure-connection-string"
+  backup-secret "Packages azure container name" "packages-azure-container-name" "secrets.packages.azure-container-name"
+fi
+
 if ghe-ssh "$host" -- "test -f $GHE_REMOTE_DATA_USER_DIR/common/idp.crt"; then
   echo "* Transferring SAML keys ..." 1>&3
   ghe-ssh $host -- sudo tar -C $GHE_REMOTE_DATA_USER_DIR/common/ -cf - "idp.crt saml-sp.p12" > saml-keys.tar

share/github-backup-utils/ghe-restore-packages

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+#/ Usage: ghe-restore-packages <host>
+#/
+#/ Note: This script typically isn't called directly. It's invoked by the
+#/ ghe-restore command.
+set -e
+
+# Bring in the backup configuration
+# shellcheck source=share/github-backup-utils/ghe-backup-config
+. "$( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config"
+
+# Show usage and bail with no arguments
+[ -z "$*" ] && print_usage
+
+bm_start "$(basename $0)"
+
+# Grab host arg
+GHE_HOSTNAME="$1"
+
+# The snapshot to restore should be set by the ghe-restore command but this lets
+# us run this script directly.
+: ${GHE_RESTORE_SNAPSHOT:=current}
+
+# Path to snapshot dir we're restoring from
+export GHE_RESTORE_SNAPSHOT_PATH="$GHE_DATA_DIR/$GHE_RESTORE_SNAPSHOT"
+
+port=$(ssh_port_part "$GHE_HOSTNAME")
+export port
+host=$(ssh_host_part "$GHE_HOSTNAME")
+
+# Perform a host-check and establish GHE_REMOTE_XXX variables.
+ghe_remote_version_required "$host"
+
+# Restore Packages settings.
+ghe_verbose "Restoring Packages settings ..."
+
+restore-secret "Packages aws access key" "packages-aws-access-key" "secrets.packages.aws-access-key"
+restore-secret "Packages aws secret key" "packages-aws-secret-key" "secrets.packages.aws-secret-key"
+restore-secret "Packages s3 bucket" "packages-s3-bucket" "secrets.packages.s3-bucket"
+restore-secret "Packages storage service url" "packages-service-url" "secrets.packages.service-url"
+restore-secret "Packages blob storage type" "packages-blob-storage-type" "secrets.packages.blob-storage-type"
+restore-secret "Packages azure connection string" "packages-azure-connection-string" "secrets.packages.azure-connection-string"
+restore-secret "Packages azure container name" "packages-azure-container-name" "secrets.packages.azure-container-name"
+
+bm_end "$(basename $0)"

share/github-backup-utils/ghe-restore-settings

@@ -33,6 +33,9 @@ echo "Restoring settings and applying configuration ..."
 # Restore external MySQL password if running external MySQL DB.
 restore-secret "external MySQL password" "external-mysql-password" "secrets.external.mysql"
 
+echo "Restoring packages settings ..."
+ghe-restore-packages "$GHE_HOSTNAME" 1>&3
+
 # work around issue importing settings with bad storage mode values
 ( cat "$GHE_RESTORE_SNAPSHOT_PATH/settings.json" && echo ) |
   sed 's/"storage_mode": "device"/"storage_mode": "rootfs"/' |