phusion-backup 1.0.2 → 1.0.3

data/bin/phusion-backup

@@ -83,7 +83,8 @@ class Core
 	
 	def generate(dir)
 		copy_file_no_overwrite("#{ROOT}/resources/default-files.txt", "#{dir}/files.txt")
-		copy_file_no_overwrite("#{ROOT}/resources/default-install-script.txt", "#{dir}/install-script.txt")
+		copy_file_no_overwrite("#{ROOT}/resources/default-install-script.sh", "#{dir}/install-script.sh")
+		copy_file_no_overwrite("#{ROOT}/resources/default-postrestore.sh", "#{dir}/postrestore.sh")
 	end
 	
 	def run_backup(server)
@@ -179,6 +180,61 @@ class Core
 				"old backups, more than #{MIN_BACKUPS_TO_KEEP} backups must exist."
 		end
 	end
+	
+	def run_restore(server)
+		if !File.exist?("#{server.dir}/data")
+			puts "<red>No `data` subdirectory found in this backup directory.</red>"
+			puts
+			puts "This means that you either don't have a backup, or you specified the wrong directory."
+			exit 1
+		end
+		
+		if File.exist?("#{server.dir}/install-script.sh")
+			script = "/tmp/script-#{Process.pid}.txt"
+			begin
+				File.open(script, 'w') do |f|
+					f.puts File.read("#{ROOT}/resources/header.sh")
+					f.puts File.read("#{server.dir}/install-script.sh")
+					f.puts File.read("#{ROOT}/resources/footer.sh")
+				end
+				sh! "scp", script, "root@#{server.hostname}:/tmp/script.sh"
+				sh! "ssh", "-t", "root@#{server.hostname}",
+					"bash /tmp/script.sh && " +
+					"rm -f /tmp/script.sh"
+			ensure
+				File.unlink(script) rescue nil
+			end
+		end
+		
+		sh! 'ssh', "root@#{server.hostname}",
+			"mkdir -p /backup-tmp"
+		sh! 'rdiff-backup',
+			'--restore-as-of', 'now',
+			'--force',
+			'-v5',
+			'--print-statistics',
+			"#{server.dir}/data",
+			"root@#{server.hostname}::/backup-tmp"
+		sh! 'ssh', "root@#{server.hostname}",
+			"rsync -avz /backup-tmp/ / && chmod 700 /backup-tmp"
+		
+		if File.exist?("#{server.dir}/postrestore.sh")
+			script = "/tmp/script-#{Process.pid}.txt"
+			begin
+				File.open(script, 'w') do |f|
+					f.puts File.read("#{ROOT}/resources/header.sh")
+					f.puts File.read("#{server.dir}/postrestore.sh")
+					f.puts File.read("#{ROOT}/resources/footer.sh")
+				end
+				sh! "scp", script, "root@#{server.hostname}:/tmp/script.sh"
+				sh! "ssh", "-t", "root@#{server.hostname}",
+					"bash /tmp/script.sh && " +
+					"rm -f /tmp/script.sh"
+			ensure
+				File.unlink(script) rescue nil
+			end
+		end
+	end
 
 private
 	class CommandError < StandardError
@@ -290,6 +346,10 @@ class App
 			opts.separator "   phusion-backup --list"
 			opts.separator ""
 			
+			opts.separator "Restore the most recent backup:"
+			opts.separator "   phusion-backup --restore hostname"
+			opts.separator ""
+			
 			opts.separator "Please read the README for tutorial!"
 			opts.separator ""
 			opts.separator "Available options:"
@@ -303,6 +363,10 @@ class App
 			        "in the given directory.") do |dir|
 				options[:generate] = dir
 			end
+			opts.on("--restore",
+			        "Enable restore mode") do
+				options[:restore] = true
+			end
 			opts.on("-h", "--help", "Show this help message.") do
 				options[:help] = true
 			end
@@ -321,25 +385,36 @@ class App
 			return 0
 		end
 		
-		core = Core.new(["#{Core::ROOT}/backups", "#{home_dir}/Backups"])
+		@core = Core.new(["#{Core::ROOT}/backups", "#{home_dir}/Backups"])
 		
 		if options[:list]
-			core.servers.each do |server|
+			@core.servers.each do |server|
 				printf "%-35s %s\n", server.hostname, server.dir
 			end
 			return 0
 		elsif options[:generate]
