Merge pull request #440 from github/enterprise-3.7-backport-318-eptekov-pages-lazybuild

Backport 318 for 3.7: Adding new option to support Pages lazy-build strategy

Author: chuckp22

backup.config-example

@@ -90,3 +90,6 @@ GHE_NUM_SNAPSHOTS=10
 # When running an external mysql database, run this script to trigger a MySQL restore
 # rather than attempting to backup via backup-utils directly.
 #EXTERNAL_DATABASE_RESTORE_SCRIPT="/bin/false"
+
+# If set to 'yes', Pages data will be included in backup and restore. Defaults to 'yes'
+#GHE_BACKUP_PAGES=no

bin/ghe-backup

@@ -231,9 +231,14 @@ commands+=("
 echo \"Backing up Git repositories ...\"
 ghe-backup-repositories || printf %s \"repositories \" >> \"$failures_file\"")
 
-commands+=("
-echo \"Backing up GitHub Pages artifacts ...\"
-ghe-backup-pages || printf %s \"pages \" >> \"$failures_file\"")
+# Pages backups are skipped only if GHE_BACKUP_PAGES is explicitly set to 'no' to guarantee backward compatibility.
+# If a customer upgrades backup-utils but keeps the config file from a previous version, Pages backups still work as expected.
+
+if [ "$GHE_BACKUP_PAGES" != "no" ]; then
+  commands+=("
+  echo \"Backing up GitHub Pages artifacts ...\"
+  ghe-backup-pages || printf %s \"pages \" >> \"$failures_file\"")
+fi
 
 commands+=("
 echo \"Backing up storage data ...\"

bin/ghe-restore

@@ -447,9 +447,11 @@ commands+=("
 echo \"Restoring Gists ...\"
 ghe-restore-repositories-gist \"$GHE_HOSTNAME\"")
 
-commands+=("
-echo \"Restoring GitHub Pages artifacts ...\"
-ghe-restore-pages \"$GHE_HOSTNAME\" 1>&3")
+if [ "$GHE_BACKUP_PAGES" != "no" ]; then
+  commands+=("
+  echo \"Restoring GitHub Pages artifacts ...\"
+  ghe-restore-pages \"$GHE_HOSTNAME\" 1>&3")
+fi
 
 commands+=("
 echo \"Restoring SSH authorized keys ...\"