From 03ab2869f13ea2c5352d24366c73c3b89ecb95c5 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@mpb-geekgod.geekgod.com>
Date: Thu, 18 Jun 2009 20:19:17 -0400
Subject: Rename cvssync to gitsync and do not introduce haproxy changes

---
 etc/phpshellsessions/cvssync | 225 -------------------------------------------
 etc/phpshellsessions/gitsync | 225 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 225 insertions(+), 225 deletions(-)
 delete mode 100644 etc/phpshellsessions/cvssync
 create mode 100644 etc/phpshellsessions/gitsync

diff --git a/etc/phpshellsessions/cvssync b/etc/phpshellsessions/cvssync
deleted file mode 100644
index 238f5d0..0000000
--- a/etc/phpshellsessions/cvssync
+++ /dev/null
@@ -1,225 +0,0 @@
-/*   cvs_sync
- *   Written by Scott Ullrich
- *   (C)2005-2007 Scott Ullrich
- *   Part of the pfSense project pfSsh.php subsystem
- */
-
-exec("rm -rf /home/pfsense /root/pfsense /pfSenseGITREPO/");
-
-$GIT_REPO="http://gitweb.pfsense.org/pfsense/mainline.git";
-$CODIR =  "/root/pfsense/";
-
-global $argv;
-global $command_split;
-
-conf_mount_rw();
-
-echo "\nRemoving downloaded cvssync data, please wait...";
-exec("/bin/rm -rf /home/pfsense");
-exec("mkdir -p /home/pfsense");
-echo " done.\n";
-
-unlink_if_exists("/tmp/config.cache");
-
-if(!file_exists("/usr/local/bin/git")) {
-	echo "Cannot find git, fetching static git...";
-    system("pkg_add -r git");
-}
-
-# Remove mainline if exists (older)
-if(is_dir("/root/pfsense/mainline")) 
-	exec("rm -rf /root/pfsense/mainline");
-
-# Remove RELENG_1_2 if exists (older)
-if(is_dir("/root/pfsense/RELENG_1_2")) 
-	exec("rm -rf /root/pfsense/RELENG_1_2");
-
-# Remove HEAD if exists (older)
-if(is_dir("/root/pfsense/HEAD")) 
-	exec("rm -rf /root/pfsense/HEAD");
-
-/* NOTE: Set branches here */
-$branches = array(
-	"master" => "2.0 development branch",
-	"RELENG_1_2" => "1.2* release branch"
-);
-
-if(file_exists("/root/cvssync_backup.tgz")) {
-	$backup_date = `ls -lah /root/cvssync_backup.tgz | awk '{ print $6,$7,$8 }'`;
-	$tmp = array("RESTORE" => "Restores prior CVSSync backup data performed at {$backup_date}");
-	$branches = array_merge($branches, $tmp);
-}
-
-if($command_split[2]) {
-	$branch = $command_split[2];
-} else {
-	if(!$argv[3]) {
-		echo "\nPlease select which branch you would like to sync against:\n\n";
-		foreach($branches as $branchname => $branchdesc) {
-			echo "{$branchname} \t {$branchdesc}\n";
-		}
-		echo "\nOr alternatively you may enter a custom branch URL.\n\n";
-		$branch = readline("> ");
-		echo "\n";
-	} else {
-		$branch = $argv[3];
-	}
-}
-
-if($argv[4] == "NOBACKUP") 
-	$nobackup=true;
-else 
-	$nobackup = false;
-
-exec("mkdir -p /root/pfsense/$BRANCHTAG");
-
-$found = false;
-foreach($branches as $branchname => $branchdesc) {
-	if($branchname == $branch) 
-		$found = true;
-}
-if(!$found) {
-	if(isURL($branch)) {
-		echo "\n";
-		echo "NOTE: $branch was not found.\n\n";
-		$command = readline("Is this a custom GIT URL? [y]? ");
-		if(strtolower($command) == "y" or $command == "") {
-			$GIT_REPO = $branch;
-			$command = readline("Checkout which branch [master]? ");
-			if($command == "")
-				$branch = "master";
-			if($command) 
-				$branch = $command;
-			$found = true;
-		}
-	}
-	if(!$found) {
-		echo "\nNo valid branch found.  Exiting.\n\n";
-		exit;
-	}
-}
-
-if($branch == "RESTORE" && $g['platform'] == "pfSense") {
-	if(!file_exists("/root/cvssync_backup.tgz")) {
-		echo "Sorry, we could not find a previous CVSSync backup file.\n";
-		exit();
-	}
-	echo "===> Restoring previous CVSSync backup... Please wait...\n";
-	exec("tar Uxpf /root/cvssync_backup.tgz -C /");
-	post_cvssync_commands();
-	exit();
-} else {
-	$nobackup = true; // do not backup embedded, livecd
-}
-
-if($nobackup == false) {
-	echo "===> Backing up current pfSense information...\n";
-	echo "===> Please wait... ";
-	exec("tar czPf /root/cvssync_backup.tgz --exclude /root --exclude /dev --exclude /var/db/racoon/racoon.sock --exclude /tmp --exclude /var/run --exclude /var/empty /");
-	$size = filesize("/root/cvssync_backup.tgz");
-	echo "{$size} bytes.\n\n";
-	sleep(5);
-}
-
-echo "===> Checking out $branch\n";
-exec("mkdir -p /root/pfsense/$branch");
-
-// Git 'er done!
-if(is_dir("$CODIR/pfSenseGITREPO")) {
-	exec("cd $CODIR/pfSenseGITREPO && git fetch");
-	exec("cd $CODIR/pfSenseGITREPO && git merge $branch");	
-} else {
-    exec("mkdir -p $CODIR/pfSenseGITREPO");
-    echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO\n";
-	exec("cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO");
-	if(is_dir("$CODIR/pfSenseGITREPO/pfSense")) 
-		exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO");
-	if(is_dir("$CODIR/pfSenseGITREPO/mainline")) 
-		exec("mv $CODIR/pfSenseGITREPO/mainline $CODIR/pfSenseGITREPO/pfSenseGITREPO");
-}
-
-if($branch == "master") {
-	exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master");
-} else {
-	exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch");
-}
-
-exec("mkdir -p /tmp/lighttpd/cache/compress/");
-
-// Nuke CVS and pfSense tarballs
-exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
-exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
-
-// Remove files that we do not want to overwrite the system with 
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/usr/local/www/trigger_initial_wizard 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/crontab 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/master.passwd 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/passwd 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/ttys 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/group 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/platform 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/device.hints 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.conf 2>/dev/null");
-exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.rc 2>/dev/null");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/conf*");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/cf 2>/dev/null");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.shrc");
-exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.tcshrc");
-exec("rm -f ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/syslog.conf 2>/dev/null");
-
-echo "===> Installing new files...\n";
-
-if($g['platform'] == "pfSense") 
-	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -Uxpf -)";
-else 
-	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
-exec($command);
-
-post_cvssync_commands();
-
-echo "===> Checkout complete.\n";
-echo "\n";
-echo "Your system is now sync'd and PHP and Lighty will be restarted in 5 seconds.\n\n";
-
-function post_cvssync_commands() {
-	echo "===> Removing FAST-CGI temporary files...\n";
-	exec("find /tmp -name \"php-fastcgi.socket*\" -exec rm -rf {} \;");
-	exec("find /tmp -name \"*.tmp\" -exec rm -rf {} \;");
-
-	exec("rm -rf /tmp/xcache/* 2>/dev/null");
-
-	echo "===> Upgrading configuration (if needed)...\n";
-	convert_config();
-
-	echo "===> Restarting check_reload_status...\n";
-	exec("killall check_reload_status");
-	mwexec_bg("nohup /usr/bin/nice -n20 /usr/local/sbin/check_reload_status");
-
-	echo "===> Configuring filter...";
-	exec("/etc/rc.filter_configure_sync");
-	exec("pfctl -f /tmp/rules.debug");
-	echo "\n";
-
-	echo "===> Signaling PHP and Lighty restart...";
-	$fd = fopen("/tmp/restart_lighty", "w");
-	fwrite($fd, "#!/bin/sh\n");
-	fwrite($fd, "sleep 5\n");
-	fwrite($fd, "killall php\n");
-	fwrite($fd, "touch /tmp/restart_webgui\n");
-	fclose($fd);
-	mwexec_bg("sh /tmp/restart_lighty");
-	echo "\n";
-}
-
-function isUrl($url = "") {
-	if($url) 
-		if(strstr($url, "rcs.pfsense.org") or 
-			strstr($url, "mainline") or 
-				strstr($url, ".git"))
-					return true;
-	return false;
-}
-
-conf_mount_ro();
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync
new file mode 100644
index 0000000..238f5d0
--- /dev/null
+++ b/etc/phpshellsessions/gitsync
@@ -0,0 +1,225 @@
+/*   cvs_sync
+ *   Written by Scott Ullrich
+ *   (C)2005-2007 Scott Ullrich
+ *   Part of the pfSense project pfSsh.php subsystem
+ */
+
+exec("rm -rf /home/pfsense /root/pfsense /pfSenseGITREPO/");
+
+$GIT_REPO="http://gitweb.pfsense.org/pfsense/mainline.git";
+$CODIR =  "/root/pfsense/";
+
+global $argv;
+global $command_split;
+
+conf_mount_rw();
+
+echo "\nRemoving downloaded cvssync data, please wait...";
+exec("/bin/rm -rf /home/pfsense");
+exec("mkdir -p /home/pfsense");
+echo " done.\n";
+
+unlink_if_exists("/tmp/config.cache");
+
+if(!file_exists("/usr/local/bin/git")) {
+	echo "Cannot find git, fetching static git...";
+    system("pkg_add -r git");
+}
+
+# Remove mainline if exists (older)
+if(is_dir("/root/pfsense/mainline")) 
+	exec("rm -rf /root/pfsense/mainline");
+
+# Remove RELENG_1_2 if exists (older)
+if(is_dir("/root/pfsense/RELENG_1_2")) 
+	exec("rm -rf /root/pfsense/RELENG_1_2");
+
+# Remove HEAD if exists (older)
+if(is_dir("/root/pfsense/HEAD")) 
+	exec("rm -rf /root/pfsense/HEAD");
+
+/* NOTE: Set branches here */
+$branches = array(
+	"master" => "2.0 development branch",
+	"RELENG_1_2" => "1.2* release branch"
+);
+
+if(file_exists("/root/cvssync_backup.tgz")) {
+	$backup_date = `ls -lah /root/cvssync_backup.tgz | awk '{ print $6,$7,$8 }'`;
+	$tmp = array("RESTORE" => "Restores prior CVSSync backup data performed at {$backup_date}");
+	$branches = array_merge($branches, $tmp);
+}
+
+if($command_split[2]) {
+	$branch = $command_split[2];
+} else {
+	if(!$argv[3]) {
+		echo "\nPlease select which branch you would like to sync against:\n\n";
+		foreach($branches as $branchname => $branchdesc) {
+			echo "{$branchname} \t {$branchdesc}\n";
+		}
+		echo "\nOr alternatively you may enter a custom branch URL.\n\n";
+		$branch = readline("> ");
+		echo "\n";
+	} else {
+		$branch = $argv[3];
+	}
+}
+
+if($argv[4] == "NOBACKUP") 
+	$nobackup=true;
+else 
+	$nobackup = false;
+
+exec("mkdir -p /root/pfsense/$BRANCHTAG");
+
+$found = false;
+foreach($branches as $branchname => $branchdesc) {
+	if($branchname == $branch) 
+		$found = true;
+}
+if(!$found) {
+	if(isURL($branch)) {
+		echo "\n";
+		echo "NOTE: $branch was not found.\n\n";
+		$command = readline("Is this a custom GIT URL? [y]? ");
+		if(strtolower($command) == "y" or $command == "") {
+			$GIT_REPO = $branch;
+			$command = readline("Checkout which branch [master]? ");
+			if($command == "")
+				$branch = "master";
+			if($command) 
+				$branch = $command;
+			$found = true;
+		}
+	}
+	if(!$found) {
+		echo "\nNo valid branch found.  Exiting.\n\n";
+		exit;
+	}
+}
+
+if($branch == "RESTORE" && $g['platform'] == "pfSense") {
+	if(!file_exists("/root/cvssync_backup.tgz")) {
+		echo "Sorry, we could not find a previous CVSSync backup file.\n";
+		exit();
+	}
+	echo "===> Restoring previous CVSSync backup... Please wait...\n";
+	exec("tar Uxpf /root/cvssync_backup.tgz -C /");
+	post_cvssync_commands();
+	exit();
+} else {
+	$nobackup = true; // do not backup embedded, livecd
+}
+
+if($nobackup == false) {
+	echo "===> Backing up current pfSense information...\n";
+	echo "===> Please wait... ";
+	exec("tar czPf /root/cvssync_backup.tgz --exclude /root --exclude /dev --exclude /var/db/racoon/racoon.sock --exclude /tmp --exclude /var/run --exclude /var/empty /");
+	$size = filesize("/root/cvssync_backup.tgz");
+	echo "{$size} bytes.\n\n";
+	sleep(5);
+}
+
+echo "===> Checking out $branch\n";
+exec("mkdir -p /root/pfsense/$branch");
+
+// Git 'er done!
+if(is_dir("$CODIR/pfSenseGITREPO")) {
+	exec("cd $CODIR/pfSenseGITREPO && git fetch");
+	exec("cd $CODIR/pfSenseGITREPO && git merge $branch");	
+} else {
+    exec("mkdir -p $CODIR/pfSenseGITREPO");
+    echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO\n";
+	exec("cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO");
+	if(is_dir("$CODIR/pfSenseGITREPO/pfSense")) 
+		exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO");
+	if(is_dir("$CODIR/pfSenseGITREPO/mainline")) 
+		exec("mv $CODIR/pfSenseGITREPO/mainline $CODIR/pfSenseGITREPO/pfSenseGITREPO");
+}
+
+if($branch == "master") {
+	exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout master");
+} else {
+	exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -b $branch origin/$branch");
+}
+
+exec("mkdir -p /tmp/lighttpd/cache/compress/");
+
+// Nuke CVS and pfSense tarballs
+exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
+exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
+
+// Remove files that we do not want to overwrite the system with 
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/usr/local/www/trigger_initial_wizard 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/crontab 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/master.passwd 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/passwd 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/ttys 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/group 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/platform 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/device.hints 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.conf 2>/dev/null");
+exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.rc 2>/dev/null");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/conf*");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/cf 2>/dev/null");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.shrc");
+exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.tcshrc");
+exec("rm -f ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/syslog.conf 2>/dev/null");
+
+echo "===> Installing new files...\n";
+
+if($g['platform'] == "pfSense") 
+	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -Uxpf -)";
+else 
+	$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
+exec($command);
+
+post_cvssync_commands();
+
+echo "===> Checkout complete.\n";
+echo "\n";
+echo "Your system is now sync'd and PHP and Lighty will be restarted in 5 seconds.\n\n";
+
+function post_cvssync_commands() {
+	echo "===> Removing FAST-CGI temporary files...\n";
+	exec("find /tmp -name \"php-fastcgi.socket*\" -exec rm -rf {} \;");
+	exec("find /tmp -name \"*.tmp\" -exec rm -rf {} \;");
+
+	exec("rm -rf /tmp/xcache/* 2>/dev/null");
+
+	echo "===> Upgrading configuration (if needed)...\n";
+	convert_config();
+
+	echo "===> Restarting check_reload_status...\n";
+	exec("killall check_reload_status");
+	mwexec_bg("nohup /usr/bin/nice -n20 /usr/local/sbin/check_reload_status");
+
+	echo "===> Configuring filter...";
+	exec("/etc/rc.filter_configure_sync");
+	exec("pfctl -f /tmp/rules.debug");
+	echo "\n";
+
+	echo "===> Signaling PHP and Lighty restart...";
+	$fd = fopen("/tmp/restart_lighty", "w");
+	fwrite($fd, "#!/bin/sh\n");
+	fwrite($fd, "sleep 5\n");
+	fwrite($fd, "killall php\n");
+	fwrite($fd, "touch /tmp/restart_webgui\n");
+	fclose($fd);
+	mwexec_bg("sh /tmp/restart_lighty");
+	echo "\n";
+}
+
+function isUrl($url = "") {
+	if($url) 
+		if(strstr($url, "rcs.pfsense.org") or 
+			strstr($url, "mainline") or 
+				strstr($url, ".git"))
+					return true;
+	return false;
+}
+
+conf_mount_ro();
-- 
cgit v1.1