| 1 |
800351cc
|
Scott Ullrich
|
/* cvs_sync
|
| 2 |
|
|
* Written by Scott Ullrich
|
| 3 |
9bb3e055
|
Scott Ullrich
|
* (C)2005-2007 Scott Ullrich
|
| 4 |
97e6256f
|
Erik Fonnesbeck
|
* (C)2010 Erik Fonnesbeck
|
| 5 |
9fa76728
|
Scott Ullrich
|
* Part of the pfSense project pfSsh.php subsystem
|
| 6 |
800351cc
|
Scott Ullrich
|
*/
|
| 7 |
|
|
|
| 8 |
680bcb4d
|
Scott Ullrich
|
require_once("globals.inc");
|
| 9 |
784a0768
|
sullrich
|
require_once("filter.inc");
|
| 10 |
|
|
require_once("shaper.inc");
|
| 11 |
|
|
require_once("rrd.inc");
|
| 12 |
3ffa8318
|
Renato Botelho
|
require_once("pfsense-utils.inc");
|
| 13 |
784a0768
|
sullrich
|
|
| 14 |
bbaf865f
|
Scott Ullrich
|
conf_mount_rw();
|
| 15 |
|
|
|
| 16 |
aab2a3f6
|
jim-p
|
$GIT_REPO="git://github.com/bsdperimeter/pfsense.git";
|
| 17 |
fcddf282
|
Scott Ullrich
|
$CODIR = "/root/pfsense/";
|
| 18 |
3f179a55
|
Scott Ullrich
|
|
| 19 |
153e3cb5
|
jim-p
|
global $g;
|
| 20 |
81fa1cc3
|
Scott Ullrich
|
global $argv;
|
| 21 |
|
|
global $command_split;
|
| 22 |
3f179a55
|
Scott Ullrich
|
|
| 23 |
f0ce6758
|
Erik Fonnesbeck
|
// If this parameter is set, all interactive functions are disabled
|
| 24 |
|
|
// and neither PHP nor the web gui will be killed or restarted.
|
| 25 |
|
|
$upgrading = in_array("--upgrading", $argv);
|
| 26 |
|
|
|
| 27 |
784cca4d
|
Scott Ullrich
|
unlink_if_exists("/tmp/config.cache");
|
| 28 |
800351cc
|
Scott Ullrich
|
|
| 29 |
81fa1cc3
|
Scott Ullrich
|
if(!file_exists("/usr/local/bin/git")) {
|
| 30 |
1f1fc944
|
Chris Buechler
|
echo "Cannot find git, fetching...";
|
| 31 |
9011a843
|
jim-p
|
if (($g['platform'] == "nanobsd") || ($g['platform'] == "embedded")) {
|
| 32 |
003d1b3d
|
jim-p
|
$pkgtmpdir = "/usr/bin/env PKG_TMPDIR=/root/ ";
|
| 33 |
73d885d7
|
jim-p
|
$pkgstagingdir = "/root/tmp";
|
| 34 |
|
|
if (!is_dir($pkgstagingdir))
|
| 35 |
|
|
mkdir($pkgstagingdir);
|
| 36 |
|
|
$pkgstaging = "-t {$pkgstagingdir}/instmp.XXXXXX";
|
| 37 |
9011a843
|
jim-p
|
}
|
| 38 |
|
|
system("{$pkgtmpdir}/usr/sbin/pkg_add {$pkgstaging} -r git");
|
| 39 |
2b065943
|
Scott Ullrich
|
}
|
| 40 |
|
|
|
| 41 |
74fb85b8
|
Scott Ullrich
|
# Remove mainline if exists (older)
|
| 42 |
2ac39ce3
|
Scott Ullrich
|
if(is_dir("/root/pfsense/mainline"))
|
| 43 |
|
|
exec("rm -rf /root/pfsense/mainline");
|
| 44 |
|
|
|
| 45 |
74fb85b8
|
Scott Ullrich
|
# Remove RELENG_1_2 if exists (older)
|
| 46 |
|
|
if(is_dir("/root/pfsense/RELENG_1_2"))
|
| 47 |
|
|
exec("rm -rf /root/pfsense/RELENG_1_2");
|
| 48 |
|
|
|
| 49 |
|
|
# Remove HEAD if exists (older)
|
| 50 |
|
|
if(is_dir("/root/pfsense/HEAD"))
|
| 51 |
|
|
exec("rm -rf /root/pfsense/HEAD");
|
| 52 |
|
|
|
| 53 |
9fa76728
|
Scott Ullrich
|
/* NOTE: Set branches here */
|
| 54 |
8d136ee2
|
Scott Ullrich
|
$branches = array(
|
| 55 |
81fa1cc3
|
Scott Ullrich
|
"master" => "2.0 development branch",
|
| 56 |
156a7868
|
Erik Fonnesbeck
|
"RELENG_1_2" => "1.2* release branch",
|
| 57 |
|
|
"build_commit" => "The commit originally used to build the image"
|
| 58 |
81fa1cc3
|
Scott Ullrich
|
);
|
| 59 |
ff33e21f
|
Scott Ullrich
|
|
| 60 |
76e74f41
|
Scott Ullrich
|
if(file_exists("/root/cvssync_backup.tgz")) {
|
| 61 |
d56e44ba
|
Scott Ullrich
|
$backup_date = `ls -lah /root/cvssync_backup.tgz | awk '{ print $6,$7,$8 }'`;
|
| 62 |
81fa1cc3
|
Scott Ullrich
|
$tmp = array("RESTORE" => "Restores prior CVSSync backup data performed at {$backup_date}");
|
| 63 |
76e74f41
|
Scott Ullrich
|
$branches = array_merge($branches, $tmp);
|
| 64 |
|
|
}
|
| 65 |
537bc12e
|
Scott Ullrich
|
|
| 66 |
932364e7
|
Erik Fonnesbeck
|
if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) {
|
| 67 |
|
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git config remote.origin.url", $output_str, $ret);
|
| 68 |
|
|
if(is_array($output_str) && !empty($output_str[0]))
|
| 69 |
|
|
$GIT_REPO = $output_str[0];
|
| 70 |
|
|
unset($output_str);
|
| 71 |
|
|
}
|
| 72 |
|
|
|
| 73 |
537bc12e
|
Scott Ullrich
|
if($command_split[2]) {
|
| 74 |
|
|
$branch = $command_split[2];
|
| 75 |
96ebb0a6
|
Scott Ullrich
|
} else {
|
| 76 |
f0ce6758
|
Erik Fonnesbeck
|
if(!$argv[3] && !$upgrading) {
|
| 77 |
932364e7
|
Erik Fonnesbeck
|
echo "\nCurrent repository is $GIT_REPO\n";
|
| 78 |
ab757ebc
|
Scott Ullrich
|
echo "\nPlease select which branch you would like to sync against:\n\n";
|
| 79 |
71845120
|
Scott Ullrich
|
foreach($branches as $branchname => $branchdesc) {
|
| 80 |
0c68311c
|
Scott Ullrich
|
echo "{$branchname} \t {$branchdesc}\n";
|
| 81 |
71845120
|
Scott Ullrich
|
}
|
| 82 |
11f52e40
|
Scott Ullrich
|
echo "\nOr alternatively you may enter a custom RCS branch URL (HTTP).\n\n";
|
| 83 |
0c68311c
|
Scott Ullrich
|
$branch = readline("> ");
|
| 84 |
71845120
|
Scott Ullrich
|
echo "\n";
|
| 85 |
|
|
} else {
|
| 86 |
|
|
$branch = $argv[3];
|
| 87 |
|
|
}
|
| 88 |
96ebb0a6
|
Scott Ullrich
|
}
|
| 89 |
784cca4d
|
Scott Ullrich
|
|
| 90 |
84b5f39b
|
Scott Ullrich
|
if($argv[4] == "NOBACKUP")
|
| 91 |
680bcb4d
|
Scott Ullrich
|
$nobackup = true;
|
| 92 |
7a7371d1
|
Scott Ullrich
|
else
|
| 93 |
|
|
$nobackup = false;
|
| 94 |
84b5f39b
|
Scott Ullrich
|
|
| 95 |
fb95b324
|
Erik Fonnesbeck
|
// If the repository has been fetched before, build a list of its branches.
|
| 96 |
|
|
if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) {
|
| 97 |
|
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git branch -r", $branch_list, $ret);
|
| 98 |
|
|
if($ret == 0 && is_array($branch_list)) {
|
| 99 |
|
|
foreach ($branch_list as $branch_item) {
|
| 100 |
|
|
$branch_item = substr(strrchr($branch_item, "/"), 1);
|
| 101 |
|
|
if (!isset($branches[$branch_item]))
|
| 102 |
|
|
$branches[$branch_item] = " ";
|
| 103 |
|
|
}
|
| 104 |
|
|
}
|
| 105 |
|
|
}
|
| 106 |
|
|
|
| 107 |
9fa76728
|
Scott Ullrich
|
$found = false;
|
| 108 |
81fa1cc3
|
Scott Ullrich
|
foreach($branches as $branchname => $branchdesc) {
|
| 109 |
9fa76728
|
Scott Ullrich
|
if($branchname == $branch)
|
| 110 |
|
|
$found = true;
|
| 111 |
81fa1cc3
|
Scott Ullrich
|
}
|
| 112 |
9fa76728
|
Scott Ullrich
|
if(!$found) {
|
| 113 |
f0ce6758
|
Erik Fonnesbeck
|
if(isURL($branch) && !$upgrading) {
|
| 114 |
e623dd70
|
Scott Ullrich
|
echo "\n";
|
| 115 |
|
|
echo "NOTE: $branch was not found.\n\n";
|
| 116 |
|
|
$command = readline("Is this a custom GIT URL? [y]? ");
|
| 117 |
|
|
if(strtolower($command) == "y" or $command == "") {
|
| 118 |
|
|
$GIT_REPO = $branch;
|
| 119 |
|
|
$command = readline("Checkout which branch [master]? ");
|
| 120 |
|
|
if($command == "")
|
| 121 |
|
|
$branch = "master";
|
| 122 |
|
|
if($command)
|
| 123 |
|
|
$branch = $command;
|
| 124 |
|
|
$found = true;
|
| 125 |
|
|
}
|
| 126 |
|
|
}
|
| 127 |
|
|
if(!$found) {
|
| 128 |
|
|
echo "\nNo valid branch found. Exiting.\n\n";
|
| 129 |
56240390
|
Erik Fonnesbeck
|
conf_mount_ro();
|
| 130 |
e623dd70
|
Scott Ullrich
|
exit;
|
| 131 |
|
|
}
|
| 132 |
800351cc
|
Scott Ullrich
|
}
|
| 133 |
|
|
|
| 134 |
b6964228
|
Erik Fonnesbeck
|
$merge_repos = array();
|
| 135 |
97e6256f
|
Erik Fonnesbeck
|
if(file_exists("/root/.gitsync_merge")) {
|
| 136 |
|
|
$gitsync_merges = file("/root/.gitsync_merge", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
|
| 137 |
|
|
if(!empty($gitsync_merges) && is_array($gitsync_merges)) {
|
| 138 |
|
|
echo "\n===> Automatic merge list read from /root/.gitsync_merge\n";
|
| 139 |
|
|
foreach($gitsync_merges as $merge_line_num => $merge_line) {
|
| 140 |
|
|
$merge_comments = explode("#", trim($merge_line));
|
| 141 |
|
|
if(empty($merge_comments[0]))
|
| 142 |
|
|
continue;
|
| 143 |
|
|
|
| 144 |
|
|
$merge_line = explode(" ", trim($merge_comments[0]));
|
| 145 |
|
|
if(count($merge_line) != 2 || empty($merge_line[0]) || empty($merge_line[1])) {
|
| 146 |
|
|
echo "\nLine " . ($merge_line_num + 1) . " does not have the correct parameter count or has improper spacing.\n";
|
| 147 |
|
|
echo "Expected parameters: repository_url branch\n";
|
| 148 |
|
|
echo "Line read: " . implode(" ", $merge_line) . "\n\n";
|
| 149 |
|
|
echo "Aborting automatic merge.\n\n";
|
| 150 |
|
|
$merge_repos = array();
|
| 151 |
|
|
break;
|
| 152 |
|
|
}
|
| 153 |
|
|
$merge_repos[] = array('repo' => $merge_line[0], 'branch' => $merge_line[1]);
|
| 154 |
|
|
}
|
| 155 |
|
|
}
|
| 156 |
|
|
}
|
| 157 |
f0ce6758
|
Erik Fonnesbeck
|
if(!$command_split[2] && !$argv[3] && !$upgrading) {
|
| 158 |
b6964228
|
Erik Fonnesbeck
|
do {
|
| 159 |
97e6256f
|
Erik Fonnesbeck
|
echo "\nAdd a custom RCS branch URL (HTTP) to merge in or press enter if done.\n\n";
|
| 160 |
b6964228
|
Erik Fonnesbeck
|
$merge_repo = readline("> ");
|
| 161 |
|
|
if(!empty($merge_repo)) {
|
| 162 |
|
|
$merge_branch = readline("Merge which branch [master]? ");
|
| 163 |
|
|
if($merge_branch == "")
|
| 164 |
|
|
$merge_repos[] = array('repo' => $merge_repo, 'branch' => 'master');
|
| 165 |
|
|
else if($merge_branch)
|
| 166 |
|
|
$merge_repos[] = array('repo' => $merge_repo, 'branch' => $merge_branch);
|
| 167 |
|
|
}
|
| 168 |
|
|
} while(!empty($merge_repo));
|
| 169 |
|
|
}
|
| 170 |
|
|
|
| 171 |
b9c529eb
|
Scott Ullrich
|
if($branch == "RESTORE" && $g['platform'] == "pfSense") {
|
| 172 |
ff33e21f
|
Scott Ullrich
|
if(!file_exists("/root/cvssync_backup.tgz")) {
|
| 173 |
|
|
echo "Sorry, we could not find a previous CVSSync backup file.\n";
|
| 174 |
56240390
|
Erik Fonnesbeck
|
conf_mount_ro();
|
| 175 |
ff33e21f
|
Scott Ullrich
|
exit();
|
| 176 |
|
|
}
|
| 177 |
|
|
echo "===> Restoring previous CVSSync backup... Please wait...\n";
|
| 178 |
9226ab39
|
Scott Ullrich
|
exec("tar Uxpf /root/cvssync_backup.tgz -C /");
|
| 179 |
ff33e21f
|
Scott Ullrich
|
post_cvssync_commands();
|
| 180 |
56240390
|
Erik Fonnesbeck
|
conf_mount_ro();
|
| 181 |
ff33e21f
|
Scott Ullrich
|
exit();
|
| 182 |
81fa1cc3
|
Scott Ullrich
|
} else {
|
| 183 |
|
|
$nobackup = true; // do not backup embedded, livecd
|
| 184 |
ff33e21f
|
Scott Ullrich
|
}
|
| 185 |
|
|
|
| 186 |
7a7371d1
|
Scott Ullrich
|
if($nobackup == false) {
|
| 187 |
84b5f39b
|
Scott Ullrich
|
echo "===> Backing up current pfSense information...\n";
|
| 188 |
|
|
echo "===> Please wait... ";
|
| 189 |
81fa1cc3
|
Scott Ullrich
|
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 /");
|
| 190 |
84b5f39b
|
Scott Ullrich
|
$size = filesize("/root/cvssync_backup.tgz");
|
| 191 |
81fa1cc3
|
Scott Ullrich
|
echo "{$size} bytes.\n\n";
|
| 192 |
|
|
sleep(5);
|
| 193 |
84b5f39b
|
Scott Ullrich
|
}
|
| 194 |
ff33e21f
|
Scott Ullrich
|
|
| 195 |
9c55f824
|
Scott Ullrich
|
echo "===> Checking out $branch\n";
|
| 196 |
81fa1cc3
|
Scott Ullrich
|
|
| 197 |
43141617
|
Erik Fonnesbeck
|
// Git commands for resetting to the specified branch
|
| 198 |
|
|
if($branch == "build_commit") {
|
| 199 |
|
|
$git_cmd = array(
|
| 200 |
97e6256f
|
Erik Fonnesbeck
|
"cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git branch " . escapeshellarg($branch) . " 2>/dev/null",
|
| 201 |
|
|
"cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -f " . escapeshellarg($branch) . " 2>/dev/null",
|
| 202 |
43141617
|
Erik Fonnesbeck
|
"cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard `cat /etc/version.lastcommit`"
|
| 203 |
|
|
);
|
| 204 |
|
|
} else {
|
| 205 |
|
|
$git_cmd = array(
|
| 206 |
97e6256f
|
Erik Fonnesbeck
|
"cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git branch " . escapeshellarg($branch) . " " . escapeshellarg("origin/{$branch}") . " 2>/dev/null",
|
| 207 |
|
|
"cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git checkout -f " . escapeshellarg($branch) . " 2>/dev/null",
|
| 208 |
|
|
"cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard " . escapeshellarg("origin/{$branch}")
|
| 209 |
43141617
|
Erik Fonnesbeck
|
);
|
| 210 |
|
|
}
|
| 211 |
|
|
|
| 212 |
81fa1cc3
|
Scott Ullrich
|
// Git 'er done!
|
| 213 |
e2dc4289
|
sullrich
|
if(is_dir("$CODIR/pfSenseGITREPO/pfSenseGITREPO")) {
|
| 214 |
|
|
echo "===> Fetching updates...\n";
|
| 215 |
97e6256f
|
Erik Fonnesbeck
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git config remote.origin.url " . escapeshellarg($GIT_REPO));
|
| 216 |
e2dc4289
|
sullrich
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git fetch");
|
| 217 |
e22aff02
|
sullrich
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git clean -f -f -x -d");
|
| 218 |
ecac770c
|
Erik Fonnesbeck
|
run_cmds($git_cmd);
|
| 219 |
35a98a24
|
Scott Ullrich
|
} else {
|
| 220 |
72374d82
|
Scott Ullrich
|
exec("mkdir -p $CODIR/pfSenseGITREPO");
|
| 221 |
e623dd70
|
Scott Ullrich
|
echo "Executing cd $CODIR/pfSenseGITREPO && git clone $GIT_REPO pfSenseGITREPO\n";
|
| 222 |
97e6256f
|
Erik Fonnesbeck
|
exec("cd $CODIR/pfSenseGITREPO && git clone " . escapeshellarg($GIT_REPO) . " pfSenseGITREPO");
|
| 223 |
72374d82
|
Scott Ullrich
|
if(is_dir("$CODIR/pfSenseGITREPO/pfSense"))
|
| 224 |
|
|
exec("mv $CODIR/pfSenseGITREPO/pfSense $CODIR/pfSenseGITREPO/pfSenseGITREPO");
|
| 225 |
|
|
if(is_dir("$CODIR/pfSenseGITREPO/mainline"))
|
| 226 |
|
|
exec("mv $CODIR/pfSenseGITREPO/mainline $CODIR/pfSenseGITREPO/pfSenseGITREPO");
|
| 227 |
43141617
|
Erik Fonnesbeck
|
run_cmds($git_cmd);
|
| 228 |
35a98a24
|
Scott Ullrich
|
}
|
| 229 |
4c1ed4a7
|
Scott Ullrich
|
|
| 230 |
b6964228
|
Erik Fonnesbeck
|
foreach($merge_repos as $merge_repo) {
|
| 231 |
|
|
echo "===> Merging branch {$merge_repo['branch']} from {$merge_repo['repo']}\n";
|
| 232 |
97e6256f
|
Erik Fonnesbeck
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git pull " . escapeshellarg($merge_repo['repo']) . " " . escapeshellarg($merge_repo['branch']), $output_str, $ret);
|
| 233 |
b6964228
|
Erik Fonnesbeck
|
unset($output_str);
|
| 234 |
|
|
if($ret <> 0) {
|
| 235 |
|
|
echo "\nMerge failed. Aborting sync.\n\n";
|
| 236 |
|
|
run_cmds($git_cmd);
|
| 237 |
56240390
|
Erik Fonnesbeck
|
conf_mount_ro();
|
| 238 |
b6964228
|
Erik Fonnesbeck
|
exit;
|
| 239 |
|
|
}
|
| 240 |
|
|
}
|
| 241 |
|
|
|
| 242 |
784cca4d
|
Scott Ullrich
|
exec("mkdir -p /tmp/lighttpd/cache/compress/");
|
| 243 |
|
|
|
| 244 |
81fa1cc3
|
Scott Ullrich
|
// Nuke CVS and pfSense tarballs
|
| 245 |
72374d82
|
Scott Ullrich
|
exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name CVS -exec rm -rf {} \; 2>/dev/null");
|
| 246 |
|
|
exec("cd ${CODIR}/pfSenseGITREPO/pfSenseGITREPO && find . -name pfSense.tgz -exec rm {} \; 2>/dev/null");
|
| 247 |
81fa1cc3
|
Scott Ullrich
|
|
| 248 |
|
|
// Remove files that we do not want to overwrite the system with
|
| 249 |
72374d82
|
Scott Ullrich
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/usr/local/www/trigger_initial_wizard 2>/dev/null");
|
| 250 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/crontab 2>/dev/null");
|
| 251 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/master.passwd 2>/dev/null");
|
| 252 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/passwd 2>/dev/null");
|
| 253 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
|
| 254 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/ttys 2>/dev/null");
|
| 255 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/group 2>/dev/null");
|
| 256 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/fstab 2>/dev/null");
|
| 257 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/platform 2>/dev/null");
|
| 258 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/device.hints 2>/dev/null");
|
| 259 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.conf 2>/dev/null");
|
| 260 |
|
|
exec("rm ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/boot/loader.rc 2>/dev/null");
|
| 261 |
|
|
exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/conf*");
|
| 262 |
|
|
exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/cf 2>/dev/null");
|
| 263 |
|
|
exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.shrc");
|
| 264 |
|
|
exec("rm -rf ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/root/.tcshrc");
|
| 265 |
|
|
exec("rm -f ${CODIR}/pfSenseGITREPO/pfSenseGITREPO/etc/syslog.conf 2>/dev/null");
|
| 266 |
81fa1cc3
|
Scott Ullrich
|
|
| 267 |
|
|
echo "===> Installing new files...\n";
|
| 268 |
|
|
|
| 269 |
97e6256f
|
Erik Fonnesbeck
|
// Don't include the .git directory in the copy
|
| 270 |
|
|
exec("mv $CODIR/pfSenseGITREPO/pfSenseGITREPO/.git $CODIR/pfSenseGITREPO/gitsync_temp.git");
|
| 271 |
|
|
|
| 272 |
b9c529eb
|
Scott Ullrich
|
if($g['platform'] == "pfSense")
|
| 273 |
72374d82
|
Scott Ullrich
|
$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -Uxpf -)";
|
| 274 |
b9c529eb
|
Scott Ullrich
|
else
|
| 275 |
72374d82
|
Scott Ullrich
|
$command = "cd $CODIR/pfSenseGITREPO/pfSenseGITREPO ; tar -cpf - . | (cd / ; tar -xpf -) 2>/dev/null";
|
| 276 |
b9c529eb
|
Scott Ullrich
|
exec($command);
|
| 277 |
800351cc
|
Scott Ullrich
|
|
| 278 |
97e6256f
|
Erik Fonnesbeck
|
exec("mv $CODIR/pfSenseGITREPO/gitsync_temp.git $CODIR/pfSenseGITREPO/pfSenseGITREPO/.git");
|
| 279 |
|
|
|
| 280 |
|
|
// Reset the repository to restore the deleted files
|
| 281 |
|
|
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && git reset --hard >/dev/null 2>/dev/null");
|
| 282 |
800351cc
|
Scott Ullrich
|
|
| 283 |
f0ce6758
|
Erik Fonnesbeck
|
if(!$upgrading)
|
| 284 |
|
|
post_cvssync_commands();
|
| 285 |
51a2e892
|
sullrich
|
|
| 286 |
81fa1cc3
|
Scott Ullrich
|
echo "===> Checkout complete.\n";
|
| 287 |
|
|
echo "\n";
|
| 288 |
f0ce6758
|
Erik Fonnesbeck
|
if(!$upgrading)
|
| 289 |
|
|
echo "Your system is now sync'd and PHP and Lighty will be restarted in 5 seconds.\n\n";
|
| 290 |
|
|
else
|
| 291 |
|
|
echo "Your system is now sync'd.\n\n";
|
| 292 |
800351cc
|
Scott Ullrich
|
|
| 293 |
81fa1cc3
|
Scott Ullrich
|
function post_cvssync_commands() {
|
| 294 |
|
|
echo "===> Removing FAST-CGI temporary files...\n";
|
| 295 |
|
|
exec("find /tmp -name \"php-fastcgi.socket*\" -exec rm -rf {} \;");
|
| 296 |
|
|
exec("find /tmp -name \"*.tmp\" -exec rm -rf {} \;");
|
| 297 |
4d7ca5b6
|
Scott Ullrich
|
|
| 298 |
81fa1cc3
|
Scott Ullrich
|
exec("rm -rf /tmp/xcache/* 2>/dev/null");
|
| 299 |
c4110081
|
Scott Ullrich
|
|
| 300 |
81fa1cc3
|
Scott Ullrich
|
echo "===> Upgrading configuration (if needed)...\n";
|
| 301 |
|
|
convert_config();
|
| 302 |
|
|
|
| 303 |
|
|
echo "===> Configuring filter...";
|
| 304 |
|
|
exec("/etc/rc.filter_configure_sync");
|
| 305 |
|
|
exec("pfctl -f /tmp/rules.debug");
|
| 306 |
|
|
echo "\n";
|
| 307 |
|
|
|
| 308 |
57d34ec9
|
Scott Ullrich
|
if(file_exists("/etc/rc.php_ini_setup")) {
|
| 309 |
|
|
echo "===> Running /etc/rc.php_ini_setup...";
|
| 310 |
45fee158
|
Scott Ullrich
|
exec("/etc/rc.php_ini_setup");
|
| 311 |
57d34ec9
|
Scott Ullrich
|
echo "\n";
|
| 312 |
|
|
}
|
| 313 |
45fee158
|
Scott Ullrich
|
|
| 314 |
7ef2b260
|
sullrich
|
/* lock down console if necessary */
|
| 315 |
e2e8ab0a
|
sullrich
|
echo "===> Locking down the console if needed...\n";
|
| 316 |
a46e450c
|
Ermal Lu?i
|
auto_login();
|
| 317 |
7ef2b260
|
sullrich
|
|
| 318 |
81fa1cc3
|
Scott Ullrich
|
echo "===> Signaling PHP and Lighty restart...";
|
| 319 |
|
|
$fd = fopen("/tmp/restart_lighty", "w");
|
| 320 |
|
|
fwrite($fd, "#!/bin/sh\n");
|
| 321 |
|
|
fwrite($fd, "sleep 5\n");
|
| 322 |
|
|
fwrite($fd, "killall php\n");
|
| 323 |
fbd5fc52
|
Ermal
|
fwrite($fd, "/usr/local/sbin/pfSctl -c 'service restart webgui'\n");
|
| 324 |
96920d07
|
Scott Ullrich
|
if(file_exists("/var/etc/lighty-CaptivePortal.conf"))
|
| 325 |
|
|
fwrite($fd, "/usr/local/sbin/lighttpd -f /var/etc/lighty-CaptivePortal.conf\n");
|
| 326 |
81fa1cc3
|
Scott Ullrich
|
fclose($fd);
|
| 327 |
|
|
mwexec_bg("sh /tmp/restart_lighty");
|
| 328 |
|
|
echo "\n";
|
| 329 |
45fee158
|
Scott Ullrich
|
|
| 330 |
81fa1cc3
|
Scott Ullrich
|
}
|
| 331 |
3f179a55
|
Scott Ullrich
|
|
| 332 |
e623dd70
|
Scott Ullrich
|
function isUrl($url = "") {
|
| 333 |
|
|
if($url)
|
| 334 |
|
|
if(strstr($url, "rcs.pfsense.org") or
|
| 335 |
|
|
strstr($url, "mainline") or
|
| 336 |
|
|
strstr($url, ".git"))
|
| 337 |
|
|
return true;
|
| 338 |
|
|
return false;
|
| 339 |
|
|
}
|
| 340 |
|
|
|
| 341 |
51a2e892
|
sullrich
|
function run_cmds($cmds) {
|
| 342 |
cb8c3cfc
|
sullrich
|
global $debug;
|
| 343 |
51a2e892
|
sullrich
|
foreach($cmds as $cmd) {
|
| 344 |
cb8c3cfc
|
sullrich
|
if($debug)
|
| 345 |
|
|
echo "Running $cmd";
|
| 346 |
51a2e892
|
sullrich
|
exec($cmd);
|
| 347 |
|
|
}
|
| 348 |
|
|
}
|
| 349 |
|
|
|
| 350 |
81fa1cc3
|
Scott Ullrich
|
conf_mount_ro();
|