diff options
| author | jim-p <jimp@pfsense.org> | 2010-12-14 17:22:17 -0500 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2010-12-14 17:22:17 -0500 |
| commit | d12003c99517c25105673c557aebec7e3fa55dcb (patch) | |
| tree | da0d98cba0375c010cac021961f8845ae31a00bf /etc | |
| parent | deeaf52c65fb63292c1b10373e9fe146666a00d8 (diff) | |
| download | pfsense-d12003c99517c25105673c557aebec7e3fa55dcb.zip pfsense-d12003c99517c25105673c557aebec7e3fa55dcb.tar.gz | |
Revert "Add voucher backup, configurable from Diagnostics > NanoBSD. Fixes #1087" - voucher db backup already existed under a different name. Ticket is still fixed, just by different code that was already there.
This reverts commit 0d89a2fcac3deea06bdc4a481bbdfae4f18b1ff8.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 15 | ||||
| -rw-r--r-- | etc/rc.backup_vouchers.sh | 8 | ||||
| -rwxr-xr-x | etc/rc.shutdown | 1 |
3 files changed, 1 insertions, 23 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index bc17f95..e36a626 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -210,21 +210,8 @@ function captiveportal_configure() { if (isset($config['captiveportal']['enable'])) { - if ($g['booting']) { + if ($g['booting']) echo "Starting captive portal... "; - if ($g['platform'] != "pfSense") { - /* restore the vouchers, if we have them */ - if (file_exists("{$g['cf_conf_path']}/vouchers.tgz")) { - $voucherrestore = ""; - $voucherreturn = ""; - exec("cd /;LANG=C /usr/bin/tar -xzf {$g['cf_conf_path']}/vouchers.tgz 2>&1", $voucherrestore, $voucherreturn); - $voucherrestore = implode(" ", $voucherrestore); - if($voucherreturn <> 0) { - log_error("Voucher restore failed exited with $voucherreturn, the error is: $voucherrestore\n"); - } - } - } - } /* kill any running mini_httpd */ killbypid("{$g['varrun_path']}/lighty-CaptivePortal.pid"); diff --git a/etc/rc.backup_vouchers.sh b/etc/rc.backup_vouchers.sh deleted file mode 100644 index 1fe7da5..0000000 --- a/etc/rc.backup_vouchers.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# Save the voucher databases to the config path. -if [ -d "/var/db/" ]; then - /etc/rc.conf_mount_rw - cd / && tar -czf /cf/conf/vouchers.tgz -C / var/db/voucher_*.db - /etc/rc.conf_mount_ro -fi diff --git a/etc/rc.shutdown b/etc/rc.shutdown index 904c52e..257a577 100755 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -32,5 +32,4 @@ if [ "$PLATFORM" = "pfSense" ]; then else /etc/rc.backup_rrd.sh /etc/rc.backup_dhcpleases.sh - /etc/rc.backup_vouchers.sh fi |