-			core.generate(options[:generate])
+			@core.generate(options[:generate])
+			return 0
+		elsif options[:restore]
+			run_in_restore_mode
+			return 0
+		else
+			run_in_backup_mode
 			return 0
 		end
-		
+	rescue Core::CommandError
+		return 1
+	end
+
+private
+	def run_in_backup_mode
 		if @argv.empty?
-			if core.servers.empty?
+			if @core.servers.empty?
 				puts_error "You must create a backup specification first. Please read README for tutorial."
 			else
 				puts_error "Please specify the server you want to backup:"
 				puts
-				core.servers.each do |server|
+				@core.servers.each do |server|
 					puts "  phusion-backup #{server.hostname}"
 				end
 				puts
@@ -350,7 +425,7 @@ class App
 		
 		servers = []
 		@argv.each do |name|
-			server = core.find_server(name)
+			server = @core.find_server(name)
 			if !server
 				puts_error "This program doesn't know anything about the server '#{name}'."
 				puts "If you've misspelled the name, please correct it."
@@ -363,16 +438,42 @@ class App
 		
 		servers.each do |server|
 			puts "<banner>Backing up #{server.hostname} - #{server.dir}</banner>"
-			core.run_backup(server)
+			@core.run_backup(server)
 			puts
 		end
+	end
+	
+	def run_in_restore_mode
+		if @argv.empty?
+			if @core.servers.empty?
+				puts_error "Please specify the host name of the server you want to backup, " +
+					"or specify the path to the backup directory."
+			else
+				puts_error "Please specify the server you want to restore:"
+				puts
+				@core.servers.each do |server|
+					puts "  phusion-backup --restore #{server.hostname}"
+				end
+				puts
+				puts "For full usage please see `phusion-backup --help` and the README."
+			end
+			return 1
+		elsif @argv.size > 1
+			puts_error "You can only specify one server when using --restore."
+			return 1
+		end
 		
-		return 0
-	rescue Core::CommandError
-		return 1
+		server = @core.find_server(@argv[0])
+		if !server
+			puts_error "This program doesn't know anything about the server '#{@argv[0]}'."
+			puts "If you've misspelled the name, please correct it."
+			puts "If you want to see a list of available servers that this programs knows about, run <b>phusion-backup --list</b>."
+			puts "For general, please refer to the README."
+			exit 1
+		end
+		@core.run_restore(server)
 	end
-
-private
+	
 	def home_dir
 		return Etc.getpwuid(Process.uid).dir
 	end

data/phusion-backup.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
 	s.name = "phusion-backup"
-	s.version = "1.0.2"
+	s.version = "1.0.3"
 	s.authors = ["Hongli Lai"]
-	s.date = "2011-03-30"
+	s.date = "2011-03-31"
 	s.description = "Simple backup tool utilizing rdiff-backup."
 	s.summary = "Simple backup tool utilizing rdiff-backup."
 	s.email = "hongli@phusion.nl"

data/resources/default-files.txt

@@ -1,3 +1,7 @@
+## This file specifies which files on the server should be backed up.
+## Filenames may be globs. A '-' prefix means that the glob is excluded
+## from backup.
+
 # Standard system stuff.
 /etc/skel
 /etc/profile
@@ -6,6 +10,8 @@
 /etc/nanorc
 /etc/screenrc
 /etc/mailname
+/etc/exim4
+/etc/postfix
 /etc/rc.local
 /var/spool/cron
 

data/resources/default-install-script.sh

