From 23688222d32aa23af5d38473e9b65a1b5a6c4ac4 Mon Sep 17 00:00:00 2001 From: Bryan Paradis Date: Thu, 23 Jan 2014 05:17:23 -0500 Subject: Typos dansguardian.inc --- config/dansguardian/dansguardian.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'config/dansguardian') diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index ad6e6482..18c9f171 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -934,8 +934,8 @@ EOF; } else{ if ($dansguardian_blacklist['cron']=="force_download"){ - log_error("Blacklist udpate process started"); - file_notice("Dansguardian - Blacklist udpate process started",""); + log_error("Blacklist update process started"); + file_notice("Dansguardian - Blacklist update process started",""); file_put_contents("/root/dansguardian_custom.script",base64_decode($dansguardian_blacklist['custom_script']),LOCK_EX); if ($dansguardian_blacklist['enable_custom_script'] && $dansguardian_blacklist['custom_script'] != "") mwexec_bg("/root/dansguardian_custom.script"); -- cgit v1.2.3 From d355b7face9f7788f49521c0e6bc5da0f5ae7112 Mon Sep 17 00:00:00 2001 From: Ermal Date: Tue, 18 Feb 2014 20:25:49 +0000 Subject: Fix some obvious issues in dansguardian package --- config/dansguardian/dansguardian.inc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'config/dansguardian') diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index ad6e6482..53262ab0 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -87,6 +87,7 @@ function check_ca_hashes(){ $cert=0; } } + conf_mount_ro(); } } @@ -1094,6 +1095,7 @@ EOF; conf_mount_rw(); write_config(); + #update cron if ($cron_found > 0){ $config['cron']=$new_cron; @@ -1180,8 +1182,8 @@ EOF; $script='/usr/local/etc/rc.d/dansguardian.sh'; unlink_if_exists('/usr/local/etc/rc.d/dansguardian'); if($config['installedpackages']['dansguardian']['config'][0]['enable']=="on"){ - copy('/usr/local/pkg/dansguardian_rc.template',$script); - chmod ($script,0755); + @copy('/usr/local/pkg/dansguardian_rc.template',$script); + @chmod ($script,0755); if (is_process_running('dansguardian')){ log_error('Reloading Dansguardian'); exec("/usr/local/sbin/dansguardian -r"); @@ -1195,13 +1197,12 @@ EOF; if (is_process_running('dansguardian')){ log_error('Dansguardian is disabled, stopping process...'); mwexec("$script stop"); - } - if (file_exists($script)) - chmod ($script,444); + } + @unlink($script)) } if (!file_exists(DANSGUARDIAN_DIR . '/etc/dansguardian/lists/phraselists/pornography/weighted_russian_utf8')) - file_put_contents(DANSGUARDIAN_DIR . '/etc/dansguardian/lists/phraselists/pornography/weighted_russian_utf8',"",LOCK_EX); + @file_put_contents(DANSGUARDIAN_DIR . '/etc/dansguardian/lists/phraselists/pornography/weighted_russian_utf8',"",LOCK_EX); #check ca certs hashes check_ca_hashes(); @@ -1299,7 +1300,7 @@ function dansguardian_php_deinstall_command() { if (file_exists("/usr/local/etc/rc.d/dansguardian.sh")){ conf_mount_rw(); - chmod ("/usr/local/etc/rc.d/dansguardian.sh",0444); + @unlink("/usr/local/etc/rc.d/dansguardian.sh"); conf_mount_ro(); } } -- cgit v1.2.3 From 9923c54c602c3c0f67d0baa1bb93adfad74ad7ef Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 19 Feb 2014 18:34:19 +0000 Subject: Fix typo. Pointy-hat: myself --- config/dansguardian/dansguardian.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/dansguardian') diff --git a/config/dansguardian/dansguardian.inc b/config/dansguardian/dansguardian.inc index 53262ab0..cd453322 100755 --- a/config/dansguardian/dansguardian.inc +++ b/config/dansguardian/dansguardian.inc @@ -1198,7 +1198,7 @@ EOF; log_error('Dansguardian is disabled, stopping process...'); mwexec("$script stop"); } - @unlink($script)) + @unlink($script); } if (!file_exists(DANSGUARDIAN_DIR . '/etc/dansguardian/lists/phraselists/pornography/weighted_russian_utf8')) -- cgit v1.2.3 From a84a84bf31ed33c7e132b704186a56b77cc9148a Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 18 Mar 2014 14:18:37 -0300 Subject: Fixup URLs: - Replace http by https - *.pfsense.com -> *.pfsense.org - www.pfsense.org/packages/config -> packages.pfsense.org/packages/config --- config/dansguardian/dansguardian.xml | 54 +++++++++++++++--------------- config/dansguardian/dansguardian_about.php | 6 ++-- 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'config/dansguardian') diff --git a/config/dansguardian/dansguardian.xml b/config/dansguardian/dansguardian.xml index e0cb58fd..55860775 100644 --- a/config/dansguardian/dansguardian.xml +++ b/config/dansguardian/dansguardian.xml @@ -59,137 +59,137 @@ - http://www.pfsense.org/packages/config/dansguardian/dansguardian.inc + https://packages.pfsense.org/packages/config/dansguardian/dansguardian.inc /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian.php + https://packages.pfsense.org/packages/config/dansguardian/dansguardian.php /usr/local/www/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_ldap.php + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_ldap.php /usr/local/www/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_ldap.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_ldap.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_limits.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_limits.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_ips_header.template + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_ips_header.template /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_users_header.template + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_users_header.template /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_users_footer.template + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_users_footer.template /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_about.php + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_about.php /usr/local/www/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_config.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_config.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_sync.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_sync.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardianfx.conf.template + https://packages.pfsense.org/packages/config/dansguardian/dansguardianfx.conf.template /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_url_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_url_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_site_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_site_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_search_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_search_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_pics_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_pics_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_phrase_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_phrase_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_log.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_log.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_header_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_header_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_groups.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_groups.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_file_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_file_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_content_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_content_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_blacklist.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_blacklist.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_antivirus_acl.xml + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_antivirus_acl.xml /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian.conf.template + https://packages.pfsense.org/packages/config/dansguardian/dansguardian.conf.template /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/icapscan.conf.template + https://packages.pfsense.org/packages/config/dansguardian/icapscan.conf.template /usr/local/pkg/ 0755 - http://www.pfsense.org/packages/config/dansguardian/dansguardian_rc.template + https://packages.pfsense.org/packages/config/dansguardian/dansguardian_rc.template /usr/local/pkg/ 0755 diff --git a/config/dansguardian/dansguardian_about.php b/config/dansguardian/dansguardian_about.php index b7834281..95f1245b 100755 --- a/config/dansguardian/dansguardian_about.php +++ b/config/dansguardian/dansguardian_about.php @@ -1,7 +1,7 @@ All rights reserved. @@ -93,11 +93,11 @@ include("head.inc"); - Marcello Coutinho

");?> + Marcello Coutinho

");?> - donate to the pfSense project.

+ donate to the pfSense project.

If you want your donation to go to this package developer, make a note on the donation forwarding it to me.

");?> -- cgit v1.2.3