lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

etc: light at the end of the tunnel...

Browse Source
This commit is contained in:
Franco Fichtner 2014-12-09 15:53:37 +01:00
parent fce62d61b8
commit 24ee8eee5f
20 changed files with 14 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf.default/config.xml
View File

@ -687,7 +687,7 @@
<month>*</month>
<wday>*</wday>
<who>root</who>
<command>/usr/bin/nice -n20 /etc/rc.update_urltables</command>
<command>/usr/bin/nice -n20 /usr/local/etc/rc.update_urltables</command>
</item>
</cron>
<wol>

143
etc/pfSense.obsoletedfiles
View File

@ -1,143 +0,0 @@
/usr/local/www/diag_showbogons.php
/usr/local/www/interfaces_wan.php
/usr/local/www/interfaces_lan.php
/usr/local/www/interfaces_opt.php
/usr/local/www/interfaces_ppp.php
/usr/local/www/interfaces_ppp_edit.php
/usr/local/www/interfaces_wlan.inc
/usr/local/www/ifstats.cgi
/usr/local/www/easyrule.inc
/usr/local/www/exec_raw.php
/usr/local/www/javascript/index/sajax.js
/usr/local/www/sajax/index.sajax.php
/usr/local/www/interfaces_wlan_scan.php
/usr/local/www/firewall_nat_server.php
/usr/local/www/firewall_nat_server_edit.php
/usr/local/www/services_usermanager.php
/usr/local/www/firewall_rules_schedule_logic.php
/usr/local/www/firewall_shaper_edit.php
/usr/local/www/firewall_shaper_queues_edit.php
/usr/local/www/services_captiveportal_users.php
/usr/local/www/services_captiveportal_users_edit.php
/usr/local/www/system_advanced.php
/usr/local/www/system_advanced_create_certs.php
/usr/local/www/vpn_pppoe_users.php
/usr/local/www/vpn_pppoe_users_edit.php
/usr/local/www/vpn_ipsec_ca.php
/usr/local/www/vpn_ipsec_ca_edit.php
/usr/local/www/vpn_ipsec_ca_edit_create_cert.php
/usr/local/www/vpn_ipsec_edit.php
/usr/local/www/vpn_openvpn.php
/usr/local/www/vpn_openvpn_ccd.php
/usr/local/www/vpn_openvpn_ccd_edit.php
/usr/local/www/vpn_openvpn_cli.php
/usr/local/www/vpn_openvpn_cli_edit.php
/usr/local/www/vpn_openvpn_create_certs.php
/usr/local/www/vpn_openvpn_crl.php
/usr/local/www/vpn_openvpn_crl_edit.php
/usr/local/www/vpn_openvpn_srv.php
/usr/local/www/vpn_openvpn_srv_edit.php
/usr/local/www/dfuife.cgi
/usr/local/www/fred.png
/usr/local/www/index.html
/usr/local/www/system_usermanager_addcert.php
/usr/local/www/filter_log.inc
/usr/local/pkg/routed/routed.inc
/usr/local/pkg/routed/routed.xml
/usr/local/pkg/sasyncd.xml
/usr/local/pkg/carp.xml
/usr/local/www/javascript/diag_backup/diag_backup.js
/usr/local/www/progress.php
/usr/local/www/upload_progress.php
/usr/sbin/ntpd
/usr/sbin/ntpdate
/usr/sbin/ntpdc
/usr/sbin/ntptrace
/usr/sbin/ntptime
/usr/sbin/ntp-keygen
/usr/bin/ntpq
/usr/local/bin/ntp-wait
/usr/local/bin/ntpd
/usr/local/bin/ntpdate
/usr/local/bin/ntpdc
/usr/local/bin/ntpq
/usr/local/bin/ntptime
/usr/local/bin/ntptrace
/usr/local/bin/sntp
/usr/local/bin/tickadj
/usr/local/bin/c_rehash
/usr/local/bin/openssl
/usr/local/lib/libcrypto.a
/usr/local/lib/libssl.a
/usr/local/libdata/pkgconfig/libcrypto.pc
/usr/local/libdata/pkgconfig/libssl.pc
/usr/local/libdata/pkgconfig/openssl.pc
/usr/local/openssl/misc/CA.pl
/usr/local/openssl/misc/CA.sh
/usr/local/openssl/misc/c_hash
/usr/local/openssl/misc/c_info
/usr/local/openssl/misc/c_issuer
/usr/local/openssl/misc/c_name
/usr/local/openssl/misc/tsget
/usr/local/openssl/openssl.cnf.sample
/usr/local/lib/engines/lib4758cca.so
/usr/local/lib/engines/libaep.so
/usr/local/lib/engines/libatalla.so
/usr/local/lib/engines/libcapi.so
/usr/local/lib/engines/libchil.so
/usr/local/lib/engines/libcswift.so
/usr/local/lib/engines/libgmp.so
/usr/local/lib/engines/libgost.so
/usr/local/lib/engines/libnuron.so
/usr/local/lib/engines/libpadlock.so
/usr/local/lib/engines/libsureware.so
/usr/local/lib/engines/libubsec.so
/usr/local/lib/libcrypto.so
/usr/local/lib/libcrypto.so.8
/usr/local/lib/libssl.so
/usr/local/lib/libssl.so.8
/usr/bin/nsupdate
/usr/local/lib/libipsec.so
/usr/local/lib/libipsec.so.0
/usr/local/sbin/racoon
/usr/local/sbin/racoonctl
/usr/local/sbin/setkey
/usr/local/lib/php/20090626/apc.so
/usr/local/lib/php/20090626/bcmath.so
/usr/local/lib/php/20090626/bz2.so
/usr/local/lib/php/20090626/ctype.so
/usr/local/lib/php/20090626/curl.so
/usr/local/lib/php/20090626/dom.so
/usr/local/lib/php/20090626/gettext.so
/usr/local/lib/php/20090626/hash.so
/usr/local/lib/php/20090626/json.so
/usr/local/lib/php/20090626/ldap.so
/usr/local/lib/php/20090626/mbstring.so
/usr/local/lib/php/20090626/mcrypt.so
/usr/local/lib/php/20090626/mysql.so
/usr/local/lib/php/20090626/openssl.so
/usr/local/lib/php/20090626/pcntl.so
/usr/local/lib/php/20090626/pdo.so
/usr/local/lib/php/20090626/pdo_sqlite.so
/usr/local/lib/php/20090626/pfSense.so
/usr/local/lib/php/20090626/posix.so
/usr/local/lib/php/20090626/radius.so
/usr/local/lib/php/20090626/readline.so
/usr/local/lib/php/20090626/session.so
/usr/local/lib/php/20090626/shmop.so
/usr/local/lib/php/20090626/simplexml.so
/usr/local/lib/php/20090626/sockets.so
/usr/local/lib/php/20090626/sqlite.so
/usr/local/lib/php/20090626/ssh2.so
/usr/local/lib/php/20090626/suhosin.so
/usr/local/lib/php/20090626/sysvmsg.so
/usr/local/lib/php/20090626/sysvsem.so
/usr/local/lib/php/20090626/sysvshm.so
/usr/local/lib/php/20090626/tokenizer.so
/usr/local/lib/php/20090626/xdebug.so
/usr/local/lib/php/20090626/xml.so
/usr/local/lib/php/20090626/xmlreader.so
/usr/local/lib/php/20090626/xmlwriter.so
/usr/local/lib/php/20090626/zlib.so
/usr/local/lib/php/20090626/zmq.so
/usr/sbin/clog