@@ -0,0 +1,77 @@
+## The commands in this file are run upon restoring to a server,
+## before any files are copied over. This is a normal shell script,
+## run in bash. Please ensure that all commands run here are idempotent!!
+##
+## By default, all debconf questions are postponed until the end
+## so that you can answer everything at once without delaying the
+## install.
+
+# Standard, essential tools
+apt-get update
+apt-get -y upgrade
+apt-get install -y \
+    bash-completion screen wget gdebi-core \
+    rsync rdiff-backup
+
+# Daemon tools
+apt-get install -y daemontools daemontools-run
+
+# Compiler toolchain
+apt-get install -y build-essential gdb zlib1g-dev
+
+# SQL databases
+if true; then
+    # MySQL
+    DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server libmysqlclient-dev
+    package_name=$(dpkg-query -p mysql-server | grep Depends | grep -oEi 'mysql-server-[0-9a-z\.]+')
+    run_at_end dpkg-reconfigure $package_name
+    
+    # SQLite3
+    apt-get install -y sqlite3 libsqlite3-dev
+fi
+
+# Email support
+if true; then
+    # Exim
+    DEBIAN_FRONTEND=noninteractive apt-get install -y exim4
+    run_at_end dpkg-reconfigure -p medium exim4-config
+    
+    # Postfix
+    # DEBIAN_FRONTEND=noninteractive apt-get install -y postfix
+    # run_at_end dpkg-reconfigure -p medium postfix
+fi
+
+# Ruby Enterprise Edition
+if true; then
+    # basename=ruby-enterprise_1.8.7-2011.03_i386_ubuntu10.04.deb
+    # basename=ruby-enterprise_1.8.7-2011.03_amd64_ubuntu10.04.deb
+    # basename=ruby-enterprise_1.8.7-2011.03_amd64_debian5.0.deb
+    basename=ruby-enterprise_1.8.7-2011.03_amd64_debian6.0.deb
+    if [[ ! -f /usr/local/bin/ruby ]]; then
+        rm -f $basename
+        wget http://rubyenterpriseedition.googlecode.com/files/$basename
+        gdebi -n $basename
+        rm -f $basename
+    fi
+fi
+
+# Install users
+if true; then
+    # Specify list of usernames here, separated by space.
+    # Each user will be created with a random password.
+    # It's up to you to change the passwords later.
+    # USERNAMES="john jane"
+    USERNAMES=""
+    
+    for user in $USERNAMES; do
+        if ! grep -q "^$user:" /etc/passwd; then
+            password=$(tr -dc A-Za-z0-9 < /dev/urandom | (head -c $1 > /dev/null 2>&1 || head -c 15))
+            adduser $user < /dev/null
+            echo
+            echo "$user:$password" | chpasswd
+        fi
+    done
+fi
+
+# Configure time zone
+dpkg-reconfigure tzdata

data/resources/default-postrestore.sh

@@ -0,0 +1,12 @@
+## The commands in this file are run upon restoring to a server,
+## after install-script.sh is run and after files are copied over.
+## This is a normal shell script, run in bash. Please ensure that
+## all commands run here are idempotent!!
+
+# Disable all daemon tools services until explicitly enabled by administrator.
+if [[ -f /usr/bin/svc ]]; then
+    services=$(/bin/ls -1 /etc/service)
+    if [[ ${#services[@]} > 0 ]] && ! [[ ${#services[@]} = 1 && ${servers[0]} = "" ]]; then
+        svc -d /etc/service/*
+    fi
+fi

data/resources/footer.sh

@@ -0,0 +1,5 @@
+set +v
+echo "------------------------------------------"
+set -v
+
+run_end_commands

data/resources/header.sh

@@ -0,0 +1,36 @@
+NRUN_AT_END=0
+
+function set_variable {
+    local name="$1"
+    shift
+    local value=("$@")
+    set +v
+    eval "$name=(\"\${value[@]}\")"
+    set -v
+}
+
+function run_at_end {
+    set_variable "RUN_AT_END_$NRUN_AT_END" "$@"
+    set +e
+    (( NRUN_AT_END++ ))
+    set -e
+}
+
+function run_end_commands {
+    set +v
+    local i=0
+    local name
+    local value
+    while [[ $i -lt $NRUN_AT_END ]]; do
+        name="RUN_AT_END_$i"
+        eval "value=(\"\${$name[@]}\")"
+        echo "${value[@]}"
+        "${value[@]}"
+        set +e
+        (( i++ ))
+        set -e
+    done
+    set -v
+}
+
+set -ev

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phusion-backup
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Hongli Lai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +02:00
+date: 2011-03-31 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,10 @@ files:
 - phusion-backup.gemspec
 - bin/phusion-backup
 - resources/default-files.txt
-- resources/default-install-script.txt
+- resources/default-install-script.sh
+- resources/default-postrestore.sh
+- resources/footer.sh
+- resources/header.sh
 has_rdoc: true
 homepage: https://github.com/FooBarWidget/crash-watch
 licenses: []

data/resources/default-install-script.txt

@@ -1,6 +0,0 @@
-# Standard, essential tools
-apt-get install bash-completion screen
-apt-get install rdiff-backup python-pylibacl-dbg python-pyxattr-dbg
-
-# Compiler toolchain
-apt-get install build-essential gdb