Merge remote-tracking branch 'public/master'

Author: rtomayko

bin/ghe-backup

@@ -9,7 +9,7 @@ set -e
 
 # Bring in the backup configuration
 cd $(dirname "$0")/..
-. libexec/ghe-backup-config
+. share/github-backup-utils/ghe-backup-config
 
 # Used to record failed backup steps
 failures=

bin/ghe-host-check

@@ -6,7 +6,7 @@ set -e
 
 # Bring in the backup configuration.
 cd $(dirname "$0")/..
-. libexec/ghe-backup-config
+. share/github-backup-utils/ghe-backup-config
 
 # Use the host provided on the command line if provided, or fallback on the
 # $GHE_HOSTNAME configured in backup.config when not present.

bin/ghe-restore

@@ -23,7 +23,7 @@ set -e
 
 # Bring in the backup configuration.
 cd $(dirname "$0")/..
-. libexec/ghe-backup-config
+. share/github-backup-utils/ghe-backup-config
 
 # Parse arguments
 restore_settings=false

debian/changelog

@@ -0,0 +1,22 @@
+github-backup-utils (1.1.0) UNRELEASED; urgency=medium
+
+  * Updated documentation on minimum GitHub Enterprise version requirements for
+    online and incremental backups from v11.10.341 to at least v11.10.342.
+  * The ghe-restore command now prompts for confirmation of the host to restore to
+    before performing any destructive operation. This is to reduce the chances of
+    restoring to the wrong host. The prompt may be bypassed in automated scenarios
+    by providing the --force option.
+  * Added a -c option to ghe-restore for restoring base appliance settings in
+    addition to primary datastores. See ghe-restore --help for more information.
+  * Added a note about disabling maintenance mode on the appliance after a
+    successful ghe-restore operation.
+  * Added support for filesystem layout changes and upgraded server components in
+  * future versions of GitHub Enterprise.
+
+ -- Twan Wolthof <[email protected]>  Sat, 18 Oct 2014 19:14:47 +0000
+
+github-backup-utils (1.0.1) UNRELEASED; urgency=medium
+
+  * Initial release.
+
+ -- Twan Wolthof <[email protected]>  Tue, 23 Sep 2014 08:34:55 +0000

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -0,0 +1,32 @@
+Source: github-backup-utils
+Maintainer: Twan Wolthof <[email protected]>
+Section: misc
+Priority: optional
+Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), git
+
+Package: github-backup-utils
+Architecture: any
+Depends: ${misc:Depends}, rsync (>= 2.6.4)
+Description: Backup and recovery utilities for GitHub Enterprise
+ The backup utilities implement a number of advanced capabilities for backup
+ hosts, built on top of the backup and restore features already included in
+ GitHub Enterprise.
+ .
+ These advanced features include:
+ .
+ Complete GitHub Enterprise backup and recovery system via two simple utilities:
+ `ghe-backup` and `ghe-restore`.
+ Online backups. The GitHub appliance need not be put in maintenance mode for
+ the duration of the backup run.
+ Incremental backup of Git repository data. Only changes since the last
+ snapshot are transferred, leading to faster backup runs and lower network
+ bandwidth and machine utilization.
+ Efficient snapshot storage. Only data added since the previous snapshot
+ consumes new space on the backup host.
+ Multiple backup snapshots with configurable retention periods.
+ Backup commands run under the lowest CPU/IO priority on the GitHub appliance,
+ reducing performance impact while backups are in progress.
+ Runs under most Linux/Unix environments.
+ MIT licensed, open source software maintained by GitHub, Inc.
+

debian/copyright

@@ -0,0 +1 @@
+../LICENSE

debian/install

@@ -0,0 +1,2 @@
+bin/* usr/bin
+share/* usr/share

debian/rules

@@ -0,0 +1,5 @@
+#!/usr/bin/make -f
+build-indep:
+
+%:
+	dh $@

libexec/ghe-backup-config renamed to share/github-backup-utils/ghe-backup-config

@@ -2,21 +2,21 @@
 # Usage: . ghe-backup-config
 # GitHub Enterprise backup shell configuration.
 #
-# This file is sourced by the various utilities under bin and libexec to
+# This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
 # All commands should start with the following:
 #
-#     cd $(dirname "$0")/..
-#     . libexec/ghe-backup-config
+#     cd $(dirname "$0")/../..
+#     . share/github-backup-utils/ghe-backup-config
 #
 
 # Assume the current directory is the root. This should be fine so long as all
 # scripts source us in according to the instructions above.
 GHE_BACKUP_ROOT="$(pwd)"
 
-# Add the bin and libexec dirs to PATH
-PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/libexec:$PATH"
+# Add the bin and share/github-backup-utils dirs to PATH
+PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
 
 # The backup config file. This may be set in the environment.
 : ${GHE_BACKUP_CONFIG:="$GHE_BACKUP_ROOT/backup.config"}
@@ -108,7 +108,7 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
 : ${GHE_IONICE:="ionice -c 3"}
 
 # The number of seconds to wait for in progress git-gc processes to complete
-# before starting the sync of git data. See libexec/ghe-backup-repositories-rsync
+# before starting the sync of git data. See share/github-backup-utils/ghe-backup-repositories-rsync
 # for more information. Default: 10 minutes.
 : ${GHE_GIT_COOLDOWN_PERIOD:=600}
 
@@ -159,7 +159,7 @@ fi
 
 # Run ghe-host-check and establish the version of the remote GitHub instance in
 # the exported GHE_REMOTE_VERSION variable. If the remote version has already
-# been established then don't perform the host check again. Utilities in libexec
+# been established then don't perform the host check again. Utilities in share/github-backup-utils
 # that need the remote version should use this function instead of calling
 # ghe-host-check directly to reduce ssh roundtrips. The top-level ghe-backup and
 # ghe-restore commands establish the version for all subcommands.