6
etc/phpshellsessions/gitsync
View File

@ -354,12 +354,6 @@ else {
// Reset the repository to restore the deleted files
exec("cd $CODIR/pfSenseGITREPO/pfSenseGITREPO && {$GIT_BIN} reset --hard >/dev/null 2>/dev/null");
// Remove obsolete files
$files_to_remove = file("/etc/pfSense.obsoletedfiles");
foreach($files_to_remove as $file_to_remove)
if(file_exists($file_to_remove))
exec("/bin/rm -f $file_to_remove");
if(!$upgrading)
post_cvssync_commands();

2
etc/rc.create_full_backup
View File

@ -15,4 +15,4 @@ tar czPf /root/$FILENAME \
echo ">>> Backup completed. Note: this backup includes config.xml!"
echo ">>> To restore this backup run this command:"
echo " /etc/rc.restore_full_backup /root/$FILENAME"
echo " /usr/local/etc/rc.restore_full_backup /root/$FILENAME"

39
etc/rc.ntpdate
View File

@ -1,39 +0,0 @@
#!/usr/local/bin/php -f
<?php
/* $Id: */
/*
rc.ntpdate
part of m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2004 Scott Ullrich <sullrich@gmail.com>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
/* parse the configuration and include all functions used below */
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
system_ntp_configure();
?>

45
etc/rc.packages
View File

@ -1,45 +0,0 @@
#!/usr/local/bin/php -f
<?php
/* $Id$ */
/*
rc.packages
part of pfSense (https://www.pfsense.org)
Copyright (C) 2004 Scott Ullrich
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
*/
require_once("config.inc");
require_once("functions.inc");
require_once("filter.inc");
require_once("shaper.inc");
require_once("captiveportal.inc");
require_once("pkg-utils.inc");
require_once("pfsense-utils.inc");
$pkg_interface = "console";
resync_all_package_configs(true);
//start_pkg_system();
?>

7
tmp/post_upgrade_command.php
View File

@ -24,10 +24,3 @@
system("echo \"Adding serial port settings ({$newslicedir})...\" >> /conf/upgrade_log.txt");
setup_serial_port("upgrade", $newslicedir);
$files_to_process = file("/etc/pfSense.obsoletedfiles");
foreach($files_to_process as $filename)
if(file_exists($filename))
exec("/bin/rm -f $filename");
?>

2
usr/local/etc/inc/upgrade_config.inc
View File

@ -2578,7 +2578,7 @@ function upgrade_075_to_076() {
$cron_item['month'] = "*";
$cron_item['wday'] = "*";
$cron_item['who'] = "root";
$cron_item['command'] = "/usr/bin/nice -n20 /etc/rc.update_urltables";
$cron_item['command'] = "/usr/bin/nice -n20 /usr/local/etc/rc.update_urltables";
$config['cron']['item'][] = $cron_item;
}

5
usr/local/etc/rc
View File

@ -405,9 +405,6 @@ echo -n "Starting CRON... "
cd /tmp && /usr/sbin/cron -s 2>/dev/null
echo "done."
# Start packages
##/usr/local/bin/php -q /etc/rc.start_packages
/bin/rm -rf /usr/local/pkg/pf/CVS
# Start ping handler every 240 seconds
@ -417,7 +414,7 @@ echo "done."
/usr/local/bin/minicron 3600 $varrunpath/expire_accounts.pid /etc/rc.expireaccounts
# Start alias url updater every 24 hours
/usr/local/bin/minicron 86400 $varrunpath/update_alias_url_data.pid /etc/rc.update_alias_url_data
/usr/local/bin/minicron 86400 $varrunpath/update_alias_url_data.pid /usr/local/etc/rc.update_alias_url_data
/bin/chmod a+rw /tmp/.

2
etc/rc.linkup → usr/local/etc/rc.linkup
View File

@ -1,7 +1,7 @@
#!/usr/local/bin/php -f
<?php
/*
rc.linkup - devd hotplug actions
part of pfSense
Copyright (C) 2003-2005 Scott Ullrich <sullrich@gmail.com>.

0
etc/rc.openvpn → usr/local/etc/rc.openvpn
View File

0
etc/rc.restore_full_backup → usr/local/etc/rc.restore_full_backup
View File

0
etc/rc.savevoucher → usr/local/etc/rc.savevoucher
View File

3
etc/rc.start_packages → usr/local/etc/rc.start_packages
View File

@ -1,8 +1,7 @@
#!/usr/local/bin/php -f
<?php
/* $Id$ */
/*
rc.start_packages
part of pfSense (https://www.pfsense.org)
Copyright (C) 2004 Scott Ullrich
All rights reserved.

0
etc/rc.stop_packages → usr/local/etc/rc.stop_packages
View File

0
etc/rc.update_alias_url_data → usr/local/etc/rc.update_alias_url_data
View File

0
etc/rc.update_urltables → usr/local/etc/rc.update_urltables
View File

4
usr/local/opnsense/service/conf/actions_interface.conf
View File

@ -1,11 +1,11 @@
[linkup.start]
command:/etc/rc.linkup
command:/usr/local/etc/rc.linkup
parameters:start %s
type:script
message:Linkup starting %s
[linkup.stop]
command:/etc/rc.linkup
command:/usr/local/etc/rc.linkup
parameters:stop %s
type:script
message:Linkup stopping %s

6
usr/local/opnsense/service/conf/actions_service.conf
View File

@ -23,7 +23,7 @@ type:script
message:Updating static routes based on hostnames
[reload|restart.openvpn]
command:/etc/rc.openvpn
command:/usr/local/etc/rc.openvpn
parameters:%s
type:script
message:Restarting OpenVPN tunnels/interfaces %s
@ -48,7 +48,7 @@ message:Starting nptd
[reload|restart.packages]
command:/etc/rc.start_packages
command:/usr/local/etc/rc.start_packages
parameters:
type:script
message:Starting packages
@ -66,7 +66,7 @@ type:script
message:webConfigurator restart in progress
[sync.vouchers]
command:/etc/rc.savevoucher
command:/usr/local/etc/rc.savevoucher
parameters:
type:script
message:Synching vouchers

7
usr/local/www/system_firmware_restorefullbackup.php
View File

@ -1,7 +1,6 @@
<?php
/* $Id$ */
/*
system_firmware_restorefullbackup.php
Copyright (C) 2011 Scott Ullrich
All rights reserved.
@ -32,7 +31,7 @@
*/
/*
pfSense_BUILDER_BINARIES: /etc/rc.restore_full_backup
pfSense_BUILDER_BINARIES: /usr/local/etc/rc.restore_full_backup
pfSense_MODULE: backup
*/
@ -96,7 +95,7 @@ if ($_GET['deletefile']) {
if ($_POST['restorefile']) {
$filename = $_POST['restorefile'];
if(file_exists("/root/{$filename}")) {
mwexec_bg("/etc/rc.restore_full_backup /root/" . escapeshellcmd($filename));
mwexec_bg("/usr/local/etc/rc.restore_full_backup /root/" . escapeshellcmd($filename));
$savemsg = gettext("The firewall is currently restoring $filename");
}
